diff --git a/README.md b/README.md
index 1794f9ee..93761f3e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ## SmartThings Capabilities
-#### Last Update: 2025-04-28
+#### Last Update: 2026-05-15
 #### Edited by Flobul for Jeedom solution
 
 * [SmartThings Reference](https://smartthings.developer.samsung.com/docs/api-ref/capabilities.html)
@@ -8,6 +8,8 @@
 * [Create Personal Access Token](https://account.smartthings.com/tokens)
 * [Plugin Documentation](https://flobul-domotique.fr/documentation-du-plugin-smartthings-pour-jeedom/)
 * [Plugin Jeedom Market](https://market.jeedom.com/index.php?v=d&p=market_display&id=4099)
+
+
 | Capability | Version | Status | Capability Presentation | Translation i18n |
 | ---- | ---- | ---- | ---- | ---- |
 
@@ -33,13 +35,14 @@
 | [Alarm System](./json/alarmSystem.json) | 1 | dead |  | [json](./json/alarmSystem.i18n.fr.json) |
 | [Alarm System Arm Only](./json/alarmSystemArmOnly.json) | 1 | dead |  | [json](./json/alarmSystemArmOnly.i18n.fr.json) |
 | [AlarmSensor](./json/alarmsensor.json) | 1 | proposed |  | [json](./json/alarmsensor.i18n.fr.json) |
-| [Anti Snoring Pillow](./json/antiSnoringPillow.json) | 1 | proposed |  | [json](./json/antiSnoringPillow.i18n.fr.json) |
+| [Anti Snoring Pillow](./json/antiSnoringPillow.json) | 1 | proposed | [json](./json/antiSnoringPillowPresentation.json) | [json](./json/antiSnoringPillow.i18n.fr.json) |
 | [Appliance Utilization](./json/applianceUtilization.json) | 1 | proposed | [json](./json/applianceUtilizationPresentation.json) | [json](./json/applianceUtilization.i18n.fr.json) |
 | [Astronomical Data](./json/astronomicalData.json) | 1 | dead |  | [json](./json/astronomicalData.i18n.fr.json) |
 | [Atmospheric Pressure Measurement](./json/atmosphericPressureMeasurement.json) | 1 | live | [json](./json/atmosphericPressureMeasurementPresentation.json) | [json](./json/atmosphericPressureMeasurement.i18n.fr.json) |
 | [Audio Capture](./json/audioCapture.json) | 1 | proposed | [json](./json/audioCapturePresentation.json) | [json](./json/audioCapture.i18n.fr.json) |
 | [Audio Mute](./json/audioMute.json) | 1 | live | [json](./json/audioMutePresentation.json) | [json](./json/audioMute.i18n.fr.json) |
 | [Audio Notification](./json/audioNotification.json) | 1 | live | [json](./json/audioNotificationPresentation.json) | [json](./json/audioNotification.i18n.fr.json) |
+| [Audio Recording](./json/audioRecording.json) | 1 | proposed |  | [json](./json/audioRecording.i18n.fr.json) |
 | [Audio Stream](./json/audioStream.json) | 1 | live | [json](./json/audioStreamPresentation.json) | [json](./json/audioStream.i18n.fr.json) |
 | [Audio Track Addressing](./json/audioTrackAddressing.json) | 1 | deprecated |  | [json](./json/audioTrackAddressing.i18n.fr.json) |
 | [Audio Track Data](./json/audioTrackData.json) | 1 | live | [json](./json/audioTrackDataPresentation.json) | [json](./json/audioTrackData.i18n.fr.json) |
@@ -57,6 +60,8 @@
 | [Bypassable](./json/bypassable.json) | 1 | live | [json](./json/bypassablePresentation.json) | [json](./json/bypassable.i18n.fr.json) |
 | [Camera Event](./json/cameraEvent.json) | 1 | proposed | [json](./json/cameraEventPresentation.json) | [json](./json/cameraEvent.i18n.fr.json) |
 | [Camera Preset](./json/cameraPreset.json) | 1 | proposed | [json](./json/cameraPresetPresentation.json) | [json](./json/cameraPreset.i18n.fr.json) |
+| [Camera Privacy Mode](./json/cameraPrivacyMode.json) | 1 | proposed |  | [json](./json/cameraPrivacyMode.i18n.fr.json) |
+| [Camera Viewport Settings](./json/cameraViewportSettings.json) | 1 | proposed |  | [json](./json/cameraViewportSettings.i18n.fr.json) |
 | [Carbon Dioxide Health Concern](./json/carbonDioxideHealthConcern.json) | 1 | live | [json](./json/carbonDioxideHealthConcernPresentation.json) | [json](./json/carbonDioxideHealthConcern.i18n.fr.json) |
 | [Carbon Dioxide Measurement](./json/carbonDioxideMeasurement.json) | 1 | live | [json](./json/carbonDioxideMeasurementPresentation.json) | [json](./json/carbonDioxideMeasurement.i18n.fr.json) |
 | [Carbon Monoxide Detector](./json/carbonMonoxideDetector.json) | 1 | live | [json](./json/carbonMonoxideDetectorPresentation.json) | [json](./json/carbonMonoxideDetector.i18n.fr.json) |
@@ -65,19 +70,20 @@
 | [Charge Point State](./json/chargePointState.json) | 1 | proposed | [json](./json/chargePointStatePresentation.json) | [json](./json/chargePointState.i18n.fr.json) |
 | [Charging State](./json/chargingState.json) | 1 | proposed | [json](./json/chargingStatePresentation.json) | [json](./json/chargingState.i18n.fr.json) |
 | [Chime](./json/chime.json) | 1 | live | [json](./json/chimePresentation.json) | [json](./json/chime.i18n.fr.json) |
-| [Coffee Maker Operation](./json/coffeeMakerOperation.json) | 1 | proposed |  | [json](./json/coffeeMakerOperation.i18n.fr.json) |
+| [Coffee Maker Manual Operation](./json/coffeeMakerManualOperation.json) | 1 | proposed |  |  |
+| [Coffee Maker Operation](./json/coffeeMakerOperation.json) | 1 | proposed | [json](./json/coffeeMakerOperationPresentation.json) | [json](./json/coffeeMakerOperation.i18n.fr.json) |
 | [Color](./json/color.json) | 1 | proposed |  | [json](./json/color.i18n.fr.json) |
 | [Color Control](./json/colorControl.json) | 1 | live | [json](./json/colorControlPresentation.json) | [json](./json/colorControl.i18n.fr.json) |
 | [Color Mode](./json/colorMode.json) | 1 | proposed | [json](./json/colorModePresentation.json) | [json](./json/colorMode.i18n.fr.json) |
 | [Color Temperature](./json/colorTemperature.json) | 1 | live | [json](./json/colorTemperaturePresentation.json) | [json](./json/colorTemperature.i18n.fr.json) |
-| [Configuration](./json/configuration.json) | 1 | live |  | [json](./json/configuration.i18n.fr.json) |
+| [Configuration](./json/configuration.json) | 1 | deprecated |  | [json](./json/configuration.i18n.fr.json) |
 | [Consumable](./json/consumable.json) | 1 | proposed | [json](./json/consumablePresentation.json) | [json](./json/consumable.i18n.fr.json) |
 | [Consumable Life](./json/consumableLife.json) | 1 | proposed | [json](./json/consumableLifePresentation.json) | [json](./json/consumableLife.i18n.fr.json) |
 | [Contact Sensor](./json/contactSensor.json) | 1 | live | [json](./json/contactSensorPresentation.json) | [json](./json/contactSensor.i18n.fr.json) |
 | [Container State](./json/containerState.json) | 1 | proposed | [json](./json/containerStatePresentation.json) | [json](./json/containerState.i18n.fr.json) |
 | [Cook Time](./json/cookTime.json) | 1 | proposed | [json](./json/cookTimePresentation.json) | [json](./json/cookTime.i18n.fr.json) |
 | [Current Measurement](./json/currentMeasurement.json) | 1 | live | [json](./json/currentMeasurementPresentation.json) | [json](./json/currentMeasurement.i18n.fr.json) |
-| [Accessibility](./json/custom.accessibility.json) | 1 | proposed |  |  |
+| [Accessibility](./json/custom.accessibility.json) | 1 | proposed |  | [json](./json/custom.accessibility.i18n.fr.json) |
 | [Air Conditioner Odor Controller](./json/custom.airConditionerOdorController.json) | 1 | proposed |  | [json](./json/custom.airConditionerOdorController.i18n.fr.json) |
 | [Air Conditioner Optional Mode](./json/custom.airConditionerOptionalMode.json) | 1 | proposed | [json](./json/custom.airConditionerOptionalModePresentation.json) | [json](./json/custom.airConditionerOptionalMode.i18n.fr.json) |
 | [Air Conditioner Tropical Night Mode](./json/custom.airConditionerTropicalNightMode.json) | 1 | proposed |  | [json](./json/custom.airConditionerTropicalNightMode.i18n.fr.json) |
@@ -121,13 +127,13 @@
 | [Fridge Mode](./json/custom.fridgeMode.json) | 1 | proposed | [json](./json/custom.fridgeModePresentation.json) | [json](./json/custom.fridgeMode.i18n.fr.json) |
 | [Hepa Filter](./json/custom.hepaFilter.json) | 1 | proposed |  | [json](./json/custom.hepaFilter.i18n.fr.json) |
 | [Job Beginning Status](./json/custom.jobBeginningStatus.json) | 1 | proposed |  | [json](./json/custom.jobBeginningStatus.i18n.fr.json) |
-| [launchApp](./json/custom.launchapp.json) | 1 | proposed |  |  |
+| [launchApp](./json/custom.launchapp.json) | 1 | proposed |  | [json](./json/custom.launchapp.i18n.fr.json) |
 | [Lower Device Power](./json/custom.lowerDevicePower.json) | 1 | proposed |  | [json](./json/custom.lowerDevicePower.i18n.fr.json) |
 | [Outing Mode](./json/custom.outingMode.json) | 1 | proposed | [json](./json/custom.outingModePresentation.json) | [json](./json/custom.outingMode.i18n.fr.json) |
 | [Oven Cavity Status](./json/custom.ovenCavityStatus.json) | 1 | proposed | [json](./json/custom.ovenCavityStatusPresentation.json) | [json](./json/custom.ovenCavityStatus.i18n.fr.json) |
 | [Periodic Sensing](./json/custom.periodicSensing.json) | 1 | proposed | [json](./json/custom.periodicSensingPresentation.json) | [json](./json/custom.periodicSensing.i18n.fr.json) |
 | [PictureMode](./json/custom.picturemode.json) | 1 | proposed | [json](./json/custom.picturemodePresentation.json) | [json](./json/custom.picturemode.i18n.fr.json) |
-| [Recording](./json/custom.recording.json) | 1 | proposed |  |  |
+| [Recording](./json/custom.recording.json) | 1 | proposed |  | [json](./json/custom.recording.i18n.fr.json) |
 | [Region](./json/custom.region.json) | 1 | proposed |  |  |
 | [Robot Cleaner Battery Full Status](./json/custom.robotCleanerBatteryFullStatus.json) | 1 | proposed |  | [json](./json/custom.robotCleanerBatteryFullStatus.i18n.fr.json) |
 | [Robot Cleaner Behavior](./json/custom.robotCleanerBehavior.json) | 1 | proposed |  | [json](./json/custom.robotCleanerBehavior.i18n.fr.json) |
@@ -149,7 +155,7 @@
 | [Steam Closet Wrinkle Prevent](./json/custom.steamClosetWrinklePrevent.json) | 1 | proposed |  | [json](./json/custom.steamClosetWrinklePrevent.i18n.fr.json) |
 | [Supported Options](./json/custom.supportedOptions.json) | 1 | proposed | [json](./json/custom.supportedOptionsPresentation.json) | [json](./json/custom.supportedOptions.i18n.fr.json) |
 | [Thermostat Setpoint Control](./json/custom.thermostatSetpointControl.json) | 1 | proposed |  | [json](./json/custom.thermostatSetpointControl.i18n.fr.json) |
-| [tvSearch](./json/custom.tvsearch.json) | 1 | proposed |  |  |
+| [tvSearch](./json/custom.tvsearch.json) | 1 | proposed |  | [json](./json/custom.tvsearch.i18n.fr.json) |
 | [User Notification](./json/custom.userNotification.json) | 1 | proposed |  | [json](./json/custom.userNotification.i18n.fr.json) |
 | [Very Fine Dust Filter](./json/custom.veryFineDustFilter.json) | 1 | proposed |  | [json](./json/custom.veryFineDustFilter.i18n.fr.json) |
 | [Virus Doctor Mode](./json/custom.virusDoctorMode.json) | 1 | proposed |  | [json](./json/custom.virusDoctorMode.i18n.fr.json) |
@@ -169,6 +175,7 @@
 | [Dishwasher Operating State](./json/dishwasherOperatingState.json) | 1 | live | [json](./json/dishwasherOperatingStatePresentation.json) | [json](./json/dishwasherOperatingState.i18n.fr.json) |
 | [Dishwasher Operational State](./json/dishwasherOperationalState.json) | 1 | deprecated |  | [json](./json/dishwasherOperationalState.i18n.fr.json) |
 | [Door Control](./json/doorControl.json) | 1 | live | [json](./json/doorControlPresentation.json) | [json](./json/doorControl.i18n.fr.json) |
+| [Door State](./json/doorState.json) | 1 | proposed | [json](./json/doorStatePresentation.json) | [json](./json/doorState.i18n.fr.json) |
 | [Driving Status](./json/drivingStatus.json) | 1 | proposed | [json](./json/drivingStatusPresentation.json) | [json](./json/drivingStatus.i18n.fr.json) |
 | [Dryer Mode](./json/dryerMode.json) | 1 | proposed | [json](./json/dryerModePresentation.json) | [json](./json/dryerMode.i18n.fr.json) |
 | [Dryer Operating State](./json/dryerOperatingState.json) | 1 | live | [json](./json/dryerOperatingStatePresentation.json) | [json](./json/dryerOperatingState.i18n.fr.json) |
@@ -176,6 +183,7 @@
 | [Dust Sensor](./json/dustSensor.json) | 1 | live | [json](./json/dustSensorPresentation.json) | [json](./json/dustSensor.i18n.fr.json) |
 | [Elevator Call](./json/elevatorCall.json) | 1 | live | [json](./json/elevatorCallPresentation.json) | [json](./json/elevatorCall.i18n.fr.json) |
 | [End to End Encryption](./json/endToEndEncryption.json) | 1 | proposed |  | [json](./json/endToEndEncryption.i18n.fr.json) |
+| [End to End Encryption State](./json/endToEndEncryptionState.json) | 1 | proposed |  | [json](./json/endToEndEncryptionState.i18n.fr.json) |
 | [Energy Meter](./json/energyMeter.json) | 1 | live | [json](./json/energyMeterPresentation.json) | [json](./json/energyMeter.i18n.fr.json) |
 | [Equivalent Carbon Dioxide Measurement](./json/equivalentCarbonDioxideMeasurement.json) | 1 | live | [json](./json/equivalentCarbonDioxideMeasurementPresentation.json) | [json](./json/equivalentCarbonDioxideMeasurement.i18n.fr.json) |
 | [Estimated Time Of Arrival](./json/estimatedTimeOfArrival.json) | 1 | proposed | [json](./json/estimatedTimeOfArrivalPresentation.json) | [json](./json/estimatedTimeOfArrival.i18n.fr.json) |
@@ -183,6 +191,7 @@
 | [Evse State](./json/evseState.json) | 1 | proposed | [json](./json/evseStatePresentation.json) | [json](./json/evseState.i18n.fr.json) |
 | [Execute](./json/execute.json) | 1 | deprecated |  | [json](./json/execute.i18n.fr.json) |
 | [Face Recognition](./json/faceRecognition.json) | 1 | proposed | [json](./json/faceRecognitionPresentation.json) | [json](./json/faceRecognition.i18n.fr.json) |
+| [Fan Direction](./json/fanDirection.json) | 1 | proposed | [json](./json/fanDirectionPresentation.json) | [json](./json/fanDirection.i18n.fr.json) |
 | [Fan Mode](./json/fanMode.json) | 1 | proposed | [json](./json/fanModePresentation.json) | [json](./json/fanMode.i18n.fr.json) |
 | [Fan Oscillation Mode](./json/fanOscillationMode.json) | 1 | live | [json](./json/fanOscillationModePresentation.json) | [json](./json/fanOscillationMode.i18n.fr.json) |
 | [Fan Speed](./json/fanSpeed.json) | 1 | live | [json](./json/fanSpeedPresentation.json) | [json](./json/fanSpeed.i18n.fr.json) |
@@ -195,6 +204,7 @@
 | [Fine Dust Sensor](./json/fineDustSensor.json) | 1 | live | [json](./json/fineDustSensorPresentation.json) | [json](./json/fineDustSensor.i18n.fr.json) |
 | [Firmware Update](./json/firmwareUpdate.json) | 1 | live |  | [json](./json/firmwareUpdate.i18n.fr.json) |
 | [Flow Measurement](./json/flowMeasurement.json) | 1 | proposed | [json](./json/flowMeasurementPresentation.json) | [json](./json/flowMeasurement.i18n.fr.json) |
+| [Food Waste Drying Grinder](./json/foodWasteDryingGrinder.json) | 1 | proposed | [json](./json/foodWasteDryingGrinderPresentation.json) | [json](./json/foodWasteDryingGrinder.i18n.fr.json) |
 | [Formaldehyde Health Concern](./json/formaldehydeHealthConcern.json) | 1 | live | [json](./json/formaldehydeHealthConcernPresentation.json) | [json](./json/formaldehydeHealthConcern.i18n.fr.json) |
 | [Formaldehyde Measurement](./json/formaldehydeMeasurement.json) | 1 | live | [json](./json/formaldehydeMeasurementPresentation.json) | [json](./json/formaldehydeMeasurement.i18n.fr.json) |
 | [Garage Door Control](./json/garageDoorControl.json) | 1 | deprecated | [json](./json/garageDoorControlPresentation.json) | [json](./json/garageDoorControl.i18n.fr.json) |
@@ -207,36 +217,42 @@
 | [Grid State](./json/gridState.json) | 1 | proposed | [json](./json/gridStatePresentation.json) | [json](./json/gridState.i18n.fr.json) |
 | [Hardware Fault](./json/hardwareFault.json) | 1 | live | [json](./json/hardwareFaultPresentation.json) | [json](./json/hardwareFault.i18n.fr.json) |
 | [Washer Mode](./json/hca.washerMode.json) | 1 | proposed | [json](./json/hca.washerModePresentation.json) | [json](./json/hca.washerMode.i18n.fr.json) |
+| [Hdr](./json/hdr.json) | 1 | proposed |  | [json](./json/hdr.i18n.fr.json) |
 | [Health Check](./json/healthCheck.json) | 1 | live |  | [json](./json/healthCheck.i18n.fr.json) |
 | [Holdable Button](./json/holdableButton.json) | 1 | deprecated |  | [json](./json/holdableButton.i18n.fr.json) |
 | [Humidifier Mode](./json/humidifierMode.json) | 1 | live | [json](./json/humidifierModePresentation.json) | [json](./json/humidifierMode.i18n.fr.json) |
 | [Illuminance Measurement](./json/illuminanceMeasurement.json) | 1 | live | [json](./json/illuminanceMeasurementPresentation.json) | [json](./json/illuminanceMeasurement.i18n.fr.json) |
 | [Image Capture](./json/imageCapture.json) | 1 | live | [json](./json/imageCapturePresentation.json) | [json](./json/imageCapture.i18n.fr.json) |
+| [Image Control](./json/imageControl.json) | 1 | proposed |  | [json](./json/imageControl.i18n.fr.json) |
 | [Indicator](./json/indicator.json) | 1 | deprecated |  | [json](./json/indicator.i18n.fr.json) |
 | [Infrared Level](./json/infraredLevel.json) | 1 | live | [json](./json/infraredLevelPresentation.json) | [json](./json/infraredLevel.i18n.fr.json) |
 | [Keypad Input](./json/keypadInput.json) | 1 | live | [json](./json/keypadInputPresentation.json) | [json](./json/keypadInput.i18n.fr.json) |
-| [Language Setting](./json/languageSetting.json) | 1 | proposed | [json](./json/languageSettingPresentation.json) | [json](./json/languageSetting.i18n.fr.json) |
+| [Knob](./json/knob.json) | 1 | proposed |  | [json](./json/knob.i18n.fr.json) |
+| [Language Setting](./json/languageSetting.json) | 1 | deprecated | [json](./json/languageSettingPresentation.json) | [json](./json/languageSetting.i18n.fr.json) |
 | [Laundry Washer Rinse Mode](./json/laundryWasherRinseMode.json) | 1 | live | [json](./json/laundryWasherRinseModePresentation.json) | [json](./json/laundryWasherRinseMode.i18n.fr.json) |
 | [Laundry Washer Spin Speed](./json/laundryWasherSpinSpeed.json) | 1 | live | [json](./json/laundryWasherSpinSpeedPresentation.json) | [json](./json/laundryWasherSpinSpeed.i18n.fr.json) |
 | [Level](./json/level.json) | 1 | proposed | [json](./json/levelPresentation.json) | [json](./json/level.i18n.fr.json) |
 | [Light](./json/light.json) | 1 | deprecated |  | [json](./json/light.i18n.fr.json) |
 | [Light Controller Mode](./json/lightControllerMode.json) | 1 | proposed | [json](./json/lightControllerModePresentation.json) | [json](./json/lightControllerMode.i18n.fr.json) |
+| [Local Media Storage](./json/localMediaStorage.json) | 1 | proposed |  | [json](./json/localMediaStorage.i18n.fr.json) |
 | [Location Mode](./json/locationMode.json) | 1 | live |  | [json](./json/locationMode.i18n.fr.json) |
 | [Lock](./json/lock.json) | 1 | live | [json](./json/lockPresentation.json) | [json](./json/lock.i18n.fr.json) |
 | [Lock Alarm](./json/lockAlarm.json) | 1 | proposed | [json](./json/lockAlarmPresentation.json) | [json](./json/lockAlarm.i18n.fr.json) |
+| [Lock Aliro](./json/lockAliro.json) | 1 | proposed |  | [json](./json/lockAliro.i18n.fr.json) |
 | [Lock Codes](./json/lockCodes.json) | 1 | live |  | [json](./json/lockCodes.i18n.fr.json) |
 | [Lock Credentials](./json/lockCredentials.json) | 1 | proposed |  | [json](./json/lockCredentials.i18n.fr.json) |
 | [Lock Only](./json/lockOnly.json) | 1 | deprecated |  | [json](./json/lockOnly.i18n.fr.json) |
 | [Lock Schedules](./json/lockSchedules.json) | 1 | proposed |  | [json](./json/lockSchedules.i18n.fr.json) |
 | [Lock Users](./json/lockUsers.json) | 1 | proposed |  | [json](./json/lockUsers.i18n.fr.json) |
-| [Log Trigger](./json/logTrigger.json) | 1 | proposed |  | [json](./json/logTrigger.i18n.fr.json) |
+| [Log Trigger](./json/logTrigger.json) | 1 | deprecated |  | [json](./json/logTrigger.i18n.fr.json) |
 | [Massage Intensity Change](./json/massageIntensityChange.json) | 1 | proposed | [json](./json/massageIntensityChangePresentation.json) | [json](./json/massageIntensityChange.i18n.fr.json) |
 | [Massage Intensity Control](./json/massageIntensityControl.json) | 1 | proposed | [json](./json/massageIntensityControlPresentation.json) | [json](./json/massageIntensityControl.i18n.fr.json) |
 | [Massage Operating](./json/massageOperating.json) | 1 | proposed | [json](./json/massageOperatingPresentation.json) | [json](./json/massageOperating.i18n.fr.json) |
 | [Massage Operating State](./json/massageOperatingState.json) | 1 | proposed | [json](./json/massageOperatingStatePresentation.json) | [json](./json/massageOperatingState.i18n.fr.json) |
 | [Massage Time Change](./json/massageTimeChange.json) | 1 | proposed | [json](./json/massageTimeChangePresentation.json) | [json](./json/massageTimeChange.i18n.fr.json) |
 | [Massage Time Control](./json/massageTimeControl.json) | 1 | proposed | [json](./json/massageTimeControlPresentation.json) | [json](./json/massageTimeControl.i18n.fr.json) |
-| [Media Controller](./json/mediaController.json) | 1 | proposed |  | [json](./json/mediaController.i18n.fr.json) |
+| [Mechanical Pan Tilt Zoom](./json/mechanicalPanTiltZoom.json) | 1 | proposed |  | [json](./json/mechanicalPanTiltZoom.i18n.fr.json) |
+| [Media Controller](./json/mediaController.json) | 1 | deprecated |  | [json](./json/mediaController.i18n.fr.json) |
 | [Media Group](./json/mediaGroup.json) | 1 | proposed | [json](./json/mediaGroupPresentation.json) | [json](./json/mediaGroup.i18n.fr.json) |
 | [Media Input Source](./json/mediaInputSource.json) | 1 | live | [json](./json/mediaInputSourcePresentation.json) | [json](./json/mediaInputSource.i18n.fr.json) |
 | [Media Playback](./json/mediaPlayback.json) | 1 | live | [json](./json/mediaPlaybackPresentation.json) | [json](./json/mediaPlayback.i18n.fr.json) |
@@ -252,7 +268,8 @@
 | [Movement Sensor](./json/movementSensor.json) | 1 | proposed | [json](./json/movementSensorPresentation.json) | [json](./json/movementSensor.i18n.fr.json) |
 | [Multiple Zone Presence](./json/multipleZonePresence.json) | 1 | proposed | [json](./json/multipleZonePresencePresentation.json) | [json](./json/multipleZonePresence.i18n.fr.json) |
 | [Music Player](./json/musicPlayer.json) | 1 | deprecated | [json](./json/musicPlayerPresentation.json) | [json](./json/musicPlayer.i18n.fr.json) |
-| [Network Meter](./json/networkMeter.json) | 1 | live |  | [json](./json/networkMeter.i18n.fr.json) |
+| [Network Meter](./json/networkMeter.json) | 1 | deprecated |  | [json](./json/networkMeter.i18n.fr.json) |
+| [Night Vision](./json/nightVision.json) | 1 | proposed |  | [json](./json/nightVision.i18n.fr.json) |
 | [Nitrogen Dioxide Health Concern](./json/nitrogenDioxideHealthConcern.json) | 1 | live | [json](./json/nitrogenDioxideHealthConcernPresentation.json) | [json](./json/nitrogenDioxideHealthConcern.i18n.fr.json) |
 | [Nitrogen Dioxide Measurement](./json/nitrogenDioxideMeasurement.json) | 1 | live | [json](./json/nitrogenDioxideMeasurementPresentation.json) | [json](./json/nitrogenDioxideMeasurement.i18n.fr.json) |
 | [Notification](./json/notification.json) | 1 | live | [json](./json/notificationPresentation.json) | [json](./json/notification.i18n.fr.json) |
@@ -273,12 +290,13 @@
 | [Panic Alarm](./json/panicAlarm.json) | 1 | live | [json](./json/panicAlarmPresentation.json) | [json](./json/panicAlarm.i18n.fr.json) |
 | [Pest Control](./json/pestControl.json) | 1 | live | [json](./json/pestControlPresentation.json) | [json](./json/pestControl.i18n.fr.json) |
 | [Pet Activity](./json/petActivity.json) | 1 | proposed | [json](./json/petActivityPresentation.json) | [json](./json/petActivity.i18n.fr.json) |
+| [Plant Cultivation](./json/plantCultivation.json) | 1 | proposed | [json](./json/plantCultivationPresentation.json) | [json](./json/plantCultivation.i18n.fr.json) |
 | [Polling](./json/polling.json) | 1 | deprecated |  | [json](./json/polling.i18n.fr.json) |
 | [Power Consumption Report](./json/powerConsumptionReport.json) | 1 | live |  | [json](./json/powerConsumptionReport.i18n.fr.json) |
 | [Power Meter](./json/powerMeter.json) | 1 | live | [json](./json/powerMeterPresentation.json) | [json](./json/powerMeter.i18n.fr.json) |
 | [Power Source](./json/powerSource.json) | 1 | live | [json](./json/powerSourcePresentation.json) | [json](./json/powerSource.i18n.fr.json) |
-| [Precipitation Measurement](./json/precipitationMeasurement.json) | 1 | proposed |  | [json](./json/precipitationMeasurement.i18n.fr.json) |
-| [Precipitation Rate](./json/precipitationRate.json) | 1 | proposed |  | [json](./json/precipitationRate.i18n.fr.json) |
+| [Precipitation Measurement](./json/precipitationMeasurement.json) | 1 | deprecated |  | [json](./json/precipitationMeasurement.i18n.fr.json) |
+| [Precipitation Rate](./json/precipitationRate.json) | 1 | deprecated |  | [json](./json/precipitationRate.i18n.fr.json) |
 | [Precipitation Sensor](./json/precipitationSensor.json) | 1 | live | [json](./json/precipitationSensorPresentation.json) | [json](./json/precipitationSensor.i18n.fr.json) |
 | [Presence Sensor](./json/presenceSensor.json) | 1 | live | [json](./json/presenceSensorPresentation.json) | [json](./json/presenceSensor.i18n.fr.json) |
 | [Pump Control Mode](./json/pumpControlMode.json) | 1 | proposed | [json](./json/pumpControlModePresentation.json) | [json](./json/pumpControlMode.i18n.fr.json) |
@@ -288,7 +306,7 @@
 | [Rain Sensor](./json/rainSensor.json) | 1 | proposed | [json](./json/rainSensorPresentation.json) | [json](./json/rainSensor.i18n.fr.json) |
 | [Rapid Cooling](./json/rapidCooling.json) | 1 | proposed | [json](./json/rapidCoolingPresentation.json) | [json](./json/rapidCooling.i18n.fr.json) |
 | [Refresh](./json/refresh.json) | 1 | live | [json](./json/refreshPresentation.json) | [json](./json/refresh.i18n.fr.json) |
-| [Refrigeration](./json/refrigeration.json) | 1 | live | [json](./json/refrigerationPresentation.json) | [json](./json/refrigeration.i18n.fr.json) |
+| [Refrigeration](./json/refrigeration.json) | 1 | deprecated | [json](./json/refrigerationPresentation.json) | [json](./json/refrigeration.i18n.fr.json) |
 | [Refrigeration Setpoint](./json/refrigerationSetpoint.json) | 1 | proposed | [json](./json/refrigerationSetpointPresentation.json) | [json](./json/refrigerationSetpoint.i18n.fr.json) |
 | [Relative Brightness](./json/relativeBrightness.json) | 1 | proposed | [json](./json/relativeBrightnessPresentation.json) | [json](./json/relativeBrightness.i18n.fr.json) |
 | [Relative Humidity Measurement](./json/relativeHumidityMeasurement.json) | 1 | live | [json](./json/relativeHumidityMeasurementPresentation.json) | [json](./json/relativeHumidityMeasurement.i18n.fr.json) |
@@ -300,8 +318,8 @@
 | [Robot Cleaner Operating State](./json/robotCleanerOperatingState.json) | 1 | live | [json](./json/robotCleanerOperatingStatePresentation.json) | [json](./json/robotCleanerOperatingState.i18n.fr.json) |
 | [Robot Cleaner State](./json/robotCleanerState.json) | 1 | deprecated |  | [json](./json/robotCleanerState.i18n.fr.json) |
 | [Robot Cleaner Turbo Mode](./json/robotCleanerTurboMode.json) | 1 | live | [json](./json/robotCleanerTurboModePresentation.json) | [json](./json/robotCleanerTurboMode.i18n.fr.json) |
-| [Safety Switch](./json/safetySwitch.json) | 1 | proposed |  | [json](./json/safetySwitch.i18n.fr.json) |
-| [Safety Valve](./json/safetyValve.json) | 1 | proposed |  | [json](./json/safetyValve.i18n.fr.json) |
+| [Safety Switch](./json/safetySwitch.json) | 1 | proposed | [json](./json/safetySwitchPresentation.json) | [json](./json/safetySwitch.i18n.fr.json) |
+| [Safety Valve](./json/safetyValve.json) | 1 | proposed | [json](./json/safetyValvePresentation.json) | [json](./json/safetyValve.i18n.fr.json) |
 | [Samsung TV](./json/samsungTV.json) | 1 | deprecated |  | [json](./json/samsungTV.i18n.fr.json) |
 | [Samsung TV](./json/samsungTv.json) | 1 | live |  | [json](./json/samsungTv.i18n.fr.json) |
 | [Auto Dispense Detergent](./json/samsungce.autoDispenseDetergent.json) | 1 | proposed |  | [json](./json/samsungce.autoDispenseDetergent.i18n.fr.json) |
@@ -352,7 +370,7 @@
 | [Remote Management Data](./json/samsungce.remoteManagementData.json) | 1 | proposed |  | [json](./json/samsungce.remoteManagementData.i18n.fr.json) |
 | [Robot Cleaner Audio Clip](./json/samsungce.robotCleanerAudioClip.json) | 1 | proposed |  | [json](./json/samsungce.robotCleanerAudioClip.i18n.fr.json) |
 | [Robot Cleaner Avp Registration](./json/samsungce.robotCleanerAvpRegistration.json) | 1 | proposed |  | [json](./json/samsungce.robotCleanerAvpRegistration.i18n.fr.json) |
-| [Robot Cleaner Cleaning Mode](./json/samsungce.robotCleanerCleaningMode.json) | 1 | proposed |  | [json](./json/samsungce.robotCleanerCleaningMode.i18n.fr.json) |
+| [Robot Cleaner Cleaning Mode](./json/samsungce.robotCleanerCleaningMode.json) | 1 | proposed | [json](./json/samsungce.robotCleanerCleaningModePresentation.json) | [json](./json/samsungce.robotCleanerCleaningMode.i18n.fr.json) |
 | [Robot Cleaner Dust Bag](./json/samsungce.robotCleanerDustBag.json) | 1 | proposed |  | [json](./json/samsungce.robotCleanerDustBag.i18n.fr.json) |
 | [Robot Cleaner Map Area Info](./json/samsungce.robotCleanerMapAreaInfo.json) | 1 | proposed |  |  |
 | [Robot Cleaner Map Cleaning Info](./json/samsungce.robotCleanerMapCleaningInfo.json) | 1 | proposed |  | [json](./json/samsungce.robotCleanerMapCleaningInfo.i18n.fr.json) |
@@ -378,7 +396,7 @@
 | [Toggle Switch](./json/samsungce.toggleSwitch.json) | 1 | proposed | [json](./json/samsungce.toggleSwitchPresentation.json) | [json](./json/samsungce.toggleSwitch.i18n.fr.json) |
 | [View Inside](./json/samsungce.viewInside.json) | 1 | proposed |  | [json](./json/samsungce.viewInside.i18n.fr.json) |
 | [Washer Bubble Soak](./json/samsungce.washerBubbleSoak.json) | 1 | proposed |  | [json](./json/samsungce.washerBubbleSoak.i18n.fr.json) |
-| [Washer Cycle](./json/samsungce.washerCycle.json) | 1 | proposed |  | [json](./json/samsungce.washerCycle.i18n.fr.json) |
+| [Washer Cycle](./json/samsungce.washerCycle.json) | 1 | proposed | [json](./json/samsungce.washerCyclePresentation.json) | [json](./json/samsungce.washerCycle.i18n.fr.json) |
 | [Washer Cycle Preset](./json/samsungce.washerCyclePreset.json) | 1 | proposed |  | [json](./json/samsungce.washerCyclePreset.i18n.fr.json) |
 | [Washer Delay End](./json/samsungce.washerDelayEnd.json) | 1 | proposed |  | [json](./json/samsungce.washerDelayEnd.i18n.fr.json) |
 | [Washer Freeze Prevent](./json/samsungce.washerFreezePrevent.json) | 1 | proposed | [json](./json/samsungce.washerFreezePreventPresentation.json) | [json](./json/samsungce.washerFreezePrevent.i18n.fr.json) |
@@ -427,32 +445,36 @@
 | [StartStopProgramV3](./json/signalahead13665.startstopprogramv3.json) | 1 | proposed | [json](./json/signalahead13665.startstopprogramv3Presentation.json) | [json](./json/signalahead13665.startstopprogramv3.i18n.fr.json) |
 | [Sleep Sensor](./json/sleepSensor.json) | 1 | live | [json](./json/sleepSensorPresentation.json) | [json](./json/sleepSensor.i18n.fr.json) |
 | [Smoke Detector](./json/smokeDetector.json) | 1 | live | [json](./json/smokeDetectorPresentation.json) | [json](./json/smokeDetector.i18n.fr.json) |
+| [Soil Moisture Measurement](./json/soilMoistureMeasurement.json) | 1 | proposed |  | [json](./json/soilMoistureMeasurement.i18n.fr.json) |
 | [Sound Detection](./json/soundDetection.json) | 1 | live | [json](./json/soundDetectionPresentation.json) | [json](./json/soundDetection.i18n.fr.json) |
 | [Sound Pressure Level](./json/soundPressureLevel.json) | 1 | live | [json](./json/soundPressureLevelPresentation.json) | [json](./json/soundPressureLevel.i18n.fr.json) |
 | [Sound Sensor](./json/soundSensor.json) | 1 | live | [json](./json/soundSensorPresentation.json) | [json](./json/soundSensor.i18n.fr.json) |
+| [Sounds](./json/sounds.json) | 1 | proposed |  | [json](./json/sounds.i18n.fr.json) |
 | [Speech Recognition](./json/speechRecognition.json) | 1 | proposed |  | [json](./json/speechRecognition.i18n.fr.json) |
 | [Speech Synthesis](./json/speechSynthesis.json) | 1 | proposed | [json](./json/speechSynthesisPresentation.json) | [json](./json/speechSynthesis.i18n.fr.json) |
-| [Stateless Air Cleaner Mode Button](./json/statelessAirCleanerModeButton.json) | 1 | proposed | [json](./json/statelessAirCleanerModeButtonPresentation.json) | [json](./json/statelessAirCleanerModeButton.i18n.fr.json) |
-| [Stateless Audio Mute Button](./json/statelessAudioMuteButton.json) | 1 | live | [json](./json/statelessAudioMuteButtonPresentation.json) | [json](./json/statelessAudioMuteButton.i18n.fr.json) |
-| [Stateless Audio Volume Button](./json/statelessAudioVolumeButton.json) | 1 | live | [json](./json/statelessAudioVolumeButtonPresentation.json) | [json](./json/statelessAudioVolumeButton.i18n.fr.json) |
-| [Stateless Channel Button](./json/statelessChannelButton.json) | 1 | live | [json](./json/statelessChannelButtonPresentation.json) | [json](./json/statelessChannelButton.i18n.fr.json) |
+| [Stateless Air Cleaner Mode Button](./json/statelessAirCleanerModeButton.json) | 1 | deprecated | [json](./json/statelessAirCleanerModeButtonPresentation.json) | [json](./json/statelessAirCleanerModeButton.i18n.fr.json) |
+| [Stateless Audio Mute Button](./json/statelessAudioMuteButton.json) | 1 | deprecated | [json](./json/statelessAudioMuteButtonPresentation.json) | [json](./json/statelessAudioMuteButton.i18n.fr.json) |
+| [Stateless Audio Volume Button](./json/statelessAudioVolumeButton.json) | 1 | deprecated | [json](./json/statelessAudioVolumeButtonPresentation.json) | [json](./json/statelessAudioVolumeButton.i18n.fr.json) |
+| [Stateless Channel Button](./json/statelessChannelButton.json) | 1 | deprecated | [json](./json/statelessChannelButtonPresentation.json) | [json](./json/statelessChannelButton.i18n.fr.json) |
+| [Stateless Color Temperature Step](./json/statelessColorTemperatureStep.json) | 1 | proposed | [json](./json/statelessColorTemperatureStepPresentation.json) | [json](./json/statelessColorTemperatureStep.i18n.fr.json) |
 | [Stateless Curtain Power Button](./json/statelessCurtainPowerButton.json) | 1 | proposed | [json](./json/statelessCurtainPowerButtonPresentation.json) | [json](./json/statelessCurtainPowerButton.i18n.fr.json) |
-| [Stateless Custom Button](./json/statelessCustomButton.json) | 1 | live | [json](./json/statelessCustomButtonPresentation.json) | [json](./json/statelessCustomButton.i18n.fr.json) |
-| [Stateless Fanspeed Button](./json/statelessFanspeedButton.json) | 1 | live | [json](./json/statelessFanspeedButtonPresentation.json) | [json](./json/statelessFanspeedButton.i18n.fr.json) |
-| [Stateless Fanspeed Mode Button](./json/statelessFanspeedModeButton.json) | 1 | proposed | [json](./json/statelessFanspeedModeButtonPresentation.json) | [json](./json/statelessFanspeedModeButton.i18n.fr.json) |
-| [Stateless Humidifier Mode Button](./json/statelessHumidifierModeButton.json) | 1 | proposed | [json](./json/statelessHumidifierModeButtonPresentation.json) | [json](./json/statelessHumidifierModeButton.i18n.fr.json) |
-| [Stateless Media Playback Button](./json/statelessMediaPlaybackButton.json) | 1 | proposed | [json](./json/statelessMediaPlaybackButtonPresentation.json) | [json](./json/statelessMediaPlaybackButton.i18n.fr.json) |
+| [Stateless Custom Button](./json/statelessCustomButton.json) | 1 | deprecated | [json](./json/statelessCustomButtonPresentation.json) | [json](./json/statelessCustomButton.i18n.fr.json) |
+| [Stateless Fanspeed Button](./json/statelessFanspeedButton.json) | 1 | deprecated | [json](./json/statelessFanspeedButtonPresentation.json) | [json](./json/statelessFanspeedButton.i18n.fr.json) |
+| [Stateless Fanspeed Mode Button](./json/statelessFanspeedModeButton.json) | 1 | deprecated | [json](./json/statelessFanspeedModeButtonPresentation.json) | [json](./json/statelessFanspeedModeButton.i18n.fr.json) |
+| [Stateless Humidifier Mode Button](./json/statelessHumidifierModeButton.json) | 1 | deprecated | [json](./json/statelessHumidifierModeButtonPresentation.json) | [json](./json/statelessHumidifierModeButton.i18n.fr.json) |
+| [Stateless Media Playback Button](./json/statelessMediaPlaybackButton.json) | 1 | deprecated | [json](./json/statelessMediaPlaybackButtonPresentation.json) | [json](./json/statelessMediaPlaybackButton.i18n.fr.json) |
 | [Stateless Power Button](./json/statelessPowerButton.json) | 1 | live | [json](./json/statelessPowerButtonPresentation.json) | [json](./json/statelessPowerButton.i18n.fr.json) |
 | [Stateless Power Toggle Button](./json/statelessPowerToggleButton.json) | 1 | live | [json](./json/statelessPowerToggleButtonPresentation.json) | [json](./json/statelessPowerToggleButton.i18n.fr.json) |
-| [Stateless Robot Cleaner Action Button](./json/statelessRobotCleanerActionButton.json) | 1 | proposed | [json](./json/statelessRobotCleanerActionButtonPresentation.json) | [json](./json/statelessRobotCleanerActionButton.i18n.fr.json) |
-| [Stateless Robot Cleaner Home Button](./json/statelessRobotCleanerHomeButton.json) | 1 | proposed | [json](./json/statelessRobotCleanerHomeButtonPresentation.json) | [json](./json/statelessRobotCleanerHomeButton.i18n.fr.json) |
-| [Stateless Robot Cleaner Toggle Button](./json/statelessRobotCleanerToggleButton.json) | 1 | proposed | [json](./json/statelessRobotCleanerToggleButtonPresentation.json) | [json](./json/statelessRobotCleanerToggleButton.i18n.fr.json) |
+| [Stateless Robot Cleaner Action Button](./json/statelessRobotCleanerActionButton.json) | 1 | deprecated | [json](./json/statelessRobotCleanerActionButtonPresentation.json) | [json](./json/statelessRobotCleanerActionButton.i18n.fr.json) |
+| [Stateless Robot Cleaner Home Button](./json/statelessRobotCleanerHomeButton.json) | 1 | deprecated | [json](./json/statelessRobotCleanerHomeButtonPresentation.json) | [json](./json/statelessRobotCleanerHomeButton.i18n.fr.json) |
+| [Stateless Robot Cleaner Toggle Button](./json/statelessRobotCleanerToggleButton.json) | 1 | deprecated | [json](./json/statelessRobotCleanerToggleButtonPresentation.json) | [json](./json/statelessRobotCleanerToggleButton.i18n.fr.json) |
 | [Stateless Scenes](./json/statelessScenes.json) | 1 | proposed |  | [json](./json/statelessScenes.i18n.fr.json) |
-| [Stateless Set Channel Button](./json/statelessSetChannelButton.json) | 1 | proposed | [json](./json/statelessSetChannelButtonPresentation.json) | [json](./json/statelessSetChannelButton.i18n.fr.json) |
-| [Stateless Set Channel By Content Button](./json/statelessSetChannelByContentButton.json) | 1 | proposed | [json](./json/statelessSetChannelByContentButtonPresentation.json) | [json](./json/statelessSetChannelByContentButton.i18n.fr.json) |
-| [Stateless Set Channel By Name Button](./json/statelessSetChannelByNameButton.json) | 1 | proposed | [json](./json/statelessSetChannelByNameButtonPresentation.json) | [json](./json/statelessSetChannelByNameButton.i18n.fr.json) |
-| [Stateless Temperature Button](./json/statelessTemperatureButton.json) | 1 | live | [json](./json/statelessTemperatureButtonPresentation.json) | [json](./json/statelessTemperatureButton.i18n.fr.json) |
-| [Stateless Volume Button With Repetition](./json/statelessVolumeButtonWithRepetition.json) | 1 | proposed | [json](./json/statelessVolumeButtonWithRepetitionPresentation.json) | [json](./json/statelessVolumeButtonWithRepetition.i18n.fr.json) |
+| [Stateless Set Channel Button](./json/statelessSetChannelButton.json) | 1 | deprecated | [json](./json/statelessSetChannelButtonPresentation.json) | [json](./json/statelessSetChannelButton.i18n.fr.json) |
+| [Stateless Set Channel By Content Button](./json/statelessSetChannelByContentButton.json) | 1 | deprecated | [json](./json/statelessSetChannelByContentButtonPresentation.json) | [json](./json/statelessSetChannelByContentButton.i18n.fr.json) |
+| [Stateless Set Channel By Name Button](./json/statelessSetChannelByNameButton.json) | 1 | deprecated | [json](./json/statelessSetChannelByNameButtonPresentation.json) | [json](./json/statelessSetChannelByNameButton.i18n.fr.json) |
+| [Stateless Switch Level Step](./json/statelessSwitchLevelStep.json) | 1 | proposed | [json](./json/statelessSwitchLevelStepPresentation.json) | [json](./json/statelessSwitchLevelStep.i18n.fr.json) |
+| [Stateless Temperature Button](./json/statelessTemperatureButton.json) | 1 | deprecated | [json](./json/statelessTemperatureButtonPresentation.json) | [json](./json/statelessTemperatureButton.i18n.fr.json) |
+| [Stateless Volume Button With Repetition](./json/statelessVolumeButtonWithRepetition.json) | 1 | deprecated | [json](./json/statelessVolumeButtonWithRepetitionPresentation.json) | [json](./json/statelessVolumeButtonWithRepetition.i18n.fr.json) |
 | [Step Sensor](./json/stepSensor.json) | 1 | deprecated |  | [json](./json/stepSensor.i18n.fr.json) |
 | [Switch](./json/switch.json) | 1 | live | [json](./json/switchPresentation.json) | [json](./json/switch.i18n.fr.json) |
 | [Switch Level](./json/switchLevel.json) | 1 | live | [json](./json/switchLevelPresentation.json) | [json](./json/switchLevel.i18n.fr.json) |
@@ -472,7 +494,7 @@
 | [Temperature Level](./json/temperatureLevel.json) | 1 | live | [json](./json/temperatureLevelPresentation.json) | [json](./json/temperatureLevel.i18n.fr.json) |
 | [Temperature Measurement](./json/temperatureMeasurement.json) | 1 | live | [json](./json/temperatureMeasurementPresentation.json) | [json](./json/temperatureMeasurement.i18n.fr.json) |
 | [Temperature Setpoint](./json/temperatureSetpoint.json) | 1 | live | [json](./json/temperatureSetpointPresentation.json) | [json](./json/temperatureSetpoint.i18n.fr.json) |
-| [Test Capability](./json/testCapability.json) | 1 | live |  | [json](./json/testCapability.i18n.fr.json) |
+| [Test Capability](./json/testCapability.json) | 1 | deprecated |  | [json](./json/testCapability.i18n.fr.json) |
 | [Thermostat](./json/thermostat.json) | 1 | deprecated | [json](./json/thermostatPresentation.json) | [json](./json/thermostat.i18n.fr.json) |
 | [Thermostat Cooling Setpoint](./json/thermostatCoolingSetpoint.json) | 1 | live | [json](./json/thermostatCoolingSetpointPresentation.json) | [json](./json/thermostatCoolingSetpoint.i18n.fr.json) |
 | [Thermostat Fan Mode](./json/thermostatFanMode.json) | 1 | live | [json](./json/thermostatFanModePresentation.json) | [json](./json/thermostatFanMode.i18n.fr.json) |
@@ -482,6 +504,8 @@
 | [Thermostat Schedule](./json/thermostatSchedule.json) | 1 | deprecated |  | [json](./json/thermostatSchedule.i18n.fr.json) |
 | [Thermostat Setpoint](./json/thermostatSetpoint.json) | 1 | deprecated | [json](./json/thermostatSetpointPresentation.json) | [json](./json/thermostatSetpoint.i18n.fr.json) |
 | [Thermostat Water Heating Setpoint](./json/thermostatWaterHeatingSetpoint.json) | 1 | proposed | [json](./json/thermostatWaterHeatingSetpointPresentation.json) | [json](./json/thermostatWaterHeatingSetpoint.i18n.fr.json) |
+| [Thread Border Router](./json/threadBorderRouter.json) | 1 | proposed |  | [json](./json/threadBorderRouter.i18n.fr.json) |
+| [Thread Network](./json/threadNetwork.json) | 1 | proposed |  | [json](./json/threadNetwork.i18n.fr.json) |
 | [Three Axis](./json/threeAxis.json) | 1 | live | [json](./json/threeAxisPresentation.json) | [json](./json/threeAxis.i18n.fr.json) |
 | [Timed Session](./json/timedSession.json) | 1 | deprecated |  | [json](./json/timedSession.i18n.fr.json) |
 | [Tone](./json/tone.json) | 1 | live | [json](./json/tonePresentation.json) | [json](./json/tone.i18n.fr.json) |
@@ -491,19 +515,26 @@
 | [Tvoc Measurement](./json/tvocMeasurement.json) | 1 | live | [json](./json/tvocMeasurementPresentation.json) | [json](./json/tvocMeasurement.i18n.fr.json) |
 | [Ultraviolet Index](./json/ultravioletIndex.json) | 1 | live | [json](./json/ultravioletIndexPresentation.json) | [json](./json/ultravioletIndex.i18n.fr.json) |
 | [Valve](./json/valve.json) | 1 | live | [json](./json/valvePresentation.json) | [json](./json/valve.i18n.fr.json) |
+| [Vehicle Battery](./json/vehicleBattery.json) | 1 | proposed | [json](./json/vehicleBatteryPresentation.json) | [json](./json/vehicleBattery.i18n.fr.json) |
+| [Vehicle Door State](./json/vehicleDoorState.json) | 1 | proposed | [json](./json/vehicleDoorStatePresentation.json) | [json](./json/vehicleDoorState.i18n.fr.json) |
 | [Vehicle Engine](./json/vehicleEngine.json) | 1 | proposed | [json](./json/vehicleEnginePresentation.json) | [json](./json/vehicleEngine.i18n.fr.json) |
 | [Vehicle Fuel Level](./json/vehicleFuelLevel.json) | 1 | proposed | [json](./json/vehicleFuelLevelPresentation.json) | [json](./json/vehicleFuelLevel.i18n.fr.json) |
+| [Vehicle Hvac](./json/vehicleHvac.json) | 1 | proposed | [json](./json/vehicleHvacPresentation.json) | [json](./json/vehicleHvac.i18n.fr.json) |
+| [Vehicle Hvac Remote Switch](./json/vehicleHvacRemoteSwitch.json) | 1 | proposed | [json](./json/vehicleHvacRemoteSwitchPresentation.json) | [json](./json/vehicleHvacRemoteSwitch.i18n.fr.json) |
 | [Vehicle Information](./json/vehicleInformation.json) | 1 | proposed | [json](./json/vehicleInformationPresentation.json) | [json](./json/vehicleInformation.i18n.fr.json) |
 | [Vehicle Odometer](./json/vehicleOdometer.json) | 1 | proposed | [json](./json/vehicleOdometerPresentation.json) | [json](./json/vehicleOdometer.i18n.fr.json) |
 | [Vehicle Range](./json/vehicleRange.json) | 1 | proposed | [json](./json/vehicleRangePresentation.json) | [json](./json/vehicleRange.i18n.fr.json) |
 | [Vehicle Tire Pressure Monitor](./json/vehicleTirePressureMonitor.json) | 1 | proposed | [json](./json/vehicleTirePressureMonitorPresentation.json) | [json](./json/vehicleTirePressureMonitor.i18n.fr.json) |
+| [Vehicle Warning](./json/vehicleWarning.json) | 1 | proposed | [json](./json/vehicleWarningPresentation.json) | [json](./json/vehicleWarning.i18n.fr.json) |
+| [Vehicle Window State](./json/vehicleWindowState.json) | 1 | proposed | [json](./json/vehicleWindowStatePresentation.json) | [json](./json/vehicleWindowState.i18n.fr.json) |
 | [Very Fine Dust Health Concern](./json/veryFineDustHealthConcern.json) | 1 | live | [json](./json/veryFineDustHealthConcernPresentation.json) | [json](./json/veryFineDustHealthConcern.i18n.fr.json) |
 | [Very Fine Dust Sensor](./json/veryFineDustSensor.json) | 1 | live | [json](./json/veryFineDustSensorPresentation.json) | [json](./json/veryFineDustSensor.i18n.fr.json) |
 | [Video Camera](./json/videoCamera.json) | 1 | live | [json](./json/videoCameraPresentation.json) | [json](./json/videoCamera.i18n.fr.json) |
 | [Video Capture](./json/videoCapture.json) | 1 | live | [json](./json/videoCapturePresentation.json) | [json](./json/videoCapture.i18n.fr.json) |
-| [Video Capture 2](./json/videoCapture2.json) | 1 | proposed |  | [json](./json/videoCapture2.i18n.fr.json) |
+| [Video Capture 2](./json/videoCapture2.json) | 1 | proposed | [json](./json/videoCapture2Presentation.json) | [json](./json/videoCapture2.i18n.fr.json) |
 | [Video Clips](./json/videoClips.json) | 1 | deprecated |  | [json](./json/videoClips.i18n.fr.json) |
 | [Video Stream](./json/videoStream.json) | 1 | live | [json](./json/videoStreamPresentation.json) | [json](./json/videoStream.i18n.fr.json) |
+| [Video Stream Settings](./json/videoStreamSettings.json) | 1 | proposed |  | [json](./json/videoStreamSettings.i18n.fr.json) |
 | [Voltage Measurement](./json/voltageMeasurement.json) | 1 | live | [json](./json/voltageMeasurementPresentation.json) | [json](./json/voltageMeasurement.i18n.fr.json) |
 | [Washer Mode](./json/washerMode.json) | 1 | proposed | [json](./json/washerModePresentation.json) | [json](./json/washerMode.i18n.fr.json) |
 | [Washer Operating State](./json/washerOperatingState.json) | 1 | live | [json](./json/washerOperatingStatePresentation.json) | [json](./json/washerOperatingState.i18n.fr.json) |
@@ -524,5 +555,6 @@
 | [Window Shade Preset](./json/windowShadePreset.json) | 1 | live | [json](./json/windowShadePresetPresentation.json) | [json](./json/windowShadePreset.i18n.fr.json) |
 | [Window Shade Tilt Level](./json/windowShadeTiltLevel.json) | 1 | proposed | [json](./json/windowShadeTiltLevelPresentation.json) | [json](./json/windowShadeTiltLevel.i18n.fr.json) |
 | [Wireless Operating Mode](./json/wirelessOperatingMode.json) | 1 | proposed | [json](./json/wirelessOperatingModePresentation.json) | [json](./json/wirelessOperatingMode.i18n.fr.json) |
-| [Zw Multichannel](./json/zwMultichannel.json) | 1 | live |  | [json](./json/zwMultichannel.i18n.fr.json) |
+| [Zone Management](./json/zoneManagement.json) | 1 | proposed |  | [json](./json/zoneManagement.i18n.fr.json) |
+| [Zw Multichannel](./json/zwMultichannel.json) | 1 | deprecated |  | [json](./json/zwMultichannel.i18n.fr.json) |
 
diff --git a/capabilities.json b/capabilities.json
index 35794609..8afb10ab 100644
--- a/capabilities.json
+++ b/capabilities.json
@@ -51,14 +51,14 @@
     {
         "id": "airPurifierFanMode",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "airQualityHealthConcern",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -76,6 +76,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "alarmSensor",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "alarmsensor",
         "version": 1,
@@ -97,6 +104,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "antiSnoringPillow",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "applianceUtilization",
         "version": 1,
@@ -114,7 +128,7 @@
     {
         "id": "atmosphericPressureMeasurement",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -139,6 +153,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "audioRecording",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "audioStream",
         "version": 1,
@@ -156,7 +177,7 @@
     {
         "id": "audioTrackData",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -184,7 +205,7 @@
     {
         "id": "batteryLevel",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -258,6 +279,20 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "cameraPrivacyMode",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "cameraViewportSettings",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "carbonDioxideHealthConcern",
         "version": 1,
@@ -314,6 +349,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "coffeeMakerOperation",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "color",
         "version": 1,
@@ -345,7 +387,7 @@
     {
         "id": "configuration",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -356,6 +398,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "consumableLife",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "contactSensor",
         "version": 1,
@@ -363,6 +412,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "containerState",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "cookTime",
         "version": 1,
@@ -377,6 +433,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "deliveryRobotCall",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "demandResponseLoadControl",
         "version": 1,
@@ -419,6 +482,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "doorState",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "drivingStatus",
         "version": 1,
@@ -461,6 +531,20 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "endToEndEncryption",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": true,
+        "namespace": "st"
+    },
+    {
+        "id": "endToEndEncryptionState",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "energyMeter",
         "version": 1,
@@ -510,6 +594,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "fanDirection",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "fanMode",
         "version": 1,
@@ -588,12 +679,26 @@
         "namespace": "st"
     },
     {
-        "id": "formaldehydeHealthConcern",
+        "id": "flowMeasurement",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "foodWasteDryingGrinder",
         "version": 1,
         "status": "proposed",
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "formaldehydeHealthConcern",
+        "version": 1,
+        "status": "live",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "formaldehydeMeasurement",
         "version": 1,
@@ -660,6 +765,13 @@
     {
         "id": "hardwareFault",
         "version": 1,
+        "status": "live",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "hdr",
+        "version": 1,
         "status": "proposed",
         "ephemeral": false,
         "namespace": "st"
@@ -699,6 +811,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "imageControl",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "indicator",
         "version": 1,
@@ -721,23 +840,30 @@
         "namespace": "st"
     },
     {
-        "id": "languageSetting",
+        "id": "knob",
         "version": 1,
         "status": "proposed",
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "languageSetting",
+        "version": 1,
+        "status": "deprecated",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "laundryWasherRinseMode",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "laundryWasherSpinSpeed",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -762,6 +888,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "localMediaStorage",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "locationMode",
         "version": 1,
@@ -783,6 +916,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "lockAliro",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "lockCodes",
         "version": 1,
@@ -821,17 +961,66 @@
     {
         "id": "logTrigger",
         "version": 1,
+        "status": "deprecated",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "massageIntensityChange",
+        "version": 1,
         "status": "proposed",
         "ephemeral": false,
         "namespace": "st"
     },
     {
-        "id": "mediaController",
+        "id": "massageIntensityControl",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "massageOperating",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "massageOperatingState",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "massageTimeChange",
         "version": 1,
         "status": "proposed",
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "massageTimeControl",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "mechanicalPanTiltZoom",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "mediaController",
+        "version": 1,
+        "status": "deprecated",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "mediaGroup",
         "version": 1,
@@ -902,6 +1091,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "motionBed",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "motionSensor",
         "version": 1,
@@ -933,21 +1129,28 @@
     {
         "id": "networkMeter",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
-        "id": "nitrogenDioxideHealthConcern",
+        "id": "nightVision",
         "version": 1,
         "status": "proposed",
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "nitrogenDioxideHealthConcern",
+        "version": 1,
+        "status": "live",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "nitrogenDioxideMeasurement",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1038,14 +1241,14 @@
     {
         "id": "ozoneHealthConcern",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "ozoneMeasurement",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1059,6 +1262,13 @@
     {
         "id": "pestControl",
         "version": 1,
+        "status": "live",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "petActivity",
+        "version": 1,
         "status": "proposed",
         "ephemeral": false,
         "namespace": "st"
@@ -1070,6 +1280,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "plantCultivation",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "polling",
         "version": 1,
@@ -1101,14 +1318,14 @@
     {
         "id": "precipitationMeasurement",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "precipitationRate",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1178,7 +1395,7 @@
     {
         "id": "refrigeration",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1241,7 +1458,7 @@
     {
         "id": "robotCleanerOperatingState",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1260,9 +1477,16 @@
         "namespace": "st"
     },
     {
-        "id": "samsungTV",
+        "id": "safetySwitch",
         "version": 1,
-        "status": "deprecated",
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "safetyValve",
+        "version": 1,
+        "status": "proposed",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1273,6 +1497,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "samsungTV",
+        "version": 1,
+        "status": "deprecated",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "sceneActivity",
         "version": 1,
@@ -1308,6 +1539,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "serviceArea",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "shockSensor",
         "version": 1,
@@ -1336,6 +1574,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "soilMoistureMeasurement",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "soundDetection",
         "version": 1,
@@ -1350,6 +1595,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "sounds",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "soundSensor",
         "version": 1,
@@ -1374,28 +1626,35 @@
     {
         "id": "statelessAirCleanerModeButton",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessAudioMuteButton",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessAudioVolumeButton",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessChannelButton",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "statelessColorTemperatureStep",
+        "version": 1,
+        "status": "proposed",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1409,35 +1668,35 @@
     {
         "id": "statelessCustomButton",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessFanspeedButton",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessFanspeedModeButton",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessHumidifierModeButton",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessMediaPlaybackButton",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1458,21 +1717,21 @@
     {
         "id": "statelessRobotCleanerActionButton",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessRobotCleanerHomeButton",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessRobotCleanerToggleButton",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1486,20 +1745,27 @@
     {
         "id": "statelessSetChannelButton",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessSetChannelByContentButton",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessSetChannelByNameButton",
         "version": 1,
+        "status": "deprecated",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "statelessSwitchLevelStep",
+        "version": 1,
         "status": "proposed",
         "ephemeral": false,
         "namespace": "st"
@@ -1507,14 +1773,14 @@
     {
         "id": "statelessTemperatureButton",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "statelessVolumeButtonWithRepetition",
         "version": 1,
-        "status": "proposed",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1563,7 +1829,7 @@
     {
         "id": "temperatureLevel",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1577,14 +1843,14 @@
     {
         "id": "temperatureSetpoint",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
     {
         "id": "testCapability",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1651,6 +1917,20 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "threadBorderRouter",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "threadNetwork",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "threeAxis",
         "version": 1,
@@ -1721,6 +2001,20 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "vehicleBattery",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "vehicleDoorState",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "vehicleEngine",
         "version": 1,
@@ -1735,6 +2029,20 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "vehicleHvac",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "vehicleHvacRemoteSwitch",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "vehicleInformation",
         "version": 1,
@@ -1763,6 +2071,20 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "vehicleWarning",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
+    {
+        "id": "vehicleWindowState",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "veryFineDustHealthConcern",
         "version": 1,
@@ -1812,6 +2134,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "videoStreamSettings",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "voltageMeasurement",
         "version": 1,
@@ -1889,6 +2218,13 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "wifiInformation",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "wifiMeshRouter",
         "version": 1,
@@ -1899,7 +2235,7 @@
     {
         "id": "windMode",
         "version": 1,
-        "status": "proposed",
+        "status": "live",
         "ephemeral": false,
         "namespace": "st"
     },
@@ -1945,10 +2281,17 @@
         "ephemeral": false,
         "namespace": "st"
     },
+    {
+        "id": "zoneManagement",
+        "version": 1,
+        "status": "proposed",
+        "ephemeral": false,
+        "namespace": "st"
+    },
     {
         "id": "zwMultichannel",
         "version": 1,
-        "status": "live",
+        "status": "deprecated",
         "ephemeral": false,
         "namespace": "st"
     }
diff --git a/json/accelerationSensorPresentation.json b/json/accelerationSensorPresentation.json
index ad818a2a..12fe2e7e 100755
--- a/json/accelerationSensorPresentation.json
+++ b/json/accelerationSensorPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "active",
-                        "value": "{{i18n.attributes.acceleration.i18n.value.active.label}}",
+                        "value": "Vibration detected",
                         "type": "active"
                     },
                     {
                         "key": "inactive",
-                        "value": "{{i18n.attributes.acceleration.i18n.value.inactive.label}}",
+                        "value": "No vibration",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Vibration sensor",
             "displayType": "state",
             "state": {
                 "label": "{{acceleration.value}}",
                 "alternatives": [
                     {
                         "key": "active",
-                        "value": "{{i18n.attributes.acceleration.i18n.value.active.label}}",
+                        "value": "Vibration detected",
                         "type": "active"
                     },
                     {
                         "key": "inactive",
-                        "value": "{{i18n.attributes.acceleration.i18n.value.inactive.label}}",
+                        "value": "No vibration",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Vibration sensor",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "active",
-                            "value": "{{i18n.attributes.acceleration.i18n.value.active.label}}",
+                            "value": "Vibration detected",
                             "type": "active"
                         },
                         {
                             "key": "inactive",
-                            "value": "{{i18n.attributes.acceleration.i18n.value.inactive.label}}",
+                            "value": "No vibration",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/activityLightingMode.i18n.en.json b/json/activityLightingMode.i18n.en.json
index 1c9a88c4..6dfebb84 100755
--- a/json/activityLightingMode.i18n.en.json
+++ b/json/activityLightingMode.i18n.en.json
@@ -1,6 +1,7 @@
 {
     "tag": "en",
     "label": "Light mode",
+    "description": "Set the temperature of a light based on pre-configured activities.",
     "attributes": {
         "lightingMode": {
             "label": "Light mode",
diff --git a/json/activityLightingMode.i18n.fr.json b/json/activityLightingMode.i18n.fr.json
index 0ea22685..a1b2633b 100755
--- a/json/activityLightingMode.i18n.fr.json
+++ b/json/activityLightingMode.i18n.fr.json
@@ -1,6 +1,7 @@
 {
     "tag": "fr",
     "label": "Mode d'éclairage",
+    "description": "Set the temperature of a light based on pre-configured activities.",
     "attributes": {
         "lightingMode": {
             "label": "Mode d'éclairage",
diff --git a/json/activityLightingModePresentation.json b/json/activityLightingModePresentation.json
index 50bc9932..ff5cb8ce 100755
--- a/json/activityLightingModePresentation.json
+++ b/json/activityLightingModePresentation.json
@@ -6,51 +6,51 @@
                 "alternatives": [
                     {
                         "key": "reading",
-                        "value": "{{i18n.attributes.lightingMode.i18n.value.reading.label}}",
+                        "value": "Reading",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_READING"
+                        "description": "4000K natural light for comfortable reading."
                     },
                     {
                         "key": "writing",
-                        "value": "{{i18n.attributes.lightingMode.i18n.value.writing.label}}",
+                        "value": "Writing",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_WRIGHTING"
+                        "description": "5000K white light that makes it easy to focus on your work."
                     },
                     {
                         "key": "computer",
-                        "value": "{{i18n.attributes.lightingMode.i18n.value.computer.label}}",
+                        "value": "Computer",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_COMPUTER"
+                        "description": "Backlight only to help you immerse yourself in movies and games."
                     },
                     {
                         "key": "day",
-                        "value": "{{i18n.attributes.lightingMode.i18n.value.day.label}}",
+                        "value": "Daylight",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_DAY"
+                        "description": "Energising light that's similar to sunlight."
                     },
                     {
                         "key": "night",
-                        "value": "{{i18n.attributes.lightingMode.i18n.value.night.label}}",
+                        "value": "Night",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_NIGHT"
+                        "description": "Dim the light to help you relax."
                     },
                     {
                         "key": "sleepPreparation",
-                        "value": "{{i18n.attributes.lightingMode.i18n.value.sleepPreparation.label}}",
+                        "value": "Sleep",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_SLEEPPREPARATION"
+                        "description": "Get a breathing guide to help you relax and fall asleep. Breathe in for 4 seconds as the light gets brighter, hold your breath for 7 seconds when the light is steady, and breathe out for 8 seconds as the light gets darker. The light will turn off after 4 breaths."
                     },
                     {
                         "key": "cozy",
-                        "value": "{{i18n.attributes.lightingMode.i18n.value.cozy.label}}",
+                        "value": "Cosy",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_COZY"
+                        "description": "Warm light to make you feel comfortable."
                     },
                     {
                         "key": "soft",
-                        "value": "{{i18n.attributes.lightingMode.i18n.value.soft.label}}",
+                        "value": "Soft",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_SOFT"
+                        "description": "Gentle light to set the mood."
                     }
                 ]
             }
@@ -60,7 +60,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Light mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -68,51 +68,51 @@
                     "alternatives": [
                         {
                             "key": "reading",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.reading.label}}",
+                            "value": "Reading",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_READING"
+                            "description": "4000K natural light for comfortable reading."
                         },
                         {
                             "key": "writing",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.writing.label}}",
+                            "value": "Writing",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_WRIGHTING"
+                            "description": "5000K white light that makes it easy to focus on your work."
                         },
                         {
                             "key": "computer",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.computer.label}}",
+                            "value": "Computer",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_COMPUTER"
+                            "description": "Backlight only to help you immerse yourself in movies and games."
                         },
                         {
                             "key": "day",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.day.label}}",
+                            "value": "Daylight",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_DAY"
+                            "description": "Energising light that's similar to sunlight."
                         },
                         {
                             "key": "night",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.night.label}}",
+                            "value": "Night",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_NIGHT"
+                            "description": "Dim the light to help you relax."
                         },
                         {
                             "key": "sleepPreparation",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.sleepPreparation.label}}",
+                            "value": "Sleep",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_SLEEPPREPARATION"
+                            "description": "Get a breathing guide to help you relax and fall asleep. Breathe in for 4 seconds as the light gets brighter, hold your breath for 7 seconds when the light is steady, and breathe out for 8 seconds as the light gets darker. The light will turn off after 4 breaths."
                         },
                         {
                             "key": "cozy",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.cozy.label}}",
+                            "value": "Cosy",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_COZY"
+                            "description": "Warm light to make you feel comfortable."
                         },
                         {
                             "key": "soft",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.soft.label}}",
+                            "value": "Soft",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_SOFT"
+                            "description": "Gentle light to set the mood."
                         }
                     ]
                 },
@@ -121,51 +121,51 @@
                     "alternatives": [
                         {
                             "key": "reading",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.reading.label}}",
+                            "value": "Reading",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_READING"
+                            "description": "4000K natural light for comfortable reading."
                         },
                         {
                             "key": "writing",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.writing.label}}",
+                            "value": "Writing",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_WRIGHTING"
+                            "description": "5000K white light that makes it easy to focus on your work."
                         },
                         {
                             "key": "computer",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.computer.label}}",
+                            "value": "Computer",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_COMPUTER"
+                            "description": "Backlight only to help you immerse yourself in movies and games."
                         },
                         {
                             "key": "day",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.day.label}}",
+                            "value": "Daylight",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_DAY"
+                            "description": "Energising light that's similar to sunlight."
                         },
                         {
                             "key": "night",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.night.label}}",
+                            "value": "Night",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_NIGHT"
+                            "description": "Dim the light to help you relax."
                         },
                         {
                             "key": "sleepPreparation",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.sleepPreparation.label}}",
+                            "value": "Sleep",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_SLEEPPREPARATION"
+                            "description": "Get a breathing guide to help you relax and fall asleep. Breathe in for 4 seconds as the light gets brighter, hold your breath for 7 seconds when the light is steady, and breathe out for 8 seconds as the light gets darker. The light will turn off after 4 breaths."
                         },
                         {
                             "key": "cozy",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.cozy.label}}",
+                            "value": "Cosy",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_COZY"
+                            "description": "Warm light to make you feel comfortable."
                         },
                         {
                             "key": "soft",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.soft.label}}",
+                            "value": "Soft",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_SOFT"
+                            "description": "Gentle light to set the mood."
                         }
                     ]
                 }
@@ -175,57 +175,57 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Light mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "reading",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.reading.label}}",
+                            "value": "Reading",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_READING"
+                            "description": "4000K natural light for comfortable reading."
                         },
                         {
                             "key": "writing",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.writing.label}}",
+                            "value": "Writing",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_WRIGHTING"
+                            "description": "5000K white light that makes it easy to focus on your work."
                         },
                         {
                             "key": "computer",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.computer.label}}",
+                            "value": "Computer",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_COMPUTER"
+                            "description": "Backlight only to help you immerse yourself in movies and games."
                         },
                         {
                             "key": "day",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.day.label}}",
+                            "value": "Daylight",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_DAY"
+                            "description": "Energising light that's similar to sunlight."
                         },
                         {
                             "key": "night",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.night.label}}",
+                            "value": "Night",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_NIGHT"
+                            "description": "Dim the light to help you relax."
                         },
                         {
                             "key": "sleepPreparation",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.sleepPreparation.label}}",
+                            "value": "Sleep",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_SLEEPPREPARATION"
+                            "description": "Get a breathing guide to help you relax and fall asleep. Breathe in for 4 seconds as the light gets brighter, hold your breath for 7 seconds when the light is steady, and breathe out for 8 seconds as the light gets darker. The light will turn off after 4 breaths."
                         },
                         {
                             "key": "cozy",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.cozy.label}}",
+                            "value": "Cosy",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_COZY"
+                            "description": "Warm light to make you feel comfortable."
                         },
                         {
                             "key": "soft",
-                            "value": "{{i18n.attributes.lightingMode.i18n.value.soft.label}}",
+                            "value": "Soft",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_SOFT"
+                            "description": "Gentle light to set the mood."
                         }
                     ],
                     "value": "lightingMode.value",
@@ -235,57 +235,57 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Light mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "reading",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.reading.label}}",
+                            "value": "Reading",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_READING"
+                            "description": "4000K natural light for comfortable reading."
                         },
                         {
                             "key": "writing",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.writing.label}}",
+                            "value": "Writing",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_WRIGHTING"
+                            "description": "5000K white light that makes it easy to focus on your work."
                         },
                         {
                             "key": "computer",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.computer.label}}",
+                            "value": "Computer",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_COMPUTER"
+                            "description": "Backlight only to help you immerse yourself in movies and games."
                         },
                         {
                             "key": "day",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.day.label}}",
+                            "value": "Daylight",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_DAY"
+                            "description": "Energising light that's similar to sunlight."
                         },
                         {
                             "key": "night",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.night.label}}",
+                            "value": "Night",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_NIGHT"
+                            "description": "Dim the light to help you relax."
                         },
                         {
                             "key": "sleepPreparation",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.sleepPreparation.label}}",
+                            "value": "Sleep",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_SLEEPPREPARATION"
+                            "description": "Get a breathing guide to help you relax and fall asleep. Breathe in for 4 seconds as the light gets brighter, hold your breath for 7 seconds when the light is steady, and breathe out for 8 seconds as the light gets darker. The light will turn off after 4 breaths."
                         },
                         {
                             "key": "cozy",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.cozy.label}}",
+                            "value": "Cosy",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_COZY"
+                            "description": "Warm light to make you feel comfortable."
                         },
                         {
                             "key": "soft",
-                            "value": "{{i18n.commands.setLightingMode.arguments.lightingMode.i18n.soft.label}}",
+                            "value": "Soft",
                             "type": "active",
-                            "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.ACTIVITYLIGHTINGMODE_DEFAULT_DESCRIPTION_SOFT"
+                            "description": "Gentle light to set the mood."
                         }
                     ],
                     "command": "setLightingMode"
diff --git a/json/activitySensorPresentation.json b/json/activitySensorPresentation.json
index 0ed4ef9b..e1eb8e53 100755
--- a/json/activitySensorPresentation.json
+++ b/json/activitySensorPresentation.json
@@ -6,32 +6,32 @@
                 "alternatives": [
                     {
                         "key": "noActivity",
-                        "value": "{{i18n.attributes.activity.i18n.value.noActivity.label}}",
+                        "value": "No activity",
                         "type": "inactive"
                     },
                     {
                         "key": "falling",
-                        "value": "{{i18n.attributes.activity.i18n.value.falling.label}}",
+                        "value": "Falling",
                         "type": "active"
                     },
                     {
                         "key": "lying",
-                        "value": "{{i18n.attributes.activity.i18n.value.lying.label}}",
+                        "value": "Lying",
                         "type": "active"
                     },
                     {
                         "key": "sitting",
-                        "value": "{{i18n.attributes.activity.i18n.value.sitting.label}}",
+                        "value": "Sitting",
                         "type": "active"
                     },
                     {
                         "key": "standing",
-                        "value": "{{i18n.attributes.activity.i18n.value.standing.label}}",
+                        "value": "Standing",
                         "type": "active"
                     },
                     {
                         "key": "eating",
-                        "value": "{{i18n.attributes.activity.i18n.value.eating.label}}",
+                        "value": "Eating",
                         "type": "active"
                     }
                 ]
@@ -42,39 +42,39 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Activity sensor",
             "displayType": "state",
             "state": {
                 "label": "{{activity.value}}",
                 "alternatives": [
                     {
                         "key": "noActivity",
-                        "value": "{{i18n.attributes.activity.i18n.value.noActivity.label}}",
+                        "value": "No activity",
                         "type": "inactive"
                     },
                     {
                         "key": "falling",
-                        "value": "{{i18n.attributes.activity.i18n.value.falling.label}}",
+                        "value": "Falling",
                         "type": "active"
                     },
                     {
                         "key": "lying",
-                        "value": "{{i18n.attributes.activity.i18n.value.lying.label}}",
+                        "value": "Lying",
                         "type": "active"
                     },
                     {
                         "key": "sitting",
-                        "value": "{{i18n.attributes.activity.i18n.value.sitting.label}}",
+                        "value": "Sitting",
                         "type": "active"
                     },
                     {
                         "key": "standing",
-                        "value": "{{i18n.attributes.activity.i18n.value.standing.label}}",
+                        "value": "Standing",
                         "type": "active"
                     },
                     {
                         "key": "eating",
-                        "value": "{{i18n.attributes.activity.i18n.value.eating.label}}",
+                        "value": "Eating",
                         "type": "active"
                     }
                 ]
@@ -84,38 +84,38 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Activity sensor",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "noActivity",
-                            "value": "{{i18n.attributes.activity.i18n.value.noActivity.label}}",
+                            "value": "No activity",
                             "type": "inactive"
                         },
                         {
                             "key": "falling",
-                            "value": "{{i18n.attributes.activity.i18n.value.falling.label}}",
+                            "value": "Falling",
                             "type": "active"
                         },
                         {
                             "key": "lying",
-                            "value": "{{i18n.attributes.activity.i18n.value.lying.label}}",
+                            "value": "Lying",
                             "type": "active"
                         },
                         {
                             "key": "sitting",
-                            "value": "{{i18n.attributes.activity.i18n.value.sitting.label}}",
+                            "value": "Sitting",
                             "type": "active"
                         },
                         {
                             "key": "standing",
-                            "value": "{{i18n.attributes.activity.i18n.value.standing.label}}",
+                            "value": "Standing",
                             "type": "active"
                         },
                         {
                             "key": "eating",
-                            "value": "{{i18n.attributes.activity.i18n.value.eating.label}}",
+                            "value": "Eating",
                             "type": "active"
                         }
                     ],
diff --git a/json/airConditionerFanMode.i18n.en.json b/json/airConditionerFanMode.i18n.en.json
index 70b6af98..870a803d 100755
--- a/json/airConditionerFanMode.i18n.en.json
+++ b/json/airConditionerFanMode.i18n.en.json
@@ -1,10 +1,10 @@
 {
     "tag": "en",
-    "label": "Air conditioner fan mode",
+    "label": "Wind strength",
     "description": "Maintains and sets the state of an air conditioner's fan",
     "attributes": {
         "fanMode": {
-            "label": "Air conditioner fan mode",
+            "label": "Wind strength",
             "description": "The current mode of the fan",
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {
@@ -28,10 +28,10 @@
                         "label": "Auto"
                     },
                     "max": {
-                        "label": "max"
+                        "label": "MAX"
                     },
                     "turbo": {
-                        "label": "turbo"
+                        "label": "Turbo"
                     },
                     "medium": {
                         "label": "Medium"
@@ -40,16 +40,16 @@
                         "label": "Off"
                     },
                     "smart": {
-                        "label": "smart"
+                        "label": "Smart"
                     },
                     "sleep": {
-                        "label": "sleep"
+                        "label": "Sleep"
                     },
                     "high": {
                         "label": "High"
                     },
                     "windfree": {
-                        "label": "windfree"
+                        "label": "Wind free"
                     },
                     "low": {
                         "label": "Low"
@@ -58,7 +58,7 @@
                         "label": "quite"
                     },
                     "quiet": {
-                        "label": "quiet"
+                        "label": "Quiet"
                     },
                     "pet": {
                         "label": "pet"
@@ -68,19 +68,20 @@
         },
         "supportedAcFanModes": {
             "label": "supported ac fan modes",
-            "description": "Supported states for this air conditioner fan to be in",
+            "description": "The complete list of air conditioner fan modes that are fully supported by a given device\n",
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "availableAcFanModes": {
-            "label": "availableAcFanModes",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "available ac fan modes",
+            "description": "The currently available air conditioner fan modes that a given device can support depending on its present state.\nThis feature is primarily utilized for real-time control as it reflects the current status of the device.\nIt is optional and may not be guaranteed to be provided by all devices.\nTo enable ‘availableAcFanModes’, you must specify it under the ‘supportedValues’ section of your device configuration.\n",
+            "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         }
     },
     "commands": {
         "setFanMode": {
-            "label": "Air conditioner fan mode",
+            "label": "Wind strength",
             "description": "Set the fan's mode",
             "arguments": {
                 "fanMode": {
@@ -104,28 +105,28 @@
                             "label": "Auto"
                         },
                         "max": {
-                            "label": "max"
+                            "label": "MAX"
                         },
                         "turbo": {
-                            "label": "turbo"
+                            "label": "Turbo"
                         },
                         "medium": {
                             "label": "Medium"
                         },
                         "smart": {
-                            "label": "smart"
+                            "label": "Smart"
                         },
                         "off": {
                             "label": "Off"
                         },
                         "sleep": {
-                            "label": "sleep"
+                            "label": "Sleep"
                         },
                         "high": {
                             "label": "High"
                         },
                         "windfree": {
-                            "label": "windfree"
+                            "label": "Wind free"
                         },
                         "low": {
                             "label": "Low"
@@ -134,7 +135,7 @@
                             "label": "quite"
                         },
                         "quiet": {
-                            "label": "quiet"
+                            "label": "Quiet"
                         },
                         "pet": {
                             "label": "pet"
diff --git a/json/airConditionerFanMode.i18n.fr.json b/json/airConditionerFanMode.i18n.fr.json
index 97c01031..37c18d85 100755
--- a/json/airConditionerFanMode.i18n.fr.json
+++ b/json/airConditionerFanMode.i18n.fr.json
@@ -1,10 +1,10 @@
 {
     "tag": "fr",
-    "label": "Mode ventilation du climatiseur",
+    "label": "Puissance de ventilation",
     "description": "Maintains and sets the state of an air conditioner's fan",
     "attributes": {
         "fanMode": {
-            "label": "Mode ventilation du climatiseur",
+            "label": "Puissance de ventilation",
             "description": "The current mode of the fan",
             "displayTemplate": "{{attribute}} de {{device.label}} était {{value}}.",
             "i18n": {
@@ -49,7 +49,7 @@
                         "label": "Élevée"
                     },
                     "windfree": {
-                        "label": "windfree"
+                        "label": "Ventilation autonome"
                     },
                     "low": {
                         "label": "Basse"
@@ -58,7 +58,7 @@
                         "label": "quite"
                     },
                     "quiet": {
-                        "label": "quiet"
+                        "label": "Silencieux"
                     },
                     "pet": {
                         "label": "Animal de compagnie"
@@ -68,19 +68,20 @@
         },
         "supportedAcFanModes": {
             "label": "supportedAcFanModes",
-            "description": "Supported states for this air conditioner fan to be in",
+            "description": "The complete list of air conditioner fan modes that are fully supported by a given device\n",
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
             "i18n": {}
         },
         "availableAcFanModes": {
-            "label": "availableAcFanModes",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "available ac fan modes",
+            "description": "The currently available air conditioner fan modes that a given device can support depending on its present state.\nThis feature is primarily utilized for real-time control as it reflects the current status of the device.\nIt is optional and may not be guaranteed to be provided by all devices.\nTo enable ‘availableAcFanModes’, you must specify it under the ‘supportedValues’ section of your device configuration.\n",
+            "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         }
     },
     "commands": {
         "setFanMode": {
-            "label": "Mode ventilation du climatiseur",
+            "label": "Puissance de ventilation",
             "description": "Set the fan's mode",
             "arguments": {
                 "fanMode": {
@@ -125,7 +126,7 @@
                             "label": "Élevée"
                         },
                         "windfree": {
-                            "label": "windfree"
+                            "label": "Ventilation autonome"
                         },
                         "low": {
                             "label": "Basse"
@@ -134,7 +135,7 @@
                             "label": "quite"
                         },
                         "quiet": {
-                            "label": "quiet"
+                            "label": "Silencieux"
                         },
                         "pet": {
                             "label": "Animal de compagnie"
diff --git a/json/airConditionerFanMode.json b/json/airConditionerFanMode.json
index ca42768b..53900441 100755
--- a/json/airConditionerFanMode.json
+++ b/json/airConditionerFanMode.json
@@ -12,20 +12,12 @@
                     "value": {
                         "title": "String",
                         "type": "string",
-                        "enum":[
-                            "auto",
-                            "low",
-                            "medium",
-                            "high",
-                            "turbo"
-                        ],
                         "maxLength": 255
                     }
                 },
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setFanMode",
             "enumCommands": []
         },
         "supportedAcFanModes": {
@@ -35,21 +27,29 @@
                     "value": {
                         "type": "array",
                         "items": {
-                            "type": "string",
-                                "enum":[
-                                "auto",
-                                "low",
-                                "medium",
-                                "high",
-                                "turbo"
-                            ]
+                            "type": "string"
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
+        "availableAcFanModes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
                         }
                     }
                 },
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setFanMode",
             "enumCommands": []
         }
     },
@@ -61,19 +61,13 @@
                     "name": "fanMode",
                     "optional": false,
                     "schema": {
-                        "title": "fanMode",
+                        "title": "String",
                         "type": "string",
-                        "enum":[
-                            "auto",
-                            "low",
-                            "medium",
-                            "high",
-                            "turbo"
-                        ],
                         "maxLength": 255
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/airConditionerFanModePresentation.json b/json/airConditionerFanModePresentation.json
index 58fd3283..5ee5df12 100755
--- a/json/airConditionerFanModePresentation.json
+++ b/json/airConditionerFanModePresentation.json
@@ -56,62 +56,62 @@
                     },
                     {
                         "key": "auto",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.auto.label}}",
+                        "value": "Auto",
                         "type": "active"
                     },
                     {
                         "key": "low",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.low.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "medium",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.medium.label}}",
+                        "value": "Medium",
                         "type": "active"
                     },
                     {
                         "key": "high",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.high.label}}",
+                        "value": "High",
                         "type": "active"
                     },
                     {
                         "key": "turbo",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.turbo.label}}",
+                        "value": "Turbo",
                         "type": "active"
                     },
                     {
                         "key": "max",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.max.label}}",
+                        "value": "MAX",
                         "type": "active"
                     },
                     {
                         "key": "windfree",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.windfree.label}}",
+                        "value": "Wind free",
                         "type": "active"
                     },
                     {
                         "key": "sleep",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.sleep.label}}",
+                        "value": "Sleep",
                         "type": "active"
                     },
                     {
                         "key": "quiet",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.quiet.label}}",
+                        "value": "Quiet",
                         "type": "active"
                     },
                     {
                         "key": "smart",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.smart.label}}",
+                        "value": "Smart",
                         "type": "active"
                     },
                     {
                         "key": "pet",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.pet.label}}",
+                        "value": "pet",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "active"
                     }
                 ]
@@ -120,7 +120,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Wind strength",
                 "displayType": "list",
                 "list": {
                     "command": {
@@ -178,62 +178,62 @@
                             },
                             {
                                 "key": "auto",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.auto.label}}",
+                                "value": "Auto",
                                 "type": "active"
                             },
                             {
                                 "key": "low",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.low.label}}",
+                                "value": "Low",
                                 "type": "active"
                             },
                             {
                                 "key": "medium",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.medium.label}}",
+                                "value": "Medium",
                                 "type": "active"
                             },
                             {
                                 "key": "high",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.high.label}}",
+                                "value": "High",
                                 "type": "active"
                             },
                             {
                                 "key": "turbo",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.turbo.label}}",
+                                "value": "Turbo",
                                 "type": "active"
                             },
                             {
                                 "key": "max",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.max.label}}",
+                                "value": "MAX",
                                 "type": "active"
                             },
                             {
                                 "key": "windfree",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.windfree.label}}",
+                                "value": "Wind free",
                                 "type": "active"
                             },
                             {
                                 "key": "sleep",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.sleep.label}}",
+                                "value": "Sleep",
                                 "type": "active"
                             },
                             {
                                 "key": "quiet",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.quiet.label}}",
+                                "value": "Quiet",
                                 "type": "active"
                             },
                             {
                                 "key": "smart",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.smart.label}}",
+                                "value": "Smart",
                                 "type": "active"
                             },
                             {
                                 "key": "pet",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.pet.label}}",
+                                "value": "pet",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.off.label}}",
+                                "value": "Off",
                                 "type": "active"
                             }
                         ],
@@ -296,62 +296,62 @@
                             },
                             {
                                 "key": "auto",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.auto.label}}",
+                                "value": "Auto",
                                 "type": "active"
                             },
                             {
                                 "key": "low",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.low.label}}",
+                                "value": "Low",
                                 "type": "active"
                             },
                             {
                                 "key": "medium",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.medium.label}}",
+                                "value": "Medium",
                                 "type": "active"
                             },
                             {
                                 "key": "high",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.high.label}}",
+                                "value": "High",
                                 "type": "active"
                             },
                             {
                                 "key": "turbo",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.turbo.label}}",
+                                "value": "Turbo",
                                 "type": "active"
                             },
                             {
                                 "key": "max",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.max.label}}",
+                                "value": "MAX",
                                 "type": "active"
                             },
                             {
                                 "key": "windfree",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.windfree.label}}",
+                                "value": "Wind free",
                                 "type": "active"
                             },
                             {
                                 "key": "sleep",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.sleep.label}}",
+                                "value": "Sleep",
                                 "type": "active"
                             },
                             {
                                 "key": "quiet",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.quiet.label}}",
+                                "value": "Quiet",
                                 "type": "active"
                             },
                             {
                                 "key": "smart",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.smart.label}}",
+                                "value": "Smart",
                                 "type": "active"
                             },
                             {
                                 "key": "pet",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.pet.label}}",
+                                "value": "pet",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.off.label}}",
+                                "value": "Off",
                                 "type": "active"
                             }
                         ]
@@ -366,7 +366,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Wind strength",
                 "displayType": "list",
                 "list": {
                     "command": {
@@ -424,62 +424,62 @@
                             },
                             {
                                 "key": "auto",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.auto.label}}",
+                                "value": "Auto",
                                 "type": "active"
                             },
                             {
                                 "key": "low",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.low.label}}",
+                                "value": "Low",
                                 "type": "active"
                             },
                             {
                                 "key": "medium",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.medium.label}}",
+                                "value": "Medium",
                                 "type": "active"
                             },
                             {
                                 "key": "high",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.high.label}}",
+                                "value": "High",
                                 "type": "active"
                             },
                             {
                                 "key": "turbo",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.turbo.label}}",
+                                "value": "Turbo",
                                 "type": "active"
                             },
                             {
                                 "key": "max",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.max.label}}",
+                                "value": "MAX",
                                 "type": "active"
                             },
                             {
                                 "key": "windfree",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.windfree.label}}",
+                                "value": "Wind free",
                                 "type": "active"
                             },
                             {
                                 "key": "sleep",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.sleep.label}}",
+                                "value": "Sleep",
                                 "type": "active"
                             },
                             {
                                 "key": "quiet",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.quiet.label}}",
+                                "value": "Quiet",
                                 "type": "active"
                             },
                             {
                                 "key": "smart",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.smart.label}}",
+                                "value": "Smart",
                                 "type": "active"
                             },
                             {
                                 "key": "pet",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.pet.label}}",
+                                "value": "pet",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.off.label}}",
+                                "value": "Off",
                                 "type": "active"
                             }
                         ],
@@ -542,62 +542,62 @@
                             },
                             {
                                 "key": "auto",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.auto.label}}",
+                                "value": "Auto",
                                 "type": "active"
                             },
                             {
                                 "key": "low",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.low.label}}",
+                                "value": "Low",
                                 "type": "active"
                             },
                             {
                                 "key": "medium",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.medium.label}}",
+                                "value": "Medium",
                                 "type": "active"
                             },
                             {
                                 "key": "high",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.high.label}}",
+                                "value": "High",
                                 "type": "active"
                             },
                             {
                                 "key": "turbo",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.turbo.label}}",
+                                "value": "Turbo",
                                 "type": "active"
                             },
                             {
                                 "key": "max",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.max.label}}",
+                                "value": "MAX",
                                 "type": "active"
                             },
                             {
                                 "key": "windfree",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.windfree.label}}",
+                                "value": "Wind free",
                                 "type": "active"
                             },
                             {
                                 "key": "sleep",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.sleep.label}}",
+                                "value": "Sleep",
                                 "type": "active"
                             },
                             {
                                 "key": "quiet",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.quiet.label}}",
+                                "value": "Quiet",
                                 "type": "active"
                             },
                             {
                                 "key": "smart",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.smart.label}}",
+                                "value": "Smart",
                                 "type": "active"
                             },
                             {
                                 "key": "pet",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.pet.label}}",
+                                "value": "pet",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.attributes.fanMode.i18n.value.off.label}}",
+                                "value": "Off",
                                 "type": "active"
                             }
                         ]
@@ -615,7 +615,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Wind strength",
             "displayType": "list",
             "list": {
                 "command": {
@@ -673,62 +673,62 @@
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.high.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "turbo",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.turbo.label}}",
+                            "value": "Turbo",
                             "type": "active"
                         },
                         {
                             "key": "max",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.max.label}}",
+                            "value": "MAX",
                             "type": "active"
                         },
                         {
                             "key": "windfree",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.windfree.label}}",
+                            "value": "Wind free",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "quiet",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.quiet.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "smart",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.smart.label}}",
+                            "value": "Smart",
                             "type": "active"
                         },
                         {
                             "key": "pet",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.pet.label}}",
+                            "value": "pet",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         }
                     ],
@@ -791,62 +791,62 @@
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.high.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "turbo",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.turbo.label}}",
+                            "value": "Turbo",
                             "type": "active"
                         },
                         {
                             "key": "max",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.max.label}}",
+                            "value": "MAX",
                             "type": "active"
                         },
                         {
                             "key": "windfree",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.windfree.label}}",
+                            "value": "Wind free",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "quiet",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.quiet.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "smart",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.smart.label}}",
+                            "value": "Smart",
                             "type": "active"
                         },
                         {
                             "key": "pet",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.pet.label}}",
+                            "value": "pet",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         }
                     ]
@@ -857,7 +857,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Wind strength",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
@@ -913,62 +913,62 @@
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.high.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "turbo",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.turbo.label}}",
+                            "value": "Turbo",
                             "type": "active"
                         },
                         {
                             "key": "max",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.max.label}}",
+                            "value": "MAX",
                             "type": "active"
                         },
                         {
                             "key": "windfree",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.windfree.label}}",
+                            "value": "Wind free",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "quiet",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.quiet.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "smart",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.smart.label}}",
+                            "value": "Smart",
                             "type": "active"
                         },
                         {
                             "key": "pet",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.pet.label}}",
+                            "value": "pet",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         }
                     ],
@@ -981,7 +981,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.commands.setFanMode.label}}",
+                "label": "Wind strength",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
@@ -1037,62 +1037,62 @@
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.high.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "turbo",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.turbo.label}}",
+                            "value": "Turbo",
                             "type": "active"
                         },
                         {
                             "key": "max",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.max.label}}",
+                            "value": "MAX",
                             "type": "active"
                         },
                         {
                             "key": "windfree",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.windfree.label}}",
+                            "value": "Wind free",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "quiet",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.quiet.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "smart",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.smart.label}}",
+                            "value": "Smart",
                             "type": "active"
                         },
                         {
                             "key": "pet",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.pet.label}}",
+                            "value": "pet",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         }
                     ],
diff --git a/json/airConditionerMode.i18n.en.json b/json/airConditionerMode.i18n.en.json
index 9b1a1bc8..8a6bf4da 100755
--- a/json/airConditionerMode.i18n.en.json
+++ b/json/airConditionerMode.i18n.en.json
@@ -4,13 +4,14 @@
     "description": "Allows for the control of the air conditioner.",
     "attributes": {
         "availableAcModes": {
-            "label": "availableAcModes",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "available ac modes",
+            "description": "The currently available air conditioner modes that a given device can support depending on its present state.\nThis feature is primarily utilized for real-time control as it reflects the current status of the device.\nIt is optional and may not be guaranteed to be provided by all devices.\nTo enable ‘availableAcModes’, you must specify it under the ‘supportedValues’ section of your device configuration.\n",
+            "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "supportedAcModes": {
             "label": "supported ac modes",
-            "description": "Supported states for this air conditioner to be in",
+            "description": "The complete list of air conditioner modes that are fully supported by a given device\n",
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
@@ -27,7 +28,7 @@
                         "label": "Auto"
                     },
                     "ventilation": {
-                        "label": "ventilation"
+                        "label": "Ventilation"
                     },
                     "aicomfort": {
                         "label": "AI Comfort Cooling"
@@ -36,7 +37,7 @@
                         "label": "eco"
                     },
                     "sleep": {
-                        "label": "sleep"
+                        "label": "Sleep"
                     },
                     "fan": {
                         "label": "Fan"
@@ -45,26 +46,26 @@
                         "label": "Purify"
                     },
                     "heatex": {
-                        "label": "heatEx"
+                        "label": "HeatEX"
                     },
                     "power": {
                         "label": "power"
                     },
                     "smartventilation": {
-                        "label": "smartVentilation"
+                        "label": "Smart Ventilation"
                     },
                     "comfortcooling": {
-                        "label": "comfortCooling"
+                        "label": "Comfort Cooling"
                     },
                     "heatclean": {
                         "label": "Heat, Purify"
                     },
-                    "std": {
-                        "label": "std"
-                    },
                     "dryclean": {
                         "label": "Dry, Purify"
                     },
+                    "std": {
+                        "label": "std"
+                    },
                     "cool": {
                         "label": "Cool"
                     },
@@ -81,7 +82,7 @@
                         "label": "Purify"
                     },
                     "bypass": {
-                        "label": "bypass"
+                        "label": "ByPass"
                     },
                     "force": {
                         "label": "force"
@@ -112,17 +113,17 @@
                         "auto": {
                             "label": "Auto"
                         },
+                        "ventilation": {
+                            "label": "Ventilation"
+                        },
                         "airconditionermode": {
                             "label": "airConditionerMode"
                         },
-                        "ventilation": {
-                            "label": "ventilation"
-                        },
                         "aicomfort": {
                             "label": "AI Comfort Cooling"
                         },
                         "sleep": {
-                            "label": "sleep"
+                            "label": "Sleep"
                         },
                         "eco": {
                             "label": "eco"
@@ -134,26 +135,26 @@
                             "label": "Purify"
                         },
                         "heatex": {
-                            "label": "heatEx"
+                            "label": "HeatEX"
                         },
                         "smartventilation": {
-                            "label": "smartVentilation"
+                            "label": "Smart Ventilation"
                         },
                         "power": {
                             "label": "power"
                         },
                         "comfortcooling": {
-                            "label": "comfortCooling"
+                            "label": "Comfort Cooling"
                         },
                         "heatclean": {
                             "label": "Heat, Purify"
                         },
-                        "std": {
-                            "label": "std"
-                        },
                         "dryclean": {
                             "label": "Dry, Purify"
                         },
+                        "std": {
+                            "label": "std"
+                        },
                         "cool": {
                             "label": "Cool"
                         },
@@ -170,7 +171,7 @@
                             "label": "Not Supported"
                         },
                         "bypass": {
-                            "label": "bypass"
+                            "label": "ByPass"
                         },
                         "force": {
                             "label": "force"
diff --git a/json/airConditionerMode.i18n.fr.json b/json/airConditionerMode.i18n.fr.json
index 673c83d5..bc2d9c12 100755
--- a/json/airConditionerMode.i18n.fr.json
+++ b/json/airConditionerMode.i18n.fr.json
@@ -4,13 +4,14 @@
     "description": "Allows for the control of the air conditioner.",
     "attributes": {
         "availableAcModes": {
-            "label": "availableAcModes",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "available ac modes",
+            "description": "The currently available air conditioner modes that a given device can support depending on its present state.\nThis feature is primarily utilized for real-time control as it reflects the current status of the device.\nIt is optional and may not be guaranteed to be provided by all devices.\nTo enable ‘availableAcModes’, you must specify it under the ‘supportedValues’ section of your device configuration.\n",
+            "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "supportedAcModes": {
             "label": "modes de climatiseur pris en charge",
-            "description": "Supported states for this air conditioner to be in",
+            "description": "The complete list of air conditioner modes that are fully supported by a given device\n",
             "displayTemplate": "{{attribute}} de {{device.label}} était {{value}}.",
             "i18n": {}
         },
@@ -59,12 +60,12 @@
                     "heatclean": {
                         "label": "Chaud, purification"
                     },
-                    "std": {
-                        "label": "std"
-                    },
                     "dryclean": {
                         "label": "Sec, purification"
                     },
+                    "std": {
+                        "label": "std"
+                    },
                     "cool": {
                         "label": "Froid"
                     },
@@ -112,12 +113,12 @@
                         "auto": {
                             "label": "Automatique"
                         },
-                        "airconditionermode": {
-                            "label": "airConditionerMode"
-                        },
                         "ventilation": {
                             "label": "ventilation"
                         },
+                        "airconditionermode": {
+                            "label": "airConditionerMode"
+                        },
                         "aicomfort": {
                             "label": "IA Refroidissement confortable"
                         },
@@ -148,12 +149,12 @@
                         "heatclean": {
                             "label": "Chaud, purification"
                         },
-                        "std": {
-                            "label": "std"
-                        },
                         "dryclean": {
                             "label": "Sec, purification"
                         },
+                        "std": {
+                            "label": "std"
+                        },
                         "cool": {
                             "label": "Froid"
                         },
diff --git a/json/airConditionerMode.json b/json/airConditionerMode.json
index e69f91c5..f677c205 100755
--- a/json/airConditionerMode.json
+++ b/json/airConditionerMode.json
@@ -5,23 +5,31 @@
     "name": "Air Conditioner Mode",
     "ephemeral": false,
     "attributes": {
+        "availableAcModes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
         "supportedAcModes": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "string",
-                        "enum": [
-                            "auto",
-                            "cool",
-                            "dry",
-                            "coolClean",
-                            "dryClean",
-                            "fanOnly",
-                            "heat",
-                            "heatClean",
-                            "notSupported"
-                        ]
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
                     }
                 },
                 "additionalProperties": false,
@@ -36,17 +44,6 @@
                     "value": {
                         "title": "String",
                         "type": "string",
-                        "enum": [
-                            "auto",
-                            "cool",
-                            "dry",
-                            "coolClean",
-                            "dryClean",
-                            "fanOnly",
-                            "heat",
-                            "heatClean",
-                            "notSupported"
-                        ],
                         "maxLength": 255
                     }
                 },
@@ -69,21 +66,11 @@
                     "schema": {
                         "title": "String",
                         "type": "string",
-                        "enum": [
-                            "auto",
-                            "cool",
-                            "dry",
-                            "coolClean",
-                            "dryClean",
-                            "fanOnly",
-                            "heat",
-                            "heatClean",
-                            "notSupported"
-                        ],
                         "maxLength": 255
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/airConditionerModePresentation.json b/json/airConditionerModePresentation.json
index bf9f5b46..5a152107 100755
--- a/json/airConditionerModePresentation.json
+++ b/json/airConditionerModePresentation.json
@@ -6,112 +6,112 @@
                 "alternatives": [
                     {
                         "key": "cool",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.cool.label}}",
+                        "value": "Cool",
                         "type": "active"
                     },
                     {
                         "key": "dry",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.dry.label}}",
+                        "value": "Dry",
                         "type": "active"
                     },
                     {
                         "key": "wind",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.wind.label}}",
+                        "value": "Purify",
                         "type": "active"
                     },
                     {
                         "key": "heat",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.heat.label}}",
+                        "value": "Heat",
                         "type": "active"
                     },
                     {
                         "key": "coolClean",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.coolClean.label}}",
+                        "value": "Cool, Purify",
                         "type": "active"
                     },
                     {
                         "key": "dryClean",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.dryClean.label}}",
+                        "value": "Dry, Purify",
                         "type": "active"
                     },
                     {
                         "key": "heatClean",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.heatClean.label}}",
+                        "value": "Heat, Purify",
                         "type": "active"
                     },
                     {
                         "key": "auto",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.auto.label}}",
+                        "value": "Auto",
                         "type": "active"
                     },
                     {
                         "key": "fanOnly",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.fanOnly.label}}",
+                        "value": "Fan only",
                         "type": "active"
                     },
                     {
                         "key": "fan",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.fan.label}}",
+                        "value": "Fan",
                         "type": "active"
                     },
                     {
                         "key": "aIComfort",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.aIComfort.label}}",
+                        "value": "AI Comfort Cooling",
                         "type": "active"
                     },
                     {
                         "key": "comfortCooling",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.comfortCooling.label}}",
+                        "value": "Comfort Cooling",
                         "type": "active"
                     },
                     {
                         "key": "eco",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.eco.label}}",
+                        "value": "eco",
                         "type": "active"
                     },
                     {
                         "key": "std",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.std.label}}",
+                        "value": "std",
                         "type": "active"
                     },
                     {
                         "key": "power",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.power.label}}",
+                        "value": "power",
                         "type": "active"
                     },
                     {
                         "key": "force",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.force.label}}",
+                        "value": "force",
                         "type": "active"
                     },
                     {
                         "key": "heatEx",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.heatEx.label}}",
+                        "value": "HeatEX",
                         "type": "active"
                     },
                     {
                         "key": "bypass",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.bypass.label}}",
+                        "value": "ByPass",
                         "type": "active"
                     },
                     {
                         "key": "sleep",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.sleep.label}}",
+                        "value": "Sleep",
                         "type": "active"
                     },
                     {
                         "key": "purification",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.purification.label}}",
+                        "value": "Purify",
                         "type": "active"
                     },
                     {
                         "key": "ventilation",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.ventilation.label}}",
+                        "value": "Ventilation",
                         "type": "active"
                     },
                     {
                         "key": "smartVentilation",
-                        "value": "{{i18n.attributes.airConditionerMode.i18n.value.smartVentilation.label}}",
+                        "value": "Smart Ventilation",
                         "type": "active"
                     }
                 ]
@@ -120,7 +120,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "command": {
@@ -128,112 +128,112 @@
                         "alternatives": [
                             {
                                 "key": "cool",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.cool.label}}",
+                                "value": "Cool",
                                 "type": "active"
                             },
                             {
                                 "key": "dry",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.dry.label}}",
+                                "value": "Dry",
                                 "type": "active"
                             },
                             {
                                 "key": "wind",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.wind.label}}",
+                                "value": "Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "heat",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heat.label}}",
+                                "value": "Heat",
                                 "type": "active"
                             },
                             {
                                 "key": "coolClean",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.coolClean.label}}",
+                                "value": "Cool, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "dryClean",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.dryClean.label}}",
+                                "value": "Dry, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "heatClean",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heatClean.label}}",
+                                "value": "Heat, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "auto",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.auto.label}}",
+                                "value": "Auto",
                                 "type": "active"
                             },
                             {
                                 "key": "fanOnly",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.fanOnly.label}}",
+                                "value": "Fan only",
                                 "type": "active"
                             },
                             {
                                 "key": "fan",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.fan.label}}",
+                                "value": "Fan",
                                 "type": "active"
                             },
                             {
                                 "key": "aIComfort",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.aIComfort.label}}",
+                                "value": "AI Comfort Cooling",
                                 "type": "active"
                             },
                             {
                                 "key": "comfortCooling",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.comfortCooling.label}}",
+                                "value": "Comfort Cooling",
                                 "type": "active"
                             },
                             {
                                 "key": "eco",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.eco.label}}",
+                                "value": "eco",
                                 "type": "active"
                             },
                             {
                                 "key": "std",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.std.label}}",
+                                "value": "std",
                                 "type": "active"
                             },
                             {
                                 "key": "power",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.power.label}}",
+                                "value": "power",
                                 "type": "active"
                             },
                             {
                                 "key": "force",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.force.label}}",
+                                "value": "force",
                                 "type": "active"
                             },
                             {
                                 "key": "heatEx",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heatEx.label}}",
+                                "value": "HeatEX",
                                 "type": "active"
                             },
                             {
                                 "key": "bypass",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.bypass.label}}",
+                                "value": "ByPass",
                                 "type": "active"
                             },
                             {
                                 "key": "sleep",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.sleep.label}}",
+                                "value": "Sleep",
                                 "type": "active"
                             },
                             {
                                 "key": "purification",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.purification.label}}",
+                                "value": "Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "ventilation",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.ventilation.label}}",
+                                "value": "Ventilation",
                                 "type": "active"
                             },
                             {
                                 "key": "smartVentilation",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.smartVentilation.label}}",
+                                "value": "Smart Ventilation",
                                 "type": "active"
                             }
                         ],
@@ -246,112 +246,112 @@
                         "alternatives": [
                             {
                                 "key": "cool",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.cool.label}}",
+                                "value": "Cool",
                                 "type": "active"
                             },
                             {
                                 "key": "dry",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.dry.label}}",
+                                "value": "Dry",
                                 "type": "active"
                             },
                             {
                                 "key": "wind",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.wind.label}}",
+                                "value": "Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "heat",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.heat.label}}",
+                                "value": "Heat",
                                 "type": "active"
                             },
                             {
                                 "key": "coolClean",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.coolClean.label}}",
+                                "value": "Cool, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "dryClean",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.dryClean.label}}",
+                                "value": "Dry, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "heatClean",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.heatClean.label}}",
+                                "value": "Heat, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "auto",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.auto.label}}",
+                                "value": "Auto",
                                 "type": "active"
                             },
                             {
                                 "key": "fanOnly",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.fanOnly.label}}",
+                                "value": "Fan only",
                                 "type": "active"
                             },
                             {
                                 "key": "fan",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.fan.label}}",
+                                "value": "Fan",
                                 "type": "active"
                             },
                             {
                                 "key": "aIComfort",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.aIComfort.label}}",
+                                "value": "AI Comfort Cooling",
                                 "type": "active"
                             },
                             {
                                 "key": "comfortCooling",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.comfortCooling.label}}",
+                                "value": "Comfort Cooling",
                                 "type": "active"
                             },
                             {
                                 "key": "eco",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.eco.label}}",
+                                "value": "eco",
                                 "type": "active"
                             },
                             {
                                 "key": "std",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.std.label}}",
+                                "value": "std",
                                 "type": "active"
                             },
                             {
                                 "key": "power",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.power.label}}",
+                                "value": "power",
                                 "type": "active"
                             },
                             {
                                 "key": "force",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.force.label}}",
+                                "value": "force",
                                 "type": "active"
                             },
                             {
                                 "key": "heatEx",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.heatEx.label}}",
+                                "value": "HeatEX",
                                 "type": "active"
                             },
                             {
                                 "key": "bypass",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.bypass.label}}",
+                                "value": "ByPass",
                                 "type": "active"
                             },
                             {
                                 "key": "sleep",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.sleep.label}}",
+                                "value": "Sleep",
                                 "type": "active"
                             },
                             {
                                 "key": "purification",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.purification.label}}",
+                                "value": "Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "ventilation",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.ventilation.label}}",
+                                "value": "Ventilation",
                                 "type": "active"
                             },
                             {
                                 "key": "smartVentilation",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.smartVentilation.label}}",
+                                "value": "Smart Ventilation",
                                 "type": "active"
                             }
                         ]
@@ -366,7 +366,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "command": {
@@ -374,112 +374,112 @@
                         "alternatives": [
                             {
                                 "key": "cool",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.cool.label}}",
+                                "value": "Cool",
                                 "type": "active"
                             },
                             {
                                 "key": "dry",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.dry.label}}",
+                                "value": "Dry",
                                 "type": "active"
                             },
                             {
                                 "key": "wind",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.wind.label}}",
+                                "value": "Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "heat",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heat.label}}",
+                                "value": "Heat",
                                 "type": "active"
                             },
                             {
                                 "key": "coolClean",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.coolClean.label}}",
+                                "value": "Cool, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "dryClean",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.dryClean.label}}",
+                                "value": "Dry, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "heatClean",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heatClean.label}}",
+                                "value": "Heat, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "auto",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.auto.label}}",
+                                "value": "Auto",
                                 "type": "active"
                             },
                             {
                                 "key": "fanOnly",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.fanOnly.label}}",
+                                "value": "Fan only",
                                 "type": "active"
                             },
                             {
                                 "key": "fan",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.fan.label}}",
+                                "value": "Fan",
                                 "type": "active"
                             },
                             {
                                 "key": "aIComfort",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.aIComfort.label}}",
+                                "value": "AI Comfort Cooling",
                                 "type": "active"
                             },
                             {
                                 "key": "comfortCooling",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.comfortCooling.label}}",
+                                "value": "Comfort Cooling",
                                 "type": "active"
                             },
                             {
                                 "key": "eco",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.eco.label}}",
+                                "value": "eco",
                                 "type": "active"
                             },
                             {
                                 "key": "std",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.std.label}}",
+                                "value": "std",
                                 "type": "active"
                             },
                             {
                                 "key": "power",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.power.label}}",
+                                "value": "power",
                                 "type": "active"
                             },
                             {
                                 "key": "force",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.force.label}}",
+                                "value": "force",
                                 "type": "active"
                             },
                             {
                                 "key": "heatEx",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heatEx.label}}",
+                                "value": "HeatEX",
                                 "type": "active"
                             },
                             {
                                 "key": "bypass",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.bypass.label}}",
+                                "value": "ByPass",
                                 "type": "active"
                             },
                             {
                                 "key": "sleep",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.sleep.label}}",
+                                "value": "Sleep",
                                 "type": "active"
                             },
                             {
                                 "key": "purification",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.purification.label}}",
+                                "value": "Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "ventilation",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.ventilation.label}}",
+                                "value": "Ventilation",
                                 "type": "active"
                             },
                             {
                                 "key": "smartVentilation",
-                                "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.smartVentilation.label}}",
+                                "value": "Smart Ventilation",
                                 "type": "active"
                             }
                         ],
@@ -492,112 +492,112 @@
                         "alternatives": [
                             {
                                 "key": "cool",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.cool.label}}",
+                                "value": "Cool",
                                 "type": "active"
                             },
                             {
                                 "key": "dry",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.dry.label}}",
+                                "value": "Dry",
                                 "type": "active"
                             },
                             {
                                 "key": "wind",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.wind.label}}",
+                                "value": "Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "heat",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.heat.label}}",
+                                "value": "Heat",
                                 "type": "active"
                             },
                             {
                                 "key": "coolClean",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.coolClean.label}}",
+                                "value": "Cool, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "dryClean",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.dryClean.label}}",
+                                "value": "Dry, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "heatClean",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.heatClean.label}}",
+                                "value": "Heat, Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "auto",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.auto.label}}",
+                                "value": "Auto",
                                 "type": "active"
                             },
                             {
                                 "key": "fanOnly",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.fanOnly.label}}",
+                                "value": "Fan only",
                                 "type": "active"
                             },
                             {
                                 "key": "fan",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.fan.label}}",
+                                "value": "Fan",
                                 "type": "active"
                             },
                             {
                                 "key": "aIComfort",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.aIComfort.label}}",
+                                "value": "AI Comfort Cooling",
                                 "type": "active"
                             },
                             {
                                 "key": "comfortCooling",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.comfortCooling.label}}",
+                                "value": "Comfort Cooling",
                                 "type": "active"
                             },
                             {
                                 "key": "eco",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.eco.label}}",
+                                "value": "eco",
                                 "type": "active"
                             },
                             {
                                 "key": "std",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.std.label}}",
+                                "value": "std",
                                 "type": "active"
                             },
                             {
                                 "key": "power",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.power.label}}",
+                                "value": "power",
                                 "type": "active"
                             },
                             {
                                 "key": "force",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.force.label}}",
+                                "value": "force",
                                 "type": "active"
                             },
                             {
                                 "key": "heatEx",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.heatEx.label}}",
+                                "value": "HeatEX",
                                 "type": "active"
                             },
                             {
                                 "key": "bypass",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.bypass.label}}",
+                                "value": "ByPass",
                                 "type": "active"
                             },
                             {
                                 "key": "sleep",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.sleep.label}}",
+                                "value": "Sleep",
                                 "type": "active"
                             },
                             {
                                 "key": "purification",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.purification.label}}",
+                                "value": "Purify",
                                 "type": "active"
                             },
                             {
                                 "key": "ventilation",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.ventilation.label}}",
+                                "value": "Ventilation",
                                 "type": "active"
                             },
                             {
                                 "key": "smartVentilation",
-                                "value": "{{i18n.attributes.airConditionerMode.i18n.value.smartVentilation.label}}",
+                                "value": "Smart Ventilation",
                                 "type": "active"
                             }
                         ]
@@ -615,7 +615,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -623,112 +623,112 @@
                     "alternatives": [
                         {
                             "key": "cool",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "dry",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.dry.label}}",
+                            "value": "Dry",
                             "type": "active"
                         },
                         {
                             "key": "wind",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.wind.label}}",
+                            "value": "Purify",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "coolClean",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.coolClean.label}}",
+                            "value": "Cool, Purify",
                             "type": "active"
                         },
                         {
                             "key": "dryClean",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.dryClean.label}}",
+                            "value": "Dry, Purify",
                             "type": "active"
                         },
                         {
                             "key": "heatClean",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heatClean.label}}",
+                            "value": "Heat, Purify",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "fanOnly",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.fanOnly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "fan",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.fan.label}}",
+                            "value": "Fan",
                             "type": "active"
                         },
                         {
                             "key": "aIComfort",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.aIComfort.label}}",
+                            "value": "AI Comfort Cooling",
                             "type": "active"
                         },
                         {
                             "key": "comfortCooling",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.comfortCooling.label}}",
+                            "value": "Comfort Cooling",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.eco.label}}",
+                            "value": "eco",
                             "type": "active"
                         },
                         {
                             "key": "std",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.std.label}}",
+                            "value": "std",
                             "type": "active"
                         },
                         {
                             "key": "power",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.power.label}}",
+                            "value": "power",
                             "type": "active"
                         },
                         {
                             "key": "force",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.force.label}}",
+                            "value": "force",
                             "type": "active"
                         },
                         {
                             "key": "heatEx",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heatEx.label}}",
+                            "value": "HeatEX",
                             "type": "active"
                         },
                         {
                             "key": "bypass",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.bypass.label}}",
+                            "value": "ByPass",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "purification",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.purification.label}}",
+                            "value": "Purify",
                             "type": "active"
                         },
                         {
                             "key": "ventilation",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.ventilation.label}}",
+                            "value": "Ventilation",
                             "type": "active"
                         },
                         {
                             "key": "smartVentilation",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.smartVentilation.label}}",
+                            "value": "Smart Ventilation",
                             "type": "active"
                         }
                     ],
@@ -741,112 +741,112 @@
                     "alternatives": [
                         {
                             "key": "cool",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "dry",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.dry.label}}",
+                            "value": "Dry",
                             "type": "active"
                         },
                         {
                             "key": "wind",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.wind.label}}",
+                            "value": "Purify",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "coolClean",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.coolClean.label}}",
+                            "value": "Cool, Purify",
                             "type": "active"
                         },
                         {
                             "key": "dryClean",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.dryClean.label}}",
+                            "value": "Dry, Purify",
                             "type": "active"
                         },
                         {
                             "key": "heatClean",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.heatClean.label}}",
+                            "value": "Heat, Purify",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "fanOnly",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.fanOnly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "fan",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.fan.label}}",
+                            "value": "Fan",
                             "type": "active"
                         },
                         {
                             "key": "aIComfort",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.aIComfort.label}}",
+                            "value": "AI Comfort Cooling",
                             "type": "active"
                         },
                         {
                             "key": "comfortCooling",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.comfortCooling.label}}",
+                            "value": "Comfort Cooling",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.eco.label}}",
+                            "value": "eco",
                             "type": "active"
                         },
                         {
                             "key": "std",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.std.label}}",
+                            "value": "std",
                             "type": "active"
                         },
                         {
                             "key": "power",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.power.label}}",
+                            "value": "power",
                             "type": "active"
                         },
                         {
                             "key": "force",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.force.label}}",
+                            "value": "force",
                             "type": "active"
                         },
                         {
                             "key": "heatEx",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.heatEx.label}}",
+                            "value": "HeatEX",
                             "type": "active"
                         },
                         {
                             "key": "bypass",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.bypass.label}}",
+                            "value": "ByPass",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "purification",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.purification.label}}",
+                            "value": "Purify",
                             "type": "active"
                         },
                         {
                             "key": "ventilation",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.ventilation.label}}",
+                            "value": "Ventilation",
                             "type": "active"
                         },
                         {
                             "key": "smartVentilation",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.smartVentilation.label}}",
+                            "value": "Smart Ventilation",
                             "type": "active"
                         }
                     ]
@@ -857,118 +857,118 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "cool",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "dry",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.dry.label}}",
+                            "value": "Dry",
                             "type": "active"
                         },
                         {
                             "key": "wind",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.wind.label}}",
+                            "value": "Purify",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "coolClean",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.coolClean.label}}",
+                            "value": "Cool, Purify",
                             "type": "active"
                         },
                         {
                             "key": "dryClean",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.dryClean.label}}",
+                            "value": "Dry, Purify",
                             "type": "active"
                         },
                         {
                             "key": "heatClean",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.heatClean.label}}",
+                            "value": "Heat, Purify",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "fanOnly",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.fanOnly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "fan",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.fan.label}}",
+                            "value": "Fan",
                             "type": "active"
                         },
                         {
                             "key": "aIComfort",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.aIComfort.label}}",
+                            "value": "AI Comfort Cooling",
                             "type": "active"
                         },
                         {
                             "key": "comfortCooling",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.comfortCooling.label}}",
+                            "value": "Comfort Cooling",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.eco.label}}",
+                            "value": "eco",
                             "type": "active"
                         },
                         {
                             "key": "std",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.std.label}}",
+                            "value": "std",
                             "type": "active"
                         },
                         {
                             "key": "power",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.power.label}}",
+                            "value": "power",
                             "type": "active"
                         },
                         {
                             "key": "force",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.force.label}}",
+                            "value": "force",
                             "type": "active"
                         },
                         {
                             "key": "heatEx",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.heatEx.label}}",
+                            "value": "HeatEX",
                             "type": "active"
                         },
                         {
                             "key": "bypass",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.bypass.label}}",
+                            "value": "ByPass",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "purification",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.purification.label}}",
+                            "value": "Purify",
                             "type": "active"
                         },
                         {
                             "key": "ventilation",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.ventilation.label}}",
+                            "value": "Ventilation",
                             "type": "active"
                         },
                         {
                             "key": "smartVentilation",
-                            "value": "{{i18n.attributes.airConditionerMode.i18n.value.smartVentilation.label}}",
+                            "value": "Smart Ventilation",
                             "type": "active"
                         }
                     ],
@@ -981,118 +981,118 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.commands.setAirConditionerMode.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "cool",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "dry",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.dry.label}}",
+                            "value": "Dry",
                             "type": "active"
                         },
                         {
                             "key": "wind",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.wind.label}}",
+                            "value": "Purify",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "coolClean",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.coolClean.label}}",
+                            "value": "Cool, Purify",
                             "type": "active"
                         },
                         {
                             "key": "dryClean",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.dryClean.label}}",
+                            "value": "Dry, Purify",
                             "type": "active"
                         },
                         {
                             "key": "heatClean",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heatClean.label}}",
+                            "value": "Heat, Purify",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "fanOnly",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.fanOnly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "fan",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.fan.label}}",
+                            "value": "Fan",
                             "type": "active"
                         },
                         {
                             "key": "aIComfort",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.aIComfort.label}}",
+                            "value": "AI Comfort Cooling",
                             "type": "active"
                         },
                         {
                             "key": "comfortCooling",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.comfortCooling.label}}",
+                            "value": "Comfort Cooling",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.eco.label}}",
+                            "value": "eco",
                             "type": "active"
                         },
                         {
                             "key": "std",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.std.label}}",
+                            "value": "std",
                             "type": "active"
                         },
                         {
                             "key": "power",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.power.label}}",
+                            "value": "power",
                             "type": "active"
                         },
                         {
                             "key": "force",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.force.label}}",
+                            "value": "force",
                             "type": "active"
                         },
                         {
                             "key": "heatEx",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.heatEx.label}}",
+                            "value": "HeatEX",
                             "type": "active"
                         },
                         {
                             "key": "bypass",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.bypass.label}}",
+                            "value": "ByPass",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "purification",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.purification.label}}",
+                            "value": "Purify",
                             "type": "active"
                         },
                         {
                             "key": "ventilation",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.ventilation.label}}",
+                            "value": "Ventilation",
                             "type": "active"
                         },
                         {
                             "key": "smartVentilation",
-                            "value": "{{i18n.commands.setAirConditionerMode.arguments.mode.i18n.smartVentilation.label}}",
+                            "value": "Smart Ventilation",
                             "type": "active"
                         }
                     ],
diff --git a/json/airFlowDirection.json b/json/airFlowDirection.json
index dde7f847..39a935ba 100755
--- a/json/airFlowDirection.json
+++ b/json/airFlowDirection.json
@@ -23,7 +23,6 @@
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setAirFlowDirection",
             "enumCommands": []
         }
     },
@@ -45,7 +44,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/airPurifierFanMode.i18n.en.json b/json/airPurifierFanMode.i18n.en.json
index 94c78d6a..3e47921b 100755
--- a/json/airPurifierFanMode.i18n.en.json
+++ b/json/airPurifierFanMode.i18n.en.json
@@ -65,12 +65,12 @@
                         "low": {
                             "label": "Low"
                         },
-                        "quiet": {
-                            "label": "Quiet"
-                        },
                         "medium": {
                             "label": "Medium"
                         },
+                        "quiet": {
+                            "label": "Quiet"
+                        },
                         "off": {
                             "label": "Off"
                         }
diff --git a/json/airPurifierFanMode.i18n.fr.json b/json/airPurifierFanMode.i18n.fr.json
index a3cc9186..0503438e 100755
--- a/json/airPurifierFanMode.i18n.fr.json
+++ b/json/airPurifierFanMode.i18n.fr.json
@@ -65,12 +65,12 @@
                         "low": {
                             "label": "Faible"
                         },
-                        "quiet": {
-                            "label": "Silencieux"
-                        },
                         "medium": {
                             "label": "Moyen"
                         },
+                        "quiet": {
+                            "label": "Silencieux"
+                        },
                         "off": {
                             "label": "Désactivé"
                         }
diff --git a/json/airPurifierFanModePresentation.json b/json/airPurifierFanModePresentation.json
index 88b85477..06119b87 100755
--- a/json/airPurifierFanModePresentation.json
+++ b/json/airPurifierFanModePresentation.json
@@ -6,42 +6,42 @@
                 "alternatives": [
                     {
                         "key": "auto",
-                        "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.auto.label}}",
+                        "value": "Auto",
                         "type": "active"
                     },
                     {
                         "key": "sleep",
-                        "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.sleep.label}}",
+                        "value": "Sleep",
                         "type": "active"
                     },
                     {
                         "key": "low",
-                        "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.low.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "medium",
-                        "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.medium.label}}",
+                        "value": "Medium",
                         "type": "active"
                     },
                     {
                         "key": "high",
-                        "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.high.label}}",
+                        "value": "High",
                         "type": "active"
                     },
                     {
                         "key": "quiet",
-                        "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.quiet.label}}",
+                        "value": "Quiet",
                         "type": "active"
                     },
                     {
                         "key": "windFree",
-                        "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.windFree.label}}",
+                        "value": "Wind free",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -50,7 +50,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Air purifier fan mode",
                 "displayType": "list",
                 "list": {
                     "command": {
@@ -58,42 +58,42 @@
                         "alternatives": [
                             {
                                 "key": "auto",
-                                "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.auto.label}}",
+                                "value": "Auto",
                                 "type": "active"
                             },
                             {
                                 "key": "sleep",
-                                "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.sleep.label}}",
+                                "value": "Sleep",
                                 "type": "active"
                             },
                             {
                                 "key": "low",
-                                "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.low.label}}",
+                                "value": "Low",
                                 "type": "active"
                             },
                             {
                                 "key": "medium",
-                                "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.medium.label}}",
+                                "value": "Medium",
                                 "type": "active"
                             },
                             {
                                 "key": "high",
-                                "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.high.label}}",
+                                "value": "High",
                                 "type": "active"
                             },
                             {
                                 "key": "quiet",
-                                "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.quiet.label}}",
+                                "value": "Quiet",
                                 "type": "active"
                             },
                             {
                                 "key": "windFree",
-                                "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.windFree.label}}",
+                                "value": "Wind free",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.off.label}}",
+                                "value": "Off",
                                 "type": "inactive"
                             }
                         ],
@@ -106,42 +106,42 @@
                         "alternatives": [
                             {
                                 "key": "auto",
-                                "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.auto.label}}",
+                                "value": "Auto",
                                 "type": "active"
                             },
                             {
                                 "key": "sleep",
-                                "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.sleep.label}}",
+                                "value": "Sleep",
                                 "type": "active"
                             },
                             {
                                 "key": "low",
-                                "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.low.label}}",
+                                "value": "Low",
                                 "type": "active"
                             },
                             {
                                 "key": "medium",
-                                "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.medium.label}}",
+                                "value": "Medium",
                                 "type": "active"
                             },
                             {
                                 "key": "high",
-                                "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.high.label}}",
+                                "value": "High",
                                 "type": "active"
                             },
                             {
                                 "key": "quiet",
-                                "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.quiet.label}}",
+                                "value": "Quiet",
                                 "type": "active"
                             },
                             {
                                 "key": "windFree",
-                                "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.windFree.label}}",
+                                "value": "Wind free",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.off.label}}",
+                                "value": "Off",
                                 "type": "inactive"
                             }
                         ]
@@ -159,7 +159,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Air purifier fan mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -167,42 +167,42 @@
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.high.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "quiet",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.quiet.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "windFree",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.windFree.label}}",
+                            "value": "Wind free",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -215,42 +215,42 @@
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.high.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "quiet",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.quiet.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "windFree",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.windFree.label}}",
+                            "value": "Wind free",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
@@ -261,48 +261,48 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Air purifier fan mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.high.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "quiet",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.quiet.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "windFree",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.windFree.label}}",
+                            "value": "Wind free",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.airPurifierFanMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -315,48 +315,48 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Air purifier fan mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.sleep.label}}",
+                            "value": "Sleep",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.high.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "quiet",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.quiet.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "windFree",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.windFree.label}}",
+                            "value": "Wind free",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setAirPurifierFanMode.arguments.airPurifierFanMode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/airQualityHealthConcernPresentation.json b/json/airQualityHealthConcernPresentation.json
index cdbe6bae..b0ed2385 100755
--- a/json/airQualityHealthConcernPresentation.json
+++ b/json/airQualityHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Air quality level",
             "displayType": "state",
             "state": {
                 "label": "{{airQualityHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Air quality level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.airQualityHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/airQualitySensorPresentation.json b/json/airQualitySensorPresentation.json
index 42ee9899..3dc97332 100755
--- a/json/airQualitySensorPresentation.json
+++ b/json/airQualitySensorPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Air quality",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Air quality",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "airQuality.value",
diff --git a/json/alarmPresentation.json b/json/alarmPresentation.json
index 3503cdb1..daf4db53 100755
--- a/json/alarmPresentation.json
+++ b/json/alarmPresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.alarm.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     },
                     {
                         "key": "both",
-                        "value": "{{i18n.attributes.alarm.i18n.value.both.label}}",
+                        "value": "Siren and strobe",
                         "type": "active"
                     },
                     {
                         "key": "strobe",
-                        "value": "{{i18n.attributes.alarm.i18n.value.strobe.label}}",
+                        "value": "Strobe",
                         "type": "active"
                     },
                     {
                         "key": "siren",
-                        "value": "{{i18n.attributes.alarm.i18n.value.siren.label}}",
+                        "value": "Siren",
                         "type": "active"
                     }
                 ]
@@ -43,12 +43,12 @@
                         "alternatives": [
                             {
                                 "key": "strobe",
-                                "value": "{{i18n.attributes.alarm.i18n.value.strobe.label}}",
+                                "value": "Strobe",
                                 "type": "active"
                             },
                             {
                                 "key": "siren",
-                                "value": "{{i18n.attributes.alarm.i18n.value.siren.label}}",
+                                "value": "Siren",
                                 "type": "active"
                             }
                         ]
@@ -70,12 +70,12 @@
                         "alternatives": [
                             {
                                 "key": "both",
-                                "value": "{{i18n.attributes.alarm.i18n.value.both.label}}",
+                                "value": "Siren and strobe",
                                 "type": "active"
                             },
                             {
                                 "key": "strobe",
-                                "value": "{{i18n.attributes.alarm.i18n.value.strobe.label}}",
+                                "value": "Strobe",
                                 "type": "active"
                             }
                         ]
@@ -97,12 +97,12 @@
                         "alternatives": [
                             {
                                 "key": "both",
-                                "value": "{{i18n.attributes.alarm.i18n.value.both.label}}",
+                                "value": "Siren and strobe",
                                 "type": "active"
                             },
                             {
                                 "key": "siren",
-                                "value": "{{i18n.attributes.alarm.i18n.value.siren.label}}",
+                                "value": "Siren",
                                 "type": "active"
                             }
                         ]
@@ -114,29 +114,29 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Alarm type",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "strobe",
-                            "value": "{{i18n.commands.strobe.label}}",
+                            "value": "Strobe",
                             "type": "active"
                         },
                         {
                             "key": "both",
-                            "value": "{{i18n.commands.both.label}}",
+                            "value": "Siren and strobe",
                             "type": "active"
                         },
                         {
                             "key": "siren",
-                            "value": "{{i18n.commands.siren.label}}",
+                            "value": "Siren",
                             "type": "active"
                         }
                     ]
@@ -147,22 +147,22 @@
                     "alternatives": [
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.alarm.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "strobe",
-                            "value": "{{i18n.attributes.alarm.i18n.value.strobe.label}}",
+                            "value": "Strobe",
                             "type": "active"
                         },
                         {
                             "key": "both",
-                            "value": "{{i18n.attributes.alarm.i18n.value.both.label}}",
+                            "value": "Siren and strobe",
                             "type": "active"
                         },
                         {
                             "key": "siren",
-                            "value": "{{i18n.attributes.alarm.i18n.value.siren.label}}",
+                            "value": "Siren",
                             "type": "active"
                         }
                     ]
@@ -173,28 +173,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Alarm type",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.alarm.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "strobe",
-                            "value": "{{i18n.attributes.alarm.i18n.value.strobe.label}}",
+                            "value": "Strobe",
                             "type": "active"
                         },
                         {
                             "key": "both",
-                            "value": "{{i18n.attributes.alarm.i18n.value.both.label}}",
+                            "value": "Siren and strobe",
                             "type": "active"
                         },
                         {
                             "key": "siren",
-                            "value": "{{i18n.attributes.alarm.i18n.value.siren.label}}",
+                            "value": "Siren",
                             "type": "active"
                         }
                     ],
@@ -206,28 +206,28 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Alarm type",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "strobe",
-                            "value": "{{i18n.commands.strobe.label}}",
+                            "value": "Strobe",
                             "type": "active"
                         },
                         {
                             "key": "both",
-                            "value": "{{i18n.commands.both.label}}",
+                            "value": "Siren and strobe",
                             "type": "active"
                         },
                         {
                             "key": "siren",
-                            "value": "{{i18n.commands.siren.label}}",
+                            "value": "Siren",
                             "type": "active"
                         }
                     ]
diff --git a/json/alarmsensor.json b/json/alarmsensor.json
index 81c1dd69..28c14d35 100644
--- a/json/alarmsensor.json
+++ b/json/alarmsensor.json
@@ -46,7 +46,6 @@
                     "value"
                 ]
             },
-            "setter": "setAlarmSensorState",
             "enumCommands": []
         }
     },
@@ -67,7 +66,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/antiSnoringPillow.i18n.en.json b/json/antiSnoringPillow.i18n.en.json
index c66181af..368eb781 100644
--- a/json/antiSnoringPillow.i18n.en.json
+++ b/json/antiSnoringPillow.i18n.en.json
@@ -1,65 +1,75 @@
 {
     "tag": "en",
-    "label": "Anti Snoring Pillow",
+    "label": "Pillow state",
+    "description": "Allows for the operation of the anti snoring pillow",
     "attributes": {
         "snoringTime": {
-            "label": "snoringTime",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Snoring time",
+            "description": "Total snoring time. Unit is minute.",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "supportPillowOperationTimeGraph": {
-            "label": "supportPillowOperationTimeGraph",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Pillow operation time graph support",
+            "description": "Whether device supports pillow operation time graph",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "snoringTimeDelta": {
-            "label": "snoringTimeDelta",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Snoring time delta",
+            "description": "Snoring time measured after last report. Rcommended time between reports is less than 10 mins. Unit is minute.",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "pillowOperationTime": {
-            "label": "pillowOperationTime",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Snore care time",
+            "description": "Total pillow operation time. Unit is minute.",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "state": {
-            "label": "state",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Pillow state",
+            "description": "State of pillow",
+            "displayTemplate": "{{device.label}} {{attribute}}: {{value}}",
             "i18n": {
                 "value": {
                     "running": {
-                        "label": "running"
+                        "label": "On"
                     },
                     "stopped": {
-                        "label": "stopped"
+                        "label": "Stopped"
                     },
                     "preparing": {
-                        "label": "preparing"
+                        "label": "Preparing"
                     },
                     "off": {
-                        "label": "off"
+                        "label": "Off"
                     }
                 }
             }
         },
         "supportSnoringTimeGraph": {
-            "label": "supportSnoringTimeGraph",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Snoring graph support",
+            "description": "Whether device supports snoring time graph",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "pillowOperationTimeDelta": {
-            "label": "pillowOperationTimeDelta",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Pillow operation time delta",
+            "description": "Pillow operation time measured after last report. Rcommended time between reports is less than 10 mins. Unit is minute.",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         }
     },
     "commands": {
         "off": {
-            "label": "off",
+            "label": "Turn off",
+            "description": "Turn off pillow operation",
             "arguments": {}
         },
         "on": {
-            "label": "on",
+            "label": "Turn on",
+            "description": "Turn on pillow operation",
             "arguments": {}
         }
     }
diff --git a/json/antiSnoringPillow.i18n.fr.json b/json/antiSnoringPillow.i18n.fr.json
index c66181af..6e3e10f3 100644
--- a/json/antiSnoringPillow.i18n.fr.json
+++ b/json/antiSnoringPillow.i18n.fr.json
@@ -1,65 +1,75 @@
 {
-    "tag": "en",
-    "label": "Anti Snoring Pillow",
+    "tag": "fr",
+    "label": "État de l'oreiller",
+    "description": "Allows for the operation of the anti snoring pillow",
     "attributes": {
         "snoringTime": {
-            "label": "snoringTime",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Temps de ronflement",
+            "description": "Total snoring time. Unit is minute.",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "supportPillowOperationTimeGraph": {
-            "label": "supportPillowOperationTimeGraph",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Pillow operation time graph support",
+            "description": "Whether device supports pillow operation time graph",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "snoringTimeDelta": {
-            "label": "snoringTimeDelta",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Snoring time delta",
+            "description": "Snoring time measured after last report. Rcommended time between reports is less than 10 mins. Unit is minute.",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "pillowOperationTime": {
-            "label": "pillowOperationTime",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Temps de soin des ronflements",
+            "description": "Total pillow operation time. Unit is minute.",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "state": {
-            "label": "state",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "État de l'oreiller",
+            "description": "State of pillow",
+            "displayTemplate": "{{device.label}} {{attribute}}: {{value}}",
             "i18n": {
                 "value": {
                     "running": {
-                        "label": "running"
+                        "label": "Activé"
                     },
                     "stopped": {
-                        "label": "stopped"
+                        "label": "Arrêté"
                     },
                     "preparing": {
-                        "label": "preparing"
+                        "label": "Préparation"
                     },
                     "off": {
-                        "label": "off"
+                        "label": "Désactivé"
                     }
                 }
             }
         },
         "supportSnoringTimeGraph": {
-            "label": "supportSnoringTimeGraph",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Snoring graph support",
+            "description": "Whether device supports snoring time graph",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "pillowOperationTimeDelta": {
-            "label": "pillowOperationTimeDelta",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Pillow operation time delta",
+            "description": "Pillow operation time measured after last report. Rcommended time between reports is less than 10 mins. Unit is minute.",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         }
     },
     "commands": {
         "off": {
-            "label": "off",
+            "label": "Désactiver",
+            "description": "Turn off pillow operation",
             "arguments": {}
         },
         "on": {
-            "label": "on",
+            "label": "Activer",
+            "description": "Turn on pillow operation",
             "arguments": {}
         }
     }
diff --git a/json/antiSnoringPillowPresentation.json b/json/antiSnoringPillowPresentation.json
new file mode 100644
index 00000000..1157771d
--- /dev/null
+++ b/json/antiSnoringPillowPresentation.json
@@ -0,0 +1,185 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{state.value}}",
+                "alternatives": [
+                    {
+                        "key": "off",
+                        "value": "Off",
+                        "type": "inactive"
+                    },
+                    {
+                        "key": "stopped",
+                        "value": "Stopped",
+                        "type": "inactive"
+                    },
+                    {
+                        "key": "preparing",
+                        "value": "Preparing",
+                        "type": "active"
+                    },
+                    {
+                        "key": "running",
+                        "value": "On",
+                        "type": "active"
+                    }
+                ]
+            }
+        ],
+        "actions": [
+            {
+                "displayType": "standbyPowerSwitch",
+                "standbyPowerSwitch": {
+                    "command": {
+                        "on": "on",
+                        "off": "off"
+                    },
+                    "state": {
+                        "value": "state.value",
+                        "valueType": "string",
+                        "on": "running",
+                        "off": "stopped",
+                        "alternatives": [
+                            {
+                                "key": "off",
+                                "value": "Off",
+                                "type": "inactive"
+                            },
+                            {
+                                "key": "stopped",
+                                "value": "Stopped",
+                                "type": "inactive"
+                            },
+                            {
+                                "key": "preparing",
+                                "value": "Preparing",
+                                "type": "active"
+                            },
+                            {
+                                "key": "running",
+                                "value": "On",
+                                "type": "active"
+                            }
+                        ]
+                    }
+                }
+            }
+        ],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "Pillow state",
+            "displayType": "standbyPowerSwitch",
+            "standbyPowerSwitch": {
+                "command": {
+                    "on": "on",
+                    "off": "off"
+                },
+                "state": {
+                    "value": "state.value",
+                    "valueType": "string",
+                    "on": "running",
+                    "off": "stopped",
+                    "label": "{{state.value}}",
+                    "alternatives": [
+                        {
+                            "key": "off",
+                            "value": "Off",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "stopped",
+                            "value": "Stopped",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "preparing",
+                            "value": "Preparing",
+                            "type": "active"
+                        },
+                        {
+                            "key": "running",
+                            "value": "On",
+                            "type": "active"
+                        }
+                    ]
+                }
+            }
+        },
+        {
+            "label": "Snoring time",
+            "displayType": "state",
+            "state": {
+                "label": "{{snoringTime.value}}",
+                "unit": "snoringTime.unit"
+            }
+        },
+        {
+            "label": "Snore care time",
+            "displayType": "state",
+            "state": {
+                "label": "{{pillowOperationTime.value}}",
+                "unit": "pillowOperationTime.unit"
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "Pillow state",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "off",
+                            "value": "Off",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "stopped",
+                            "value": "Stopped",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "preparing",
+                            "value": "Preparing",
+                            "type": "active"
+                        },
+                        {
+                            "key": "running",
+                            "value": "On",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "state.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": [
+            {
+                "label": "Pillow state",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "on",
+                            "value": "Turn on",
+                            "type": "active"
+                        },
+                        {
+                            "key": "off",
+                            "value": "Turn off",
+                            "type": "active"
+                        }
+                    ]
+                }
+            }
+        ]
+    },
+    "id": "antiSnoringPillow",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/applianceUtilizationPresentation.json b/json/applianceUtilizationPresentation.json
index 339afe2a..2e6075ad 100755
--- a/json/applianceUtilizationPresentation.json
+++ b/json/applianceUtilizationPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "inUse",
-                        "value": "{{i18n.attributes.status.i18n.value.inUse.label}}",
+                        "value": "In use",
                         "type": "active"
                     },
                     {
                         "key": "notInUse",
-                        "value": "{{i18n.attributes.status.i18n.value.notInUse.label}}",
+                        "value": "Not in use",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Appliance status",
             "displayType": "state",
             "state": {
                 "label": "{{status.value}}",
                 "alternatives": [
                     {
                         "key": "inUse",
-                        "value": "{{i18n.attributes.status.i18n.value.inUse.label}}",
+                        "value": "In use",
                         "type": "active"
                     },
                     {
                         "key": "notInUse",
-                        "value": "{{i18n.attributes.status.i18n.value.notInUse.label}}",
+                        "value": "Not in use",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Appliance status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "inUse",
-                            "value": "{{i18n.attributes.status.i18n.value.inUse.label}}",
+                            "value": "In use",
                             "type": "active"
                         },
                         {
                             "key": "notInUse",
-                            "value": "{{i18n.attributes.status.i18n.value.notInUse.label}}",
+                            "value": "Not in use",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/atmosphericPressureMeasurementPresentation.json b/json/atmosphericPressureMeasurementPresentation.json
index f2af415f..1d2f98c9 100755
--- a/json/atmosphericPressureMeasurementPresentation.json
+++ b/json/atmosphericPressureMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Atmospheric pressure",
             "displayType": "state",
             "state": {
                 "label": "{{atmosphericPressure.value}}",
@@ -21,7 +21,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Atmospheric pressure",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "atmosphericPressure.value",
diff --git a/json/audioCapturePresentation.json b/json/audioCapturePresentation.json
index fd7fa28d..007269cb 100755
--- a/json/audioCapturePresentation.json
+++ b/json/audioCapturePresentation.json
@@ -3,13 +3,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Auto record sounds",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "capture",
-                            "value": "{{i18n.label}}",
+                            "value": "Auto record sounds",
                             "type": "active"
                         }
                     ]
diff --git a/json/audioMutePresentation.json b/json/audioMutePresentation.json
index 85a4d409..c813bedf 100755
--- a/json/audioMutePresentation.json
+++ b/json/audioMutePresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "muted",
-                        "value": "{{i18n.attributes.mute.i18n.value.muted.label}}",
+                        "value": "Muted",
                         "type": "active"
                     },
                     {
                         "key": "unmuted",
-                        "value": "{{i18n.attributes.mute.i18n.value.unmuted.label}}",
+                        "value": "Unmuted",
                         "type": "inactive"
                     }
                 ]
@@ -36,7 +36,7 @@
         ],
         "panelItems": [
             {
-                "label": "___PO_CODE_CAPABILITY.SMARTTHINGS.AUDIOMUTE_DEFAULT_DC_UN_MUTE",
+                "label": "Unmuted",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "mute",
@@ -52,7 +52,7 @@
                 }
             },
             {
-                "label": "___PO_CODE_CAPABILITY.SMARTTHINGS.AUDIOMUTE_DEFAULT_DC_MUTE",
+                "label": "Muted",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "unmute",
@@ -71,7 +71,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Audio mute",
             "displayType": "toggleSwitch",
             "toggleSwitch": {
                 "command": {
@@ -87,12 +87,12 @@
                     "alternatives": [
                         {
                             "key": "muted",
-                            "value": "{{i18n.attributes.mute.i18n.value.muted.label}}",
+                            "value": "Muted",
                             "type": "active"
                         },
                         {
                             "key": "unmuted",
-                            "value": "{{i18n.attributes.mute.i18n.value.unmuted.label}}",
+                            "value": "Unmuted",
                             "type": "inactive"
                         }
                     ]
@@ -103,18 +103,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Audio mute",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "muted",
-                            "value": "{{i18n.attributes.mute.i18n.value.muted.label}}",
+                            "value": "Muted",
                             "type": "active"
                         },
                         {
                             "key": "unmuted",
-                            "value": "{{i18n.attributes.mute.i18n.value.unmuted.label}}",
+                            "value": "Unmuted",
                             "type": "inactive"
                         }
                     ],
@@ -126,18 +126,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Audio mute",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "mute",
-                            "value": "{{i18n.commands.mute.label}}",
+                            "value": "Sound off",
                             "type": "active"
                         },
                         {
                             "key": "unmute",
-                            "value": "{{i18n.commands.unmute.label}}",
+                            "value": "Sound on",
                             "type": "inactive"
                         }
                     ]
diff --git a/json/audioRecording.i18n.en.json b/json/audioRecording.i18n.en.json
new file mode 100644
index 00000000..95f40bdd
--- /dev/null
+++ b/json/audioRecording.i18n.en.json
@@ -0,0 +1,26 @@
+{
+    "tag": "en",
+    "label": "Audio Recording",
+    "attributes": {
+        "audioRecording": {
+            "label": "audioRecording",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "setAudioRecording": {
+            "label": "setAudioRecording",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/audioRecording.i18n.fr.json b/json/audioRecording.i18n.fr.json
new file mode 100644
index 00000000..95f40bdd
--- /dev/null
+++ b/json/audioRecording.i18n.fr.json
@@ -0,0 +1,26 @@
+{
+    "tag": "en",
+    "label": "Audio Recording",
+    "attributes": {
+        "audioRecording": {
+            "label": "audioRecording",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "setAudioRecording": {
+            "label": "setAudioRecording",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/audioRecording.json b/json/audioRecording.json
new file mode 100644
index 00000000..9d24a879
--- /dev/null
+++ b/json/audioRecording.json
@@ -0,0 +1,50 @@
+{
+    "id": "audioRecording",
+    "version": 1,
+    "status": "proposed",
+    "name": "Audio Recording",
+    "ephemeral": false,
+    "attributes": {
+        "audioRecording": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setAudioRecording",
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "setAudioRecording": {
+            "name": "setAudioRecording",
+            "arguments": [
+                {
+                    "name": "state",
+                    "optional": false,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/audioStreamPresentation.json b/json/audioStreamPresentation.json
index be92ea64..c069dd13 100755
--- a/json/audioStreamPresentation.json
+++ b/json/audioStreamPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Audio stream",
             "displayType": "state",
             "state": {
                 "label": "{{uri.value}}"
@@ -12,18 +12,18 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Audio stream",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "startAudio",
-                            "value": "{{i18n.commands.startAudio.label}}",
+                            "value": "Turn on microphone",
                             "type": "active"
                         },
                         {
                             "key": "stopAudio",
-                            "value": "{{i18n.commands.stopAudio.label}}",
+                            "value": "Turn off microphone",
                             "type": "inactive"
                         }
                     ]
diff --git a/json/audioTrackDataPresentation.json b/json/audioTrackDataPresentation.json
index 6b6fae76..4134b5ba 100755
--- a/json/audioTrackDataPresentation.json
+++ b/json/audioTrackDataPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "___PO_CODE_CAPABILITY.SMARTTHINGS.AUDIOTRACKDATA_DEFAULT_TITLE",
+            "label": "Now playing",
             "displayType": "state",
             "state": {
                 "label": "{{audioTrackData.value.title}}"
diff --git a/json/audioVolumePresentation.json b/json/audioVolumePresentation.json
index a9abac07..5f0f488d 100755
--- a/json/audioVolumePresentation.json
+++ b/json/audioVolumePresentation.json
@@ -8,7 +8,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "___PO_CODE_CAPABILITY.SMARTTHINGS.AUDIOVOLUME_DEFAULT_DC_VOL",
+                "label": "VOL",
                 "displayType": "stepper",
                 "stepper": {
                     "command": {
@@ -20,7 +20,8 @@
                         100
                     ],
                     "state": {
-                        "value": "volume.value"
+                        "value": "volume.value",
+                        "valueType": "integer"
                     },
                     "availableSizes": [
                         "2x1",
@@ -32,7 +33,7 @@
                 }
             },
             {
-                "label": "___PO_CODE_CAPABILITY.SMARTTHINGS.AUDIOVOLUME_DEFAULT_DC_VOL",
+                "label": "VOL",
                 "displayType": "stepper",
                 "stepper": {
                     "command": {
@@ -45,7 +46,8 @@
                         100
                     ],
                     "state": {
-                        "value": "volume.value"
+                        "value": "volume.value",
+                        "valueType": "integer"
                     },
                     "availableSizes": [
                         "2x1",
@@ -57,7 +59,7 @@
                 }
             },
             {
-                "label": "___PO_CODE_CAPABILITY.SMARTTHINGS.AUDIOVOLUME_DEFAULT_DC_VOL",
+                "label": "VOL",
                 "displayType": "stepper",
                 "stepper": {
                     "command": {
@@ -87,7 +89,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Volume",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -106,7 +108,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Volume",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -121,7 +123,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Volume",
                 "displayType": "slider",
                 "slider": {
                     "range": [
diff --git a/json/battery.i18n.en.json b/json/battery.i18n.en.json
index 37f5cb04..ba294f93 100755
--- a/json/battery.i18n.en.json
+++ b/json/battery.i18n.en.json
@@ -4,7 +4,8 @@
     "description": "Defines that the device has a battery",
     "attributes": {
         "quantity": {
-            "label": "quantity",
+            "label": "Quantity",
+            "description": "Quantity of batteries. Optional",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
         },
@@ -15,7 +16,8 @@
             "i18n": {}
         },
         "type": {
-            "label": "type",
+            "label": "Type",
+            "description": "Battery type. Optional",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
                 "value": {
diff --git a/json/battery.i18n.fr.json b/json/battery.i18n.fr.json
index 2506dba3..cfb88f5f 100755
--- a/json/battery.i18n.fr.json
+++ b/json/battery.i18n.fr.json
@@ -4,7 +4,8 @@
     "description": "Defines that the device has a battery",
     "attributes": {
         "quantity": {
-            "label": "quantity",
+            "label": "Quantité",
+            "description": "Quantity of batteries. Optional",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
         },
@@ -15,7 +16,8 @@
             "i18n": {}
         },
         "type": {
-            "label": "type",
+            "label": "Type",
+            "description": "Battery type. Optional",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
                 "value": {
diff --git a/json/batteryLevel.i18n.en.json b/json/batteryLevel.i18n.en.json
index dd20afae..2180b17d 100755
--- a/json/batteryLevel.i18n.en.json
+++ b/json/batteryLevel.i18n.en.json
@@ -4,7 +4,7 @@
     "description": "Get the qualitative level of the battery",
     "attributes": {
         "quantity": {
-            "label": "quantity",
+            "label": "Quantity",
             "description": "Quantity of batteries. Optional",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
@@ -28,7 +28,7 @@
             }
         },
         "type": {
-            "label": "type",
+            "label": "Type",
             "description": "Battery type. Optional",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
diff --git a/json/batteryLevel.i18n.fr.json b/json/batteryLevel.i18n.fr.json
index 827c83bf..ea4c3888 100755
--- a/json/batteryLevel.i18n.fr.json
+++ b/json/batteryLevel.i18n.fr.json
@@ -4,7 +4,7 @@
     "description": "Get the qualitative level of the battery",
     "attributes": {
         "quantity": {
-            "label": "quantity",
+            "label": "Quantité",
             "description": "Quantity of batteries. Optional",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
@@ -28,7 +28,7 @@
             }
         },
         "type": {
-            "label": "type",
+            "label": "Type",
             "description": "Battery type. Optional",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
diff --git a/json/batteryLevelPresentation.json b/json/batteryLevelPresentation.json
index 881f0165..84be5621 100755
--- a/json/batteryLevelPresentation.json
+++ b/json/batteryLevelPresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.battery.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "warning",
-                        "value": "{{i18n.attributes.battery.i18n.value.warning.label}}",
+                        "value": "Warning",
                         "type": "active"
                     },
                     {
                         "key": "critical",
-                        "value": "{{i18n.attributes.battery.i18n.value.critical.label}}",
+                        "value": "Critical",
                         "type": "active"
                     }
                 ]
@@ -27,24 +27,24 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Battery level",
             "displayType": "state",
             "state": {
                 "label": "{{battery.value}}",
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.battery.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "warning",
-                        "value": "{{i18n.attributes.battery.i18n.value.warning.label}}",
+                        "value": "Warning",
                         "type": "active"
                     },
                     {
                         "key": "critical",
-                        "value": "{{i18n.attributes.battery.i18n.value.critical.label}}",
+                        "value": "Critical",
                         "type": "active"
                     }
                 ]
@@ -54,23 +54,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Battery level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.battery.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "inactive"
                         },
                         {
                             "key": "warning",
-                            "value": "{{i18n.attributes.battery.i18n.value.warning.label}}",
+                            "value": "Warning",
                             "type": "active"
                         },
                         {
                             "key": "critical",
-                            "value": "{{i18n.attributes.battery.i18n.value.critical.label}}",
+                            "value": "Critical",
                             "type": "active"
                         }
                     ],
diff --git a/json/batteryPresentation.json b/json/batteryPresentation.json
index 1ab3d344..4ef32ddd 100755
--- a/json/batteryPresentation.json
+++ b/json/batteryPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Battery",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Battery",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "battery.value",
diff --git a/json/bodyMassIndexMeasurementPresentation.json b/json/bodyMassIndexMeasurementPresentation.json
index a8177c25..95ec19d8 100755
--- a/json/bodyMassIndexMeasurementPresentation.json
+++ b/json/bodyMassIndexMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "BMI",
             "displayType": "state",
             "state": {
                 "label": "{{bmiMeasurement.value}}",
@@ -21,7 +21,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "BMI",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "bmiMeasurement.value",
diff --git a/json/bodyWeightMeasurementPresentation.json b/json/bodyWeightMeasurementPresentation.json
index 91ebaa4b..04de3e7a 100755
--- a/json/bodyWeightMeasurementPresentation.json
+++ b/json/bodyWeightMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Weight",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Weight",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "bodyWeightMeasurement.value",
diff --git a/json/bridgePresentation.json b/json/bridgePresentation.json
index 51f6d798..f1858cf4 100755
--- a/json/bridgePresentation.json
+++ b/json/bridgePresentation.json
@@ -2,7 +2,7 @@
     "dashboard": {
         "states": [
             {
-                "label": "{{___PO_CODE_CAPABILITY.SMARTTHINGS.BRIDGE_DEFAULT_CONNECTED}}"
+                "label": "Connected"
             }
         ],
         "actions": [],
diff --git a/json/button.i18n.en.json b/json/button.i18n.en.json
index d04e5b73..af999a2f 100755
--- a/json/button.i18n.en.json
+++ b/json/button.i18n.en.json
@@ -16,10 +16,10 @@
                         "label": "Held"
                     },
                     "swipe_left": {
-                        "label": "swipe_left"
+                        "label": "Swipe left"
                     },
                     "swipe_right": {
-                        "label": "swipe_right"
+                        "label": "Swipe right"
                     },
                     "down": {
                         "label": "Toggled down"
@@ -49,7 +49,7 @@
                         "label": "Held up"
                     },
                     "swipe_down": {
-                        "label": "swipe_down"
+                        "label": "Swipe down"
                     },
                     "up_5x": {
                         "label": "Toggled up 5 times"
@@ -67,7 +67,7 @@
                         "label": "Pressed 2 times"
                     },
                     "swipe_up": {
-                        "label": "swipe_up"
+                        "label": "Swipe up"
                     },
                     "pushed_6x": {
                         "label": "Pressed 6 times"
diff --git a/json/button.i18n.fr.json b/json/button.i18n.fr.json
index 554f21e8..6c1edf0f 100755
--- a/json/button.i18n.fr.json
+++ b/json/button.i18n.fr.json
@@ -16,10 +16,10 @@
                         "label": "Maintenue appuyée"
                     },
                     "swipe_left": {
-                        "label": "swipe_left"
+                        "label": "Glisser à gauche"
                     },
                     "swipe_right": {
-                        "label": "swipe_right"
+                        "label": "Glisser à droite"
                     },
                     "down": {
                         "label": "Basculé vers le bas"
@@ -49,7 +49,7 @@
                         "label": "Maintenu vers le haut"
                     },
                     "swipe_down": {
-                        "label": "swipe_down"
+                        "label": "Balayer vers le bas"
                     },
                     "up_5x": {
                         "label": "Basculé vers le haut 5 fois"
@@ -67,7 +67,7 @@
                         "label": "2 appuis effectués"
                     },
                     "swipe_up": {
-                        "label": "swipe_up"
+                        "label": "Glisser vers le haut"
                     },
                     "pushed_6x": {
                         "label": "6 appuis effectués"
diff --git a/json/buttonPresentation.json b/json/buttonPresentation.json
index e2759edf..b965e5cb 100755
--- a/json/buttonPresentation.json
+++ b/json/buttonPresentation.json
@@ -6,117 +6,137 @@
                 "alternatives": [
                     {
                         "key": "pushed",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed.label}}",
+                        "value": "Pressed",
                         "type": "active"
                     },
                     {
                         "key": "double",
-                        "value": "{{i18n.attributes.button.i18n.value.double.label}}",
+                        "value": "Double pressed",
                         "type": "active"
                     },
                     {
                         "key": "held",
-                        "value": "{{i18n.attributes.button.i18n.value.held.label}}",
+                        "value": "Held",
                         "type": "active"
                     },
                     {
                         "key": "Ready",
-                        "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.BUTTON_DEFAULT_STANDBY",
+                        "value": "Standby",
                         "type": "inactive"
                     },
                     {
                         "key": "pushed_2x",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed_2x.label}}",
+                        "value": "Pressed 2 times",
                         "type": "active"
                     },
                     {
                         "key": "pushed_3x",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed_3x.label}}",
+                        "value": "Pressed 3 times",
                         "type": "active"
                     },
                     {
                         "key": "pushed_4x",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed_4x.label}}",
+                        "value": "Pressed 4 times",
                         "type": "active"
                     },
                     {
                         "key": "pushed_5x",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed_5x.label}}",
+                        "value": "Pressed 5 times",
                         "type": "active"
                     },
                     {
                         "key": "pushed_6x",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed_6x.label}}",
+                        "value": "Pressed 6 times",
                         "type": "active"
                     },
                     {
                         "key": "down",
-                        "value": "{{i18n.attributes.button.i18n.value.down.label}}",
+                        "value": "Toggled down",
                         "type": "active"
                     },
                     {
                         "key": "down_2x",
-                        "value": "{{i18n.attributes.button.i18n.value.down_2x.label}}",
+                        "value": "Toggled down 2 times",
                         "type": "active"
                     },
                     {
                         "key": "down_3x",
-                        "value": "{{i18n.attributes.button.i18n.value.down_3x.label}}",
+                        "value": "Toggled down 3 times",
                         "type": "active"
                     },
                     {
                         "key": "down_4x",
-                        "value": "{{i18n.attributes.button.i18n.value.down_4x.label}}",
+                        "value": "Toggled down 4 times",
                         "type": "active"
                     },
                     {
                         "key": "down_5x",
-                        "value": "{{i18n.attributes.button.i18n.value.down_5x.label}}",
+                        "value": "Toggled down 5 times",
                         "type": "active"
                     },
                     {
                         "key": "down_6x",
-                        "value": "{{i18n.attributes.button.i18n.value.down_6x.label}}",
+                        "value": "Toggled down 6 times",
                         "type": "active"
                     },
                     {
                         "key": "down_hold",
-                        "value": "{{i18n.attributes.button.i18n.value.down_hold.label}}",
+                        "value": "Held down",
                         "type": "active"
                     },
                     {
                         "key": "up",
-                        "value": "{{i18n.attributes.button.i18n.value.up.label}}",
+                        "value": "Toggled up",
                         "type": "active"
                     },
                     {
                         "key": "up_2x",
-                        "value": "{{i18n.attributes.button.i18n.value.up_2x.label}}",
+                        "value": "Toggled up 2 times",
                         "type": "active"
                     },
                     {
                         "key": "up_3x",
-                        "value": "{{i18n.attributes.button.i18n.value.up_3x.label}}",
+                        "value": "Toggled up 3 times",
                         "type": "active"
                     },
                     {
                         "key": "up_4x",
-                        "value": "{{i18n.attributes.button.i18n.value.up_4x.label}}",
+                        "value": "Toggled up 4 times",
                         "type": "active"
                     },
                     {
                         "key": "up_5x",
-                        "value": "{{i18n.attributes.button.i18n.value.up_5x.label}}",
+                        "value": "Toggled up 5 times",
                         "type": "active"
                     },
                     {
                         "key": "up_6x",
-                        "value": "{{i18n.attributes.button.i18n.value.up_6x.label}}",
+                        "value": "Toggled up 6 times",
                         "type": "active"
                     },
                     {
                         "key": "up_hold",
-                        "value": "{{i18n.attributes.button.i18n.value.up_hold.label}}",
+                        "value": "Held up",
+                        "type": "active"
+                    },
+                    {
+                        "key": "swipe_up",
+                        "value": "Swipe up",
+                        "type": "active"
+                    },
+                    {
+                        "key": "swipe_down",
+                        "value": "Swipe down",
+                        "type": "active"
+                    },
+                    {
+                        "key": "swipe_left",
+                        "value": "Swipe left",
+                        "type": "active"
+                    },
+                    {
+                        "key": "swipe_right",
+                        "value": "Swipe right",
                         "type": "active"
                     }
                 ]
@@ -127,124 +147,144 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Button",
             "displayType": "state",
             "state": {
                 "label": "{{button.value}}",
                 "alternatives": [
                     {
                         "key": "pushed",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed.label}}",
+                        "value": "Pressed",
                         "type": "active"
                     },
                     {
                         "key": "double",
-                        "value": "{{i18n.attributes.button.i18n.value.double.label}}",
+                        "value": "Double pressed",
                         "type": "active"
                     },
                     {
                         "key": "held",
-                        "value": "{{i18n.attributes.button.i18n.value.held.label}}",
+                        "value": "Held",
                         "type": "active"
                     },
                     {
                         "key": "Ready",
-                        "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.BUTTON_DEFAULT_STANDBY",
+                        "value": "Standby",
                         "type": "inactive"
                     },
                     {
                         "key": "pushed_2x",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed_2x.label}}",
+                        "value": "Pressed 2 times",
                         "type": "active"
                     },
                     {
                         "key": "pushed_3x",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed_3x.label}}",
+                        "value": "Pressed 3 times",
                         "type": "active"
                     },
                     {
                         "key": "pushed_4x",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed_4x.label}}",
+                        "value": "Pressed 4 times",
                         "type": "active"
                     },
                     {
                         "key": "pushed_5x",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed_5x.label}}",
+                        "value": "Pressed 5 times",
                         "type": "active"
                     },
                     {
                         "key": "pushed_6x",
-                        "value": "{{i18n.attributes.button.i18n.value.pushed_6x.label}}",
+                        "value": "Pressed 6 times",
                         "type": "active"
                     },
                     {
                         "key": "down",
-                        "value": "{{i18n.attributes.button.i18n.value.down.label}}",
+                        "value": "Toggled down",
                         "type": "active"
                     },
                     {
                         "key": "down_2x",
-                        "value": "{{i18n.attributes.button.i18n.value.down_2x.label}}",
+                        "value": "Toggled down 2 times",
                         "type": "active"
                     },
                     {
                         "key": "down_3x",
-                        "value": "{{i18n.attributes.button.i18n.value.down_3x.label}}",
+                        "value": "Toggled down 3 times",
                         "type": "active"
                     },
                     {
                         "key": "down_4x",
-                        "value": "{{i18n.attributes.button.i18n.value.down_4x.label}}",
+                        "value": "Toggled down 4 times",
                         "type": "active"
                     },
                     {
                         "key": "down_5x",
-                        "value": "{{i18n.attributes.button.i18n.value.down_5x.label}}",
+                        "value": "Toggled down 5 times",
                         "type": "active"
                     },
                     {
                         "key": "down_6x",
-                        "value": "{{i18n.attributes.button.i18n.value.down_6x.label}}",
+                        "value": "Toggled down 6 times",
                         "type": "active"
                     },
                     {
                         "key": "down_hold",
-                        "value": "{{i18n.attributes.button.i18n.value.down_hold.label}}",
+                        "value": "Held down",
                         "type": "active"
                     },
                     {
                         "key": "up",
-                        "value": "{{i18n.attributes.button.i18n.value.up.label}}",
+                        "value": "Toggled up",
                         "type": "active"
                     },
                     {
                         "key": "up_2x",
-                        "value": "{{i18n.attributes.button.i18n.value.up_2x.label}}",
+                        "value": "Toggled up 2 times",
                         "type": "active"
                     },
                     {
                         "key": "up_3x",
-                        "value": "{{i18n.attributes.button.i18n.value.up_3x.label}}",
+                        "value": "Toggled up 3 times",
                         "type": "active"
                     },
                     {
                         "key": "up_4x",
-                        "value": "{{i18n.attributes.button.i18n.value.up_4x.label}}",
+                        "value": "Toggled up 4 times",
                         "type": "active"
                     },
                     {
                         "key": "up_5x",
-                        "value": "{{i18n.attributes.button.i18n.value.up_5x.label}}",
+                        "value": "Toggled up 5 times",
                         "type": "active"
                     },
                     {
                         "key": "up_6x",
-                        "value": "{{i18n.attributes.button.i18n.value.up_6x.label}}",
+                        "value": "Toggled up 6 times",
                         "type": "active"
                     },
                     {
                         "key": "up_hold",
-                        "value": "{{i18n.attributes.button.i18n.value.up_hold.label}}",
+                        "value": "Held up",
+                        "type": "active"
+                    },
+                    {
+                        "key": "swipe_up",
+                        "value": "Swipe up",
+                        "type": "active"
+                    },
+                    {
+                        "key": "swipe_down",
+                        "value": "Swipe down",
+                        "type": "active"
+                    },
+                    {
+                        "key": "swipe_left",
+                        "value": "Swipe left",
+                        "type": "active"
+                    },
+                    {
+                        "key": "swipe_right",
+                        "value": "Swipe right",
                         "type": "active"
                     }
                 ]
@@ -254,118 +294,138 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Button",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "pushed",
-                            "value": "{{i18n.attributes.button.i18n.value.pushed.label}}",
+                            "value": "Pressed",
                             "type": "active"
                         },
                         {
                             "key": "double",
-                            "value": "{{i18n.attributes.button.i18n.value.double.label}}",
+                            "value": "Double pressed",
                             "type": "active"
                         },
                         {
                             "key": "held",
-                            "value": "{{i18n.attributes.button.i18n.value.held.label}}",
+                            "value": "Held",
                             "type": "active"
                         },
                         {
                             "key": "pushed_2x",
-                            "value": "{{i18n.attributes.button.i18n.value.pushed_2x.label}}",
+                            "value": "Pressed 2 times",
                             "type": "active"
                         },
                         {
                             "key": "pushed_3x",
-                            "value": "{{i18n.attributes.button.i18n.value.pushed_3x.label}}",
+                            "value": "Pressed 3 times",
                             "type": "active"
                         },
                         {
                             "key": "pushed_4x",
-                            "value": "{{i18n.attributes.button.i18n.value.pushed_4x.label}}",
+                            "value": "Pressed 4 times",
                             "type": "active"
                         },
                         {
                             "key": "pushed_5x",
-                            "value": "{{i18n.attributes.button.i18n.value.pushed_5x.label}}",
+                            "value": "Pressed 5 times",
                             "type": "active"
                         },
                         {
                             "key": "pushed_6x",
-                            "value": "{{i18n.attributes.button.i18n.value.pushed_6x.label}}",
+                            "value": "Pressed 6 times",
                             "type": "active"
                         },
                         {
                             "key": "down",
-                            "value": "{{i18n.attributes.button.i18n.value.down.label}}",
+                            "value": "Toggled down",
                             "type": "active"
                         },
                         {
                             "key": "down_2x",
-                            "value": "{{i18n.attributes.button.i18n.value.down_2x.label}}",
+                            "value": "Toggled down 2 times",
                             "type": "active"
                         },
                         {
                             "key": "down_3x",
-                            "value": "{{i18n.attributes.button.i18n.value.down_3x.label}}",
+                            "value": "Toggled down 3 times",
                             "type": "active"
                         },
                         {
                             "key": "down_4x",
-                            "value": "{{i18n.attributes.button.i18n.value.down_4x.label}}",
+                            "value": "Toggled down 4 times",
                             "type": "active"
                         },
                         {
                             "key": "down_5x",
-                            "value": "{{i18n.attributes.button.i18n.value.down_5x.label}}",
+                            "value": "Toggled down 5 times",
                             "type": "active"
                         },
                         {
                             "key": "down_6x",
-                            "value": "{{i18n.attributes.button.i18n.value.down_6x.label}}",
+                            "value": "Toggled down 6 times",
                             "type": "active"
                         },
                         {
                             "key": "down_hold",
-                            "value": "{{i18n.attributes.button.i18n.value.down_hold.label}}",
+                            "value": "Held down",
                             "type": "active"
                         },
                         {
                             "key": "up",
-                            "value": "{{i18n.attributes.button.i18n.value.up.label}}",
+                            "value": "Toggled up",
                             "type": "active"
                         },
                         {
                             "key": "up_2x",
-                            "value": "{{i18n.attributes.button.i18n.value.up_2x.label}}",
+                            "value": "Toggled up 2 times",
                             "type": "active"
                         },
                         {
                             "key": "up_3x",
-                            "value": "{{i18n.attributes.button.i18n.value.up_3x.label}}",
+                            "value": "Toggled up 3 times",
                             "type": "active"
                         },
                         {
                             "key": "up_4x",
-                            "value": "{{i18n.attributes.button.i18n.value.up_4x.label}}",
+                            "value": "Toggled up 4 times",
                             "type": "active"
                         },
                         {
                             "key": "up_5x",
-                            "value": "{{i18n.attributes.button.i18n.value.up_5x.label}}",
+                            "value": "Toggled up 5 times",
                             "type": "active"
                         },
                         {
                             "key": "up_6x",
-                            "value": "{{i18n.attributes.button.i18n.value.up_6x.label}}",
+                            "value": "Toggled up 6 times",
                             "type": "active"
                         },
                         {
                             "key": "up_hold",
-                            "value": "{{i18n.attributes.button.i18n.value.up_hold.label}}",
+                            "value": "Held up",
+                            "type": "active"
+                        },
+                        {
+                            "key": "swipe_up",
+                            "value": "Swipe up",
+                            "type": "active"
+                        },
+                        {
+                            "key": "swipe_down",
+                            "value": "Swipe down",
+                            "type": "active"
+                        },
+                        {
+                            "key": "swipe_left",
+                            "value": "Swipe left",
+                            "type": "active"
+                        },
+                        {
+                            "key": "swipe_right",
+                            "value": "Swipe right",
                             "type": "active"
                         }
                     ],
diff --git a/json/bypassablePresentation.json b/json/bypassablePresentation.json
index 2b839777..f1ea07a4 100755
--- a/json/bypassablePresentation.json
+++ b/json/bypassablePresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.bypassStatus.i18n.value.ready.label}}",
+                        "value": "Ready to arm",
                         "type": "inactive"
                     },
                     {
                         "key": "notReady",
-                        "value": "{{i18n.attributes.bypassStatus.i18n.value.notReady.label}}",
+                        "value": "Not ready to arm",
                         "type": "inactive"
                     },
                     {
                         "key": "bypassed",
-                        "value": "{{i18n.attributes.bypassStatus.i18n.value.bypassed.label}}",
+                        "value": "Bypassed",
                         "type": "active"
                     }
                 ]
@@ -27,24 +27,24 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Bypass status",
             "displayType": "state",
             "state": {
                 "label": "{{bypassStatus.value}}",
                 "alternatives": [
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.bypassStatus.i18n.value.ready.label}}",
+                        "value": "Ready to arm",
                         "type": "inactive"
                     },
                     {
                         "key": "notReady",
-                        "value": "{{i18n.attributes.bypassStatus.i18n.value.notReady.label}}",
+                        "value": "Not ready to arm",
                         "type": "inactive"
                     },
                     {
                         "key": "bypassed",
-                        "value": "{{i18n.attributes.bypassStatus.i18n.value.bypassed.label}}",
+                        "value": "Bypassed",
                         "type": "active"
                     }
                 ]
@@ -54,23 +54,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Bypass status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "ready",
-                            "value": "{{i18n.attributes.bypassStatus.i18n.value.ready.label}}",
+                            "value": "Ready to arm",
                             "type": "inactive"
                         },
                         {
                             "key": "notReady",
-                            "value": "{{i18n.attributes.bypassStatus.i18n.value.notReady.label}}",
+                            "value": "Not ready to arm",
                             "type": "inactive"
                         },
                         {
                             "key": "bypassed",
-                            "value": "{{i18n.attributes.bypassStatus.i18n.value.bypassed.label}}",
+                            "value": "Bypassed",
                             "type": "active"
                         }
                     ],
diff --git a/json/cameraEvent.i18n.en.json b/json/cameraEvent.i18n.en.json
index 47deef78..ac921855 100755
--- a/json/cameraEvent.i18n.en.json
+++ b/json/cameraEvent.i18n.en.json
@@ -43,7 +43,7 @@
                         "label": "Person detected"
                     },
                     "packageDisappear": {
-                        "label": "Parcel out of view"
+                        "label": "Parcel gone"
                     },
                     "personDisappear": {
                         "label": "Person out of view"
diff --git a/json/cameraEvent.i18n.fr.json b/json/cameraEvent.i18n.fr.json
index dba969c3..1737cb99 100755
--- a/json/cameraEvent.i18n.fr.json
+++ b/json/cameraEvent.i18n.fr.json
@@ -43,7 +43,7 @@
                         "label": "Personne détectée"
                     },
                     "packageDisappear": {
-                        "label": "Colis hors de vue"
+                        "label": "Colis enlevé"
                     },
                     "personDisappear": {
                         "label": "Personne hors de vue"
diff --git a/json/cameraEventPresentation.json b/json/cameraEventPresentation.json
index 612a3391..de2948db 100755
--- a/json/cameraEventPresentation.json
+++ b/json/cameraEventPresentation.json
@@ -6,82 +6,82 @@
                 "alternatives": [
                     {
                         "key": "package",
-                        "value": "{{i18n.attributes.event.i18n.value.package.label}}",
+                        "value": "Parcel detected",
                         "type": "active"
                     },
                     {
                         "key": "packageDisappear",
-                        "value": "{{i18n.attributes.event.i18n.value.packageDisappear.label}}",
+                        "value": "Parcel gone",
                         "type": "active"
                     },
                     {
                         "key": "person",
-                        "value": "{{i18n.attributes.event.i18n.value.person.label}}",
+                        "value": "Person detected",
                         "type": "active"
                     },
                     {
                         "key": "personDisappear",
-                        "value": "{{i18n.attributes.event.i18n.value.personDisappear.label}}",
+                        "value": "Person out of view",
                         "type": "active"
                     },
                     {
                         "key": "vehicle",
-                        "value": "{{i18n.attributes.event.i18n.value.vehicle.label}}",
+                        "value": "Vehicle detected",
                         "type": "active"
                     },
                     {
                         "key": "vehicleDisappear",
-                        "value": "{{i18n.attributes.event.i18n.value.vehicleDisappear.label}}",
+                        "value": "Vehicle out of view",
                         "type": "active"
                     },
                     {
                         "key": "pet",
-                        "value": "{{i18n.attributes.event.i18n.value.pet.label}}",
+                        "value": "Pet detected",
                         "type": "active"
                     },
                     {
                         "key": "petDisappear",
-                        "value": "{{i18n.attributes.event.i18n.value.petDisappear.label}}",
+                        "value": "Pet out of view",
                         "type": "active"
                     },
                     {
                         "key": "loitering",
-                        "value": "{{i18n.attributes.event.i18n.value.loitering.label}}",
+                        "value": "Loitering detected",
                         "type": "active"
                     },
                     {
                         "key": "loiteringDisappear",
-                        "value": "{{i18n.attributes.event.i18n.value.loiteringDisappear.label}}",
+                        "value": "Loitering out of view",
                         "type": "active"
                     },
                     {
                         "key": "gestureV",
-                        "value": "{{i18n.attributes.event.i18n.value.gestureV.label}}",
+                        "value": "V gesture detected",
                         "type": "active"
                     },
                     {
                         "key": "gestureFour",
-                        "value": "{{i18n.attributes.event.i18n.value.gestureFour.label}}",
+                        "value": "Four gesture detected",
                         "type": "active"
                     },
                     {
                         "key": "gestureFive",
-                        "value": "{{i18n.attributes.event.i18n.value.gestureFive.label}}",
+                        "value": "High five gesture detected",
                         "type": "active"
                     },
                     {
                         "key": "gestureGun",
-                        "value": "{{i18n.attributes.event.i18n.value.gestureGun.label}}",
+                        "value": "Finger gun gesture detected",
                         "type": "active"
                     },
                     {
                         "key": "gestureOk",
-                        "value": "{{i18n.attributes.event.i18n.value.gestureOk.label}}",
+                        "value": "OK gesture detected",
                         "type": "active"
                     },
                     {
                         "key": "lensObstruction",
-                        "value": "{{i18n.attributes.event.i18n.value.lensObstruction.label}}",
+                        "value": "Lens obstruction",
                         "type": "active"
                     }
                 ]
@@ -92,89 +92,89 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Camera events",
             "displayType": "state",
             "state": {
                 "label": "{{event.value}}",
                 "alternatives": [
                     {
                         "key": "package",
-                        "value": "{{i18n.attributes.event.i18n.value.package.label}}",
+                        "value": "Parcel detected",
                         "type": "active"
                     },
                     {
                         "key": "packageDisappear",
-                        "value": "{{i18n.attributes.event.i18n.value.packageDisappear.label}}",
+                        "value": "Parcel gone",
                         "type": "active"
                     },
                     {
                         "key": "person",
-                        "value": "{{i18n.attributes.event.i18n.value.person.label}}",
+                        "value": "Person detected",
                         "type": "active"
                     },
                     {
                         "key": "personDisappear",
-                        "value": "{{i18n.attributes.event.i18n.value.personDisappear.label}}",
+                        "value": "Person out of view",
                         "type": "active"
                     },
                     {
                         "key": "vehicle",
-                        "value": "{{i18n.attributes.event.i18n.value.vehicle.label}}",
+                        "value": "Vehicle detected",
                         "type": "active"
                     },
                     {
                         "key": "vehicleDisappear",
-                        "value": "{{i18n.attributes.event.i18n.value.vehicleDisappear.label}}",
+                        "value": "Vehicle out of view",
                         "type": "active"
                     },
                     {
                         "key": "pet",
-                        "value": "{{i18n.attributes.event.i18n.value.pet.label}}",
+                        "value": "Pet detected",
                         "type": "active"
                     },
                     {
                         "key": "petDisappear",
-                        "value": "{{i18n.attributes.event.i18n.value.petDisappear.label}}",
+                        "value": "Pet out of view",
                         "type": "active"
                     },
                     {
                         "key": "loitering",
-                        "value": "{{i18n.attributes.event.i18n.value.loitering.label}}",
+                        "value": "Loitering detected",
                         "type": "active"
                     },
                     {
                         "key": "loiteringDisappear",
-                        "value": "{{i18n.attributes.event.i18n.value.loiteringDisappear.label}}",
+                        "value": "Loitering out of view",
                         "type": "active"
                     },
                     {
                         "key": "gestureV",
-                        "value": "{{i18n.attributes.event.i18n.value.gestureV.label}}",
+                        "value": "V gesture detected",
                         "type": "active"
                     },
                     {
                         "key": "gestureFour",
-                        "value": "{{i18n.attributes.event.i18n.value.gestureFour.label}}",
+                        "value": "Four gesture detected",
                         "type": "active"
                     },
                     {
                         "key": "gestureFive",
-                        "value": "{{i18n.attributes.event.i18n.value.gestureFive.label}}",
+                        "value": "High five gesture detected",
                         "type": "active"
                     },
                     {
                         "key": "gestureGun",
-                        "value": "{{i18n.attributes.event.i18n.value.gestureGun.label}}",
+                        "value": "Finger gun gesture detected",
                         "type": "active"
                     },
                     {
                         "key": "gestureOk",
-                        "value": "{{i18n.attributes.event.i18n.value.gestureOk.label}}",
+                        "value": "OK gesture detected",
                         "type": "active"
                     },
                     {
                         "key": "lensObstruction",
-                        "value": "{{i18n.attributes.event.i18n.value.lensObstruction.label}}",
+                        "value": "Lens obstruction",
                         "type": "active"
                     }
                 ]
@@ -184,88 +184,88 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Camera events",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "package",
-                            "value": "{{i18n.attributes.event.i18n.value.package.label}}",
+                            "value": "Parcel detected",
                             "type": "active"
                         },
                         {
                             "key": "packageDisappear",
-                            "value": "{{i18n.attributes.event.i18n.value.packageDisappear.label}}",
+                            "value": "Parcel gone",
                             "type": "active"
                         },
                         {
                             "key": "person",
-                            "value": "{{i18n.attributes.event.i18n.value.person.label}}",
+                            "value": "Person detected",
                             "type": "active"
                         },
                         {
                             "key": "personDisappear",
-                            "value": "{{i18n.attributes.event.i18n.value.personDisappear.label}}",
+                            "value": "Person out of view",
                             "type": "active"
                         },
                         {
                             "key": "vehicle",
-                            "value": "{{i18n.attributes.event.i18n.value.vehicle.label}}",
+                            "value": "Vehicle detected",
                             "type": "active"
                         },
                         {
                             "key": "vehicleDisappear",
-                            "value": "{{i18n.attributes.event.i18n.value.vehicleDisappear.label}}",
+                            "value": "Vehicle out of view",
                             "type": "active"
                         },
                         {
                             "key": "pet",
-                            "value": "{{i18n.attributes.event.i18n.value.pet.label}}",
+                            "value": "Pet detected",
                             "type": "active"
                         },
                         {
                             "key": "petDisappear",
-                            "value": "{{i18n.attributes.event.i18n.value.petDisappear.label}}",
+                            "value": "Pet out of view",
                             "type": "active"
                         },
                         {
                             "key": "loitering",
-                            "value": "{{i18n.attributes.event.i18n.value.loitering.label}}",
+                            "value": "Loitering detected",
                             "type": "active"
                         },
                         {
                             "key": "loiteringDisappear",
-                            "value": "{{i18n.attributes.event.i18n.value.loiteringDisappear.label}}",
+                            "value": "Loitering out of view",
                             "type": "active"
                         },
                         {
                             "key": "gestureV",
-                            "value": "{{i18n.attributes.event.i18n.value.gestureV.label}}",
+                            "value": "V gesture detected",
                             "type": "active"
                         },
                         {
                             "key": "gestureFour",
-                            "value": "{{i18n.attributes.event.i18n.value.gestureFour.label}}",
+                            "value": "Four gesture detected",
                             "type": "active"
                         },
                         {
                             "key": "gestureFive",
-                            "value": "{{i18n.attributes.event.i18n.value.gestureFive.label}}",
+                            "value": "High five gesture detected",
                             "type": "active"
                         },
                         {
                             "key": "gestureGun",
-                            "value": "{{i18n.attributes.event.i18n.value.gestureGun.label}}",
+                            "value": "Finger gun gesture detected",
                             "type": "active"
                         },
                         {
                             "key": "gestureOk",
-                            "value": "{{i18n.attributes.event.i18n.value.gestureOk.label}}",
+                            "value": "OK gesture detected",
                             "type": "active"
                         },
                         {
                             "key": "lensObstruction",
-                            "value": "{{i18n.attributes.event.i18n.value.lensObstruction.label}}",
+                            "value": "Lens obstruction",
                             "type": "active"
                         }
                     ],
diff --git a/json/cameraPresetPresentation.json b/json/cameraPresetPresentation.json
index 7b9ef696..b16df676 100755
--- a/json/cameraPresetPresentation.json
+++ b/json/cameraPresetPresentation.json
@@ -3,7 +3,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Turn camera to waypoint",
                 "displayType": "textField",
                 "textField": {
                     "command": "execute"
diff --git a/json/cameraPrivacyMode.i18n.en.json b/json/cameraPrivacyMode.i18n.en.json
new file mode 100644
index 00000000..e63e5ef1
--- /dev/null
+++ b/json/cameraPrivacyMode.i18n.en.json
@@ -0,0 +1,68 @@
+{
+    "tag": "en",
+    "label": "Camera Privacy Mode",
+    "attributes": {
+        "softLivestreamPrivacyMode": {
+            "label": "softLivestreamPrivacyMode",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "softRecordingPrivacyMode": {
+            "label": "softRecordingPrivacyMode",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "supportedCommands": {
+            "label": "supportedCommands",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "hardPrivacyMode": {
+            "label": "hardPrivacyMode",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setSoftLivestreamPrivacyMode": {
+            "label": "setSoftLivestreamPrivacyMode",
+            "arguments": {}
+        },
+        "setSoftRecordingPrivacyMode": {
+            "label": "setSoftRecordingPrivacyMode",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/cameraPrivacyMode.i18n.fr.json b/json/cameraPrivacyMode.i18n.fr.json
new file mode 100644
index 00000000..e63e5ef1
--- /dev/null
+++ b/json/cameraPrivacyMode.i18n.fr.json
@@ -0,0 +1,68 @@
+{
+    "tag": "en",
+    "label": "Camera Privacy Mode",
+    "attributes": {
+        "softLivestreamPrivacyMode": {
+            "label": "softLivestreamPrivacyMode",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "softRecordingPrivacyMode": {
+            "label": "softRecordingPrivacyMode",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "supportedCommands": {
+            "label": "supportedCommands",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "hardPrivacyMode": {
+            "label": "hardPrivacyMode",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setSoftLivestreamPrivacyMode": {
+            "label": "setSoftLivestreamPrivacyMode",
+            "arguments": {}
+        },
+        "setSoftRecordingPrivacyMode": {
+            "label": "setSoftRecordingPrivacyMode",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/cameraPrivacyMode.json b/json/cameraPrivacyMode.json
new file mode 100644
index 00000000..ca4e89b2
--- /dev/null
+++ b/json/cameraPrivacyMode.json
@@ -0,0 +1,154 @@
+{
+    "id": "cameraPrivacyMode",
+    "version": 1,
+    "status": "proposed",
+    "name": "Camera Privacy Mode",
+    "ephemeral": false,
+    "attributes": {
+        "softLivestreamPrivacyMode": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setSoftLivestreamPrivacyMode",
+            "enumCommands": []
+        },
+        "softRecordingPrivacyMode": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setSoftRecordingPrivacyMode",
+            "enumCommands": []
+        },
+        "supportedCommands": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "setSoftRecordingPrivacyMode",
+                                "setSoftLivestreamPrivacyMode"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "hardPrivacyMode": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedAttributes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "softRecordingPrivacyMode",
+                                "softLivestreamPrivacyMode",
+                                "hardPrivacyMode"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "setSoftLivestreamPrivacyMode": {
+            "name": "setSoftLivestreamPrivacyMode",
+            "arguments": [
+                {
+                    "name": "state",
+                    "optional": false,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "setSoftRecordingPrivacyMode": {
+            "name": "setSoftRecordingPrivacyMode",
+            "arguments": [
+                {
+                    "name": "state",
+                    "optional": false,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/cameraViewportSettings.i18n.en.json b/json/cameraViewportSettings.i18n.en.json
new file mode 100644
index 00000000..5ddc2055
--- /dev/null
+++ b/json/cameraViewportSettings.i18n.en.json
@@ -0,0 +1,27 @@
+{
+    "tag": "en",
+    "label": "Camera Viewport Settings",
+    "attributes": {
+        "defaultViewport": {
+            "label": "defaultViewport",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "minViewportResolution": {
+            "label": "minViewportResolution",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "videoSensorParameters": {
+            "label": "videoSensorParameters",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setDefaultViewport": {
+            "label": "setDefaultViewport",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/cameraViewportSettings.i18n.fr.json b/json/cameraViewportSettings.i18n.fr.json
new file mode 100644
index 00000000..5ddc2055
--- /dev/null
+++ b/json/cameraViewportSettings.i18n.fr.json
@@ -0,0 +1,27 @@
+{
+    "tag": "en",
+    "label": "Camera Viewport Settings",
+    "attributes": {
+        "defaultViewport": {
+            "label": "defaultViewport",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "minViewportResolution": {
+            "label": "minViewportResolution",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "videoSensorParameters": {
+            "label": "videoSensorParameters",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setDefaultViewport": {
+            "label": "setDefaultViewport",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/cameraViewportSettings.json b/json/cameraViewportSettings.json
new file mode 100644
index 00000000..9d796cc4
--- /dev/null
+++ b/json/cameraViewportSettings.json
@@ -0,0 +1,188 @@
+{
+    "id": "cameraViewportSettings",
+    "version": 1,
+    "status": "proposed",
+    "name": "Camera Viewport Settings",
+    "ephemeral": false,
+    "attributes": {
+        "defaultViewport": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "Viewport",
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "upperLeftVertex": {
+                                "title": "CartesianCoordinate",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "x": {
+                                        "type": "integer"
+                                    },
+                                    "y": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "x",
+                                    "y"
+                                ]
+                            },
+                            "lowerRightVertex": {
+                                "title": "CartesianCoordinate",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "x": {
+                                        "type": "integer"
+                                    },
+                                    "y": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "x",
+                                    "y"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "upperLeftVertex",
+                            "lowerRightVertex"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setDefaultViewport",
+            "enumCommands": []
+        },
+        "minViewportResolution": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "VideoResolution",
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "width": {
+                                "type": "integer"
+                            },
+                            "height": {
+                                "type": "integer"
+                            },
+                            "fps": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "width",
+                            "height"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "videoSensorParameters": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "width": {
+                                "type": "integer"
+                            },
+                            "height": {
+                                "type": "integer"
+                            },
+                            "maxFPS": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "width",
+                            "height",
+                            "maxFPS"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "setDefaultViewport": {
+            "name": "setDefaultViewport",
+            "arguments": [
+                {
+                    "name": "viewport",
+                    "optional": false,
+                    "schema": {
+                        "title": "Viewport",
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "upperLeftVertex": {
+                                "title": "CartesianCoordinate",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "x": {
+                                        "type": "integer"
+                                    },
+                                    "y": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "x",
+                                    "y"
+                                ]
+                            },
+                            "lowerRightVertex": {
+                                "title": "CartesianCoordinate",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "x": {
+                                        "type": "integer"
+                                    },
+                                    "y": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "x",
+                                    "y"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "upperLeftVertex",
+                            "lowerRightVertex"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/carbonDioxideHealthConcernPresentation.json b/json/carbonDioxideHealthConcernPresentation.json
index 3d14d428..0b38cbde 100755
--- a/json/carbonDioxideHealthConcernPresentation.json
+++ b/json/carbonDioxideHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Carbon dioxide level",
             "displayType": "state",
             "state": {
                 "label": "{{carbonDioxideHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Carbon dioxide level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.carbonDioxideHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/carbonDioxideMeasurementPresentation.json b/json/carbonDioxideMeasurementPresentation.json
index 2858ab0b..c2b3fbdd 100755
--- a/json/carbonDioxideMeasurementPresentation.json
+++ b/json/carbonDioxideMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Carbon dioxide concentration",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Carbon dioxide concentration",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "carbonDioxide.value",
diff --git a/json/carbonMonoxideDetectorPresentation.json b/json/carbonMonoxideDetectorPresentation.json
index 560b42e8..7e68d73d 100755
--- a/json/carbonMonoxideDetectorPresentation.json
+++ b/json/carbonMonoxideDetectorPresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.carbonMonoxide.i18n.value.clear.label}}",
+                        "value": "Clear",
                         "type": "inactive"
                     },
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.carbonMonoxide.i18n.value.detected.label}}",
+                        "value": "Carbon monoxide detected",
                         "type": "active"
                     },
                     {
                         "key": "tested",
-                        "value": "{{i18n.attributes.carbonMonoxide.i18n.value.tested.label}}",
+                        "value": "Device tested",
                         "type": "inactive"
                     }
                 ]
@@ -27,24 +27,24 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Carbon monoxide detector",
             "displayType": "state",
             "state": {
                 "label": "{{carbonMonoxide.value}}",
                 "alternatives": [
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.carbonMonoxide.i18n.value.clear.label}}",
+                        "value": "Clear",
                         "type": "inactive"
                     },
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.carbonMonoxide.i18n.value.detected.label}}",
+                        "value": "Carbon monoxide detected",
                         "type": "active"
                     },
                     {
                         "key": "tested",
-                        "value": "{{i18n.attributes.carbonMonoxide.i18n.value.tested.label}}",
+                        "value": "Device tested",
                         "type": "inactive"
                     }
                 ]
@@ -54,23 +54,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Carbon monoxide detector",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "clear",
-                            "value": "{{i18n.attributes.carbonMonoxide.i18n.value.clear.label}}",
+                            "value": "Clear",
                             "type": "inactive"
                         },
                         {
                             "key": "detected",
-                            "value": "{{i18n.attributes.carbonMonoxide.i18n.value.detected.label}}",
+                            "value": "Carbon monoxide detected",
                             "type": "active"
                         },
                         {
                             "key": "tested",
-                            "value": "{{i18n.attributes.carbonMonoxide.i18n.value.tested.label}}",
+                            "value": "Device tested",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/carbonMonoxideHealthConcernPresentation.json b/json/carbonMonoxideHealthConcernPresentation.json
index e89d4851..af3e70e4 100755
--- a/json/carbonMonoxideHealthConcernPresentation.json
+++ b/json/carbonMonoxideHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Carbon monoxide level",
             "displayType": "state",
             "state": {
                 "label": "{{carbonMonoxideHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Carbon monoxide level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.carbonMonoxideHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/carbonMonoxideMeasurementPresentation.json b/json/carbonMonoxideMeasurementPresentation.json
index 567667b7..46823870 100755
--- a/json/carbonMonoxideMeasurementPresentation.json
+++ b/json/carbonMonoxideMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Carbon monoxide concentration",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Carbon monoxide concentration",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "carbonMonoxideLevel.value",
diff --git a/json/chargePointStatePresentation.json b/json/chargePointStatePresentation.json
index be7e6ad3..0798f6f5 100755
--- a/json/chargePointStatePresentation.json
+++ b/json/chargePointStatePresentation.json
@@ -6,52 +6,52 @@
                 "alternatives": [
                     {
                         "key": "available",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.available.label}}",
+                        "value": "Available",
                         "type": "active"
                     },
                     {
                         "key": "preparing",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.preparing.label}}",
+                        "value": "Preparing",
                         "type": "active"
                     },
                     {
                         "key": "charging",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.charging.label}}",
+                        "value": "Charging",
                         "type": "active"
                     },
                     {
                         "key": "discharging",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.discharging.label}}",
+                        "value": "Discharging",
                         "type": "active"
                     },
                     {
                         "key": "suspendedEVSE",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.suspendedEVSE.label}}",
+                        "value": "Suspended EVSE",
                         "type": "active"
                     },
                     {
                         "key": "suspendedEV",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.suspendedEV.label}}",
+                        "value": "Suspended EV",
                         "type": "active"
                     },
                     {
                         "key": "finishing",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.finishing.label}}",
+                        "value": "Finished",
                         "type": "active"
                     },
                     {
                         "key": "reserved",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.reserved.label}}",
+                        "value": "Scheduled",
                         "type": "active"
                     },
                     {
                         "key": "unavailable",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.unavailable.label}}",
+                        "value": "Unavailable",
                         "type": "active"
                     },
                     {
                         "key": "faulted",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.faulted.label}}",
+                        "value": "Faulted",
                         "type": "active"
                     }
                 ]
@@ -62,59 +62,59 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Charging point state",
             "displayType": "state",
             "state": {
                 "label": "{{chargePointState.value}}",
                 "alternatives": [
                     {
                         "key": "available",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.available.label}}",
+                        "value": "Available",
                         "type": "active"
                     },
                     {
                         "key": "preparing",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.preparing.label}}",
+                        "value": "Preparing",
                         "type": "active"
                     },
                     {
                         "key": "charging",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.charging.label}}",
+                        "value": "Charging",
                         "type": "active"
                     },
                     {
                         "key": "discharging",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.discharging.label}}",
+                        "value": "Discharging",
                         "type": "active"
                     },
                     {
                         "key": "suspendedEVSE",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.suspendedEVSE.label}}",
+                        "value": "Suspended EVSE",
                         "type": "active"
                     },
                     {
                         "key": "suspendedEV",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.suspendedEV.label}}",
+                        "value": "Suspended EV",
                         "type": "active"
                     },
                     {
                         "key": "finishing",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.finishing.label}}",
+                        "value": "Finished",
                         "type": "active"
                     },
                     {
                         "key": "reserved",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.reserved.label}}",
+                        "value": "Scheduled",
                         "type": "active"
                     },
                     {
                         "key": "unavailable",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.unavailable.label}}",
+                        "value": "Unavailable",
                         "type": "active"
                     },
                     {
                         "key": "faulted",
-                        "value": "{{i18n.attributes.chargePointState.i18n.value.faulted.label}}",
+                        "value": "Faulted",
                         "type": "active"
                     }
                 ]
@@ -124,58 +124,58 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Charging point state",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "available",
-                            "value": "{{i18n.attributes.chargePointState.i18n.value.available.label}}",
+                            "value": "Available",
                             "type": "active"
                         },
                         {
                             "key": "preparing",
-                            "value": "{{i18n.attributes.chargePointState.i18n.value.preparing.label}}",
+                            "value": "Preparing",
                             "type": "active"
                         },
                         {
                             "key": "charging",
-                            "value": "{{i18n.attributes.chargePointState.i18n.value.charging.label}}",
+                            "value": "Charging",
                             "type": "active"
                         },
                         {
                             "key": "discharging",
-                            "value": "{{i18n.attributes.chargePointState.i18n.value.discharging.label}}",
+                            "value": "Discharging",
                             "type": "active"
                         },
                         {
                             "key": "suspendedEVSE",
-                            "value": "{{i18n.attributes.chargePointState.i18n.value.suspendedEVSE.label}}",
+                            "value": "Suspended EVSE",
                             "type": "active"
                         },
                         {
                             "key": "suspendedEV",
-                            "value": "{{i18n.attributes.chargePointState.i18n.value.suspendedEV.label}}",
+                            "value": "Suspended EV",
                             "type": "active"
                         },
                         {
                             "key": "finishing",
-                            "value": "{{i18n.attributes.chargePointState.i18n.value.finishing.label}}",
+                            "value": "Finished",
                             "type": "active"
                         },
                         {
                             "key": "reserved",
-                            "value": "{{i18n.attributes.chargePointState.i18n.value.reserved.label}}",
+                            "value": "Scheduled",
                             "type": "active"
                         },
                         {
                             "key": "unavailable",
-                            "value": "{{i18n.attributes.chargePointState.i18n.value.unavailable.label}}",
+                            "value": "Unavailable",
                             "type": "active"
                         },
                         {
                             "key": "faulted",
-                            "value": "{{i18n.attributes.chargePointState.i18n.value.faulted.label}}",
+                            "value": "Faulted",
                             "type": "active"
                         }
                     ],
diff --git a/json/chargingState.i18n.fr.json b/json/chargingState.i18n.fr.json
index 6a48c707..f44d7665 100644
--- a/json/chargingState.i18n.fr.json
+++ b/json/chargingState.i18n.fr.json
@@ -19,7 +19,7 @@
                         "label": "Pas prêt"
                     },
                     "other": {
-                        "label": "Other"
+                        "label": "Autre"
                     },
                     "discharging": {
                         "label": "Déchargement"
diff --git a/json/chargingStatePresentation.json b/json/chargingStatePresentation.json
index d4866c5c..5974c8f1 100644
--- a/json/chargingStatePresentation.json
+++ b/json/chargingStatePresentation.json
@@ -6,32 +6,32 @@
                 "alternatives": [
                     {
                         "key": "charging",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.charging.label}}",
+                        "value": "Charging",
                         "type": "active"
                     },
                     {
                         "key": "fullyCharged",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.fullyCharged.label}}",
+                        "value": "Fully charged",
                         "type": "active"
                     },
                     {
                         "key": "discharging",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.discharging.label}}",
+                        "value": "Discharging",
                         "type": "inactive"
                     },
                     {
                         "key": "stopped",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.stopped.label}}",
+                        "value": "Not ready",
                         "type": "inactive"
                     },
                     {
                         "key": "error",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.error.label}}",
+                        "value": "Unavailable",
                         "type": "inactive"
                     },
                     {
                         "key": "other",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.other.label}}",
+                        "value": "Other",
                         "type": "inactive"
                     }
                 ]
@@ -42,39 +42,39 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Charging status",
             "displayType": "state",
             "state": {
                 "label": "{{chargingState.value}}",
                 "alternatives": [
                     {
                         "key": "charging",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.charging.label}}",
+                        "value": "Charging",
                         "type": "active"
                     },
                     {
                         "key": "fullyCharged",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.fullyCharged.label}}",
+                        "value": "Fully charged",
                         "type": "active"
                     },
                     {
                         "key": "discharging",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.discharging.label}}",
+                        "value": "Discharging",
                         "type": "inactive"
                     },
                     {
                         "key": "stopped",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.stopped.label}}",
+                        "value": "Not ready",
                         "type": "inactive"
                     },
                     {
                         "key": "error",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.error.label}}",
+                        "value": "Unavailable",
                         "type": "inactive"
                     },
                     {
                         "key": "other",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.other.label}}",
+                        "value": "Other",
                         "type": "inactive"
                     }
                 ]
@@ -84,38 +84,38 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Charging status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "charging",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.charging.label}}",
+                            "value": "Charging",
                             "type": "active"
                         },
                         {
                             "key": "fullyCharged",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.fullyCharged.label}}",
+                            "value": "Fully charged",
                             "type": "active"
                         },
                         {
                             "key": "discharging",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.discharging.label}}",
+                            "value": "Discharging",
                             "type": "inactive"
                         },
                         {
                             "key": "stopped",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.stopped.label}}",
+                            "value": "Not ready",
                             "type": "inactive"
                         },
                         {
                             "key": "error",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.error.label}}",
+                            "value": "Unavailable",
                             "type": "inactive"
                         },
                         {
                             "key": "other",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.other.label}}",
+                            "value": "Other",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/chimePresentation.json b/json/chimePresentation.json
index 35f71070..09305329 100755
--- a/json/chimePresentation.json
+++ b/json/chimePresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.chime.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     },
                     {
                         "key": "chime",
-                        "value": "{{i18n.label}}",
+                        "value": "Chime",
                         "type": "active"
                     }
                 ]
@@ -37,7 +37,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Chime",
             "displayType": "switch",
             "switch": {
                 "command": {
@@ -52,12 +52,12 @@
                     "alternatives": [
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.chime.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "chime",
-                            "value": "{{i18n.label}}",
+                            "value": "Chime",
                             "type": "active"
                         }
                     ]
@@ -68,18 +68,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Chime",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.chime.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "chime",
-                            "value": "{{i18n.label}}",
+                            "value": "Chime",
                             "type": "active"
                         }
                     ],
@@ -90,18 +90,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Chime",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "chime",
-                            "value": "{{i18n.label}}",
+                            "value": "Chime",
                             "type": "active"
                         }
                     ]
diff --git a/json/coffeeMakerManualOperation.i18n.en.json b/json/coffeeMakerManualOperation.i18n.en.json
new file mode 100644
index 00000000..2f35bc01
--- /dev/null
+++ b/json/coffeeMakerManualOperation.i18n.en.json
@@ -0,0 +1,42 @@
+{
+    "tag": "en",
+    "label": "Coffee Maker Manual Operation",
+    "attributes": {
+        "temperatureRange": {
+            "label": "temperatureRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "supportedArgument": {
+            "label": "supportedArgument",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "waterAmountRange": {
+            "label": "waterAmountRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "coffeeAmountRange": {
+            "label": "coffeeAmountRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "coffeeStrengthRange": {
+            "label": "coffeeStrengthRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "milkAmountRange": {
+            "label": "milkAmountRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "makeCoffee": {
+            "label": "makeCoffee",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/coffeeMakerManualOperation.i18n.fr.json b/json/coffeeMakerManualOperation.i18n.fr.json
new file mode 100644
index 00000000..2f35bc01
--- /dev/null
+++ b/json/coffeeMakerManualOperation.i18n.fr.json
@@ -0,0 +1,42 @@
+{
+    "tag": "en",
+    "label": "Coffee Maker Manual Operation",
+    "attributes": {
+        "temperatureRange": {
+            "label": "temperatureRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "supportedArgument": {
+            "label": "supportedArgument",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "waterAmountRange": {
+            "label": "waterAmountRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "coffeeAmountRange": {
+            "label": "coffeeAmountRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "coffeeStrengthRange": {
+            "label": "coffeeStrengthRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "milkAmountRange": {
+            "label": "milkAmountRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "makeCoffee": {
+            "label": "makeCoffee",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/coffeeMakerManualOperation.json b/json/coffeeMakerManualOperation.json
new file mode 100644
index 00000000..47ba2b0d
--- /dev/null
+++ b/json/coffeeMakerManualOperation.json
@@ -0,0 +1,279 @@
+{
+    "id": "coffeeMakerManualOperation",
+    "version": 1,
+    "status": "proposed",
+    "name": "Coffee Maker Manual Operation",
+    "ephemeral": false,
+    "attributes": {
+        "temperatureRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "title": "TemperatureValue",
+                                "type": "number",
+                                "minimum": -460,
+                                "maximum": 10000
+                            },
+                            "maximum": {
+                                "title": "TemperatureValue",
+                                "type": "number",
+                                "minimum": -460,
+                                "maximum": 10000
+                            },
+                            "step": {
+                                "title": "TemperatureValue",
+                                "type": "number",
+                                "minimum": -460,
+                                "maximum": 10000
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "F",
+                            "C"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedArgument": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "CoffeeMakerManualSetting",
+                            "type": "string",
+                            "enum": [
+                                "coffeeStrength",
+                                "coffeeAmount",
+                                "waterAmount",
+                                "milkAmount",
+                                "temperature"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "waterAmountRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "step": {
+                                "type": "integer",
+                                "minimum": 1
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "ml",
+                            "oz"
+                        ],
+                        "default": "ml"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "coffeeAmountRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "step": {
+                                "type": "integer",
+                                "minimum": 1
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "ml",
+                            "oz"
+                        ],
+                        "default": "ml"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "coffeeStrengthRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": 1,
+                                "maximum": 5
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": 1,
+                                "maximum": 5
+                            },
+                            "step": {
+                                "type": "integer",
+                                "minimum": 1,
+                                "maximum": 5
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "milkAmountRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "step": {
+                                "type": "integer",
+                                "minimum": 1
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "ml",
+                            "oz"
+                        ],
+                        "default": "ml"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "makeCoffee": {
+            "name": "makeCoffee",
+            "arguments": [
+                {
+                    "name": "beverageSetting",
+                    "optional": false,
+                    "schema": {
+                        "title": "CoffeeMakerManualSettingArgument",
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "coffeeStrength": {
+                                "type": "number"
+                            },
+                            "coffeeAmount": {
+                                "type": "number"
+                            },
+                            "waterAmount": {
+                                "type": "number"
+                            },
+                            "milkAmount": {
+                                "type": "number"
+                            },
+                            "temperature": {
+                                "type": "number"
+                            }
+                        }
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/coffeeMakerOperation.i18n.en.json b/json/coffeeMakerOperation.i18n.en.json
index c079d2d5..c51eb0f3 100644
--- a/json/coffeeMakerOperation.i18n.en.json
+++ b/json/coffeeMakerOperation.i18n.en.json
@@ -1,62 +1,350 @@
 {
     "tag": "en",
-    "label": "Coffee Maker Operation",
+    "label": "Status",
+    "description": "Allows for the control of the coffee maker.",
     "attributes": {
+        "temperatureRange": {
+            "label": "Temperature range",
+            "description": "``{\"minimum\":\"0..∞\", \"maximum\":\"0..∞\", \"step\":\"1..∞\"}``",
+            "displayTemplate": "{{device.label}} {{attribute}} is between {{minimum}} and {{maximum}}",
+            "i18n": {}
+        },
+        "supportedArgument": {
+            "label": "Arguments",
+            "description": "Arguments supported by the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {}
+            }
+        },
         "errorState": {
-            "label": "errorState",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "Error",
+            "description": "Status supported by the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "pipelineBlockage": {
+                        "label": "Pipeline blocked"
+                    },
+                    "grindingSystemAbnormality": {
+                        "label": "Check grinding system"
+                    },
+                    "coffeeBeansRunOut": {
+                        "label": "Out of coffee beans"
+                    },
+                    "wasteWaterTrayFull": {
+                        "label": "Water tray full"
+                    },
+                    "coffeeGroundsTankFull": {
+                        "label": "Coffee grounds tank full"
+                    },
+                    "wasteWaterTrayError": {
+                        "label": "Check water tray"
+                    },
+                    "ntcAbnormality": {
+                        "label": "Check temperature sensor"
+                    },
+                    "brewingBoilerError": {
+                        "label": "Check brewing boiler"
+                    },
+                    "abnormalCommunication": {
+                        "label": "Connection issue"
+                    },
+                    "transmissionSystemAbnormality": {
+                        "label": "Signal issue"
+                    },
+                    "waterTankShortOfWater": {
+                        "label": "Not enough water in tank"
+                    },
+                    "coffeeSpoutCoverError": {
+                        "label": "Check coffee spout cover"
+                    },
+                    "coffeeGroundsTankError": {
+                        "label": "Check coffee grounds tank"
+                    },
+                    "valveFaulty": {
+                        "label": "Check valve"
+                    },
+                    "brewingUnitError": {
+                        "label": "Check brewing unit"
+                    },
+                    "temperatureIsTooLow": {
+                        "label": "Temperature is too low"
+                    },
+                    "noError": {
+                        "label": "No error"
+                    },
+                    "temperatureIsTooHigh": {
+                        "label": "Temperature is too high"
+                    },
+                    "brewingDoorOpen": {
+                        "label": "Brewing door open"
+                    },
+                    "boilerDisconnection": {
+                        "label": "Coffee boiler disconnected"
+                    }
+                }
+            }
+        },
+        "waterAmountRange": {
+            "label": "Water amount range",
+            "description": "``{\"minimum\":\"0..∞\", \"maximum\":\"0..∞\", \"step\":\"1..∞\"}``",
+            "displayTemplate": "{{device.label}} {{attribute}} is between {{minimum}} and {{maximum}}",
             "i18n": {}
         },
         "coffeeMakerOperationStatus": {
-            "label": "coffeeMakerOperationStatus",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Status",
+            "description": "Current state of the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {
                 "value": {
                     "making": {
-                        "label": "making"
+                        "label": "Brewing"
                     },
                     "stopped": {
-                        "label": "stopped"
+                        "label": "Stopped"
                     },
                     "ready": {
-                        "label": "ready"
+                        "label": "Ready"
                     },
                     "initializing": {
-                        "label": "initializing"
+                        "label": "Initialising…"
                     },
                     "complete": {
-                        "label": "complete"
+                        "label": "Complete"
                     },
                     "error": {
-                        "label": "error"
+                        "label": "Error"
                     }
                 }
             }
         },
-        "supportedCommands": {
-            "label": "supportedCommands",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+        "coffeeAmountRange": {
+            "label": "Coffee amount range",
+            "description": "``{\"minimum\":\"0..∞\", \"maximum\":\"0..∞\", \"step\":\"1..∞\"}``",
+            "displayTemplate": "{{device.label}} {{attribute}} is between {{minimum}} and {{maximum}}",
             "i18n": {}
         },
+        "supportedCommands": {
+            "label": "supported extra commands by the coffee maker",
+            "description": "Extra commands supported by the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "stop": {
+                        "label": "Stop"
+                    },
+                    "makeCoffee": {
+                        "label": "Make Coffee"
+                    },
+                    "makeCustomizedCoffee": {
+                        "label": "Make Manual Coffee"
+                    }
+                }
+            }
+        },
         "supportedCoffeeMakerOperationStatus": {
-            "label": "supportedCoffeeMakerOperationStatus",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "supported machine statuses",
+            "description": "Status supported by the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "stopped": {
+                        "label": "Stopped"
+                    },
+                    "making": {
+                        "label": "Making"
+                    },
+                    "ready": {
+                        "label": "Ready"
+                    },
+                    "initializing": {
+                        "label": "Initializing"
+                    },
+                    "error": {
+                        "label": "Error"
+                    },
+                    "complete": {
+                        "label": "Complete"
+                    }
+                }
+            }
+        },
+        "coffeeStrengthRange": {
+            "label": "Coffee strength range",
+            "description": "``{\"minimum\":\"1..5\", \"maximum\":\"1..5\", \"step\":\"1..5\"}``",
+            "displayTemplate": "{{device.label}} {{attribute}} is between {{minimum}} and {{maximum}}",
             "i18n": {}
         },
         "supportedMenu": {
-            "label": "supportedMenu",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "supported menu by the coffee maker",
+            "description": "Menu supported by the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "hotMilkFoam": {
+                        "label": "Hot Milk Foam"
+                    },
+                    "espresso": {
+                        "label": "Espresso"
+                    },
+                    "cappuccino": {
+                        "label": "Cappuccino"
+                    },
+                    "aPotOfCoffee": {
+                        "label": "A Pot Of Coffee"
+                    },
+                    "ristretto": {
+                        "label": "Ristretto"
+                    },
+                    "demitasse": {
+                        "label": "Demitasse"
+                    },
+                    "americano": {
+                        "label": "Americano"
+                    },
+                    "latteMacchiato": {
+                        "label": "Latte Macchiato"
+                    },
+                    "hotMilk": {
+                        "label": "Hot Milk"
+                    },
+                    "cremaCoffee": {
+                        "label": "Crema Coffee"
+                    },
+                    "coffeeLatte": {
+                        "label": "Coffee Latte"
+                    },
+                    "doubleEspresso": {
+                        "label": "Double Espresso"
+                    },
+                    "cafeaulait": {
+                        "label": "Cafe au Lait"
+                    },
+                    "classicCoffee": {
+                        "label": "Classic Coffee"
+                    },
+                    "flatWhite": {
+                        "label": "Flat White"
+                    },
+                    "hotWater": {
+                        "label": "Hot Water"
+                    }
+                }
+            }
+        },
+        "milkAmountRange": {
+            "label": "Milk amount range",
+            "description": "``{\"minimum\":\"0..∞\", \"maximum\":\"0..∞\", \"step\":\"1..∞\"}``",
+            "displayTemplate": "{{device.label}} {{attribute}} is between {{minimum}} and {{maximum}}",
             "i18n": {}
         }
     },
     "commands": {
         "stop": {
-            "label": "stop",
+            "label": "Stop",
+            "description": "Stop making coffee",
             "arguments": {}
         },
         "makeCoffee": {
-            "label": "makeCoffee",
-            "arguments": {}
+            "label": "Menu",
+            "description": "Make coffee with menu",
+            "arguments": {
+                "state": {
+                    "i18n": {
+                        "hotMilkFoam": {
+                            "label": "Hot milk foam"
+                        },
+                        "espresso": {
+                            "label": "Espresso"
+                        },
+                        "cappuccino": {
+                            "label": "Cappuccino"
+                        },
+                        "aPotOfCoffee": {
+                            "label": "Pot of coffee"
+                        },
+                        "americano": {
+                            "label": "Americano"
+                        },
+                        "ristretto": {
+                            "label": "Ristretto"
+                        },
+                        "latteMacchiato": {
+                            "label": "Latte macchiato"
+                        },
+                        "demitasse": {
+                            "label": "Demitasse"
+                        },
+                        "hotMilk": {
+                            "label": "Hot milk"
+                        },
+                        "coffeeLatte": {
+                            "label": "Cafe latte"
+                        },
+                        "cremaCoffee": {
+                            "label": "Crema coffee"
+                        },
+                        "doubleEspresso": {
+                            "label": "Double espresso"
+                        },
+                        "cafeaulait": {
+                            "label": "Cafe au lait"
+                        },
+                        "classicCoffee": {
+                            "label": "Classic coffee"
+                        },
+                        "flatWhite": {
+                            "label": "Flat white"
+                        },
+                        "hotWater": {
+                            "label": "Hot water"
+                        }
+                    },
+                    "description": "The menu to be made"
+                }
+            }
+        },
+        "makeCustomizedCoffee": {
+            "label": "Make manual coffee",
+            "description": "Make coffee with customizable settings including strength, amount, and temperature",
+            "arguments": {
+                "beverageSetting": {
+                    "i18n": {
+                        "wateramount description": {
+                            "label": "The amount of water"
+                        },
+                        "wateramount": {
+                            "label": "Water Amount"
+                        },
+                        "temperature description": {
+                            "label": "The temperature of the coffee"
+                        },
+                        "coffeestrength": {
+                            "label": "Coffee Strength"
+                        },
+                        "temperature": {
+                            "label": "Temperature"
+                        },
+                        "milkamount": {
+                            "label": "Milk Amount"
+                        },
+                        "milkamount description": {
+                            "label": "The amount of milk"
+                        },
+                        "coffeeamount description": {
+                            "label": "The amount of coffee"
+                        },
+                        "coffeeamount": {
+                            "label": "Coffee Amount"
+                        },
+                        "coffeestrength description": {
+                            "label": "The strength of the coffee"
+                        }
+                    },
+                    "description": "The settings to use when making coffee"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/json/coffeeMakerOperation.i18n.fr.json b/json/coffeeMakerOperation.i18n.fr.json
index c079d2d5..d8fc5a78 100644
--- a/json/coffeeMakerOperation.i18n.fr.json
+++ b/json/coffeeMakerOperation.i18n.fr.json
@@ -1,62 +1,350 @@
 {
-    "tag": "en",
-    "label": "Coffee Maker Operation",
+    "tag": "fr",
+    "label": "État",
+    "description": "Allows for the control of the coffee maker.",
     "attributes": {
+        "temperatureRange": {
+            "label": "Temperature range",
+            "description": "``{\"minimum\":\"0..∞\", \"maximum\":\"0..∞\", \"step\":\"1..∞\"}``",
+            "displayTemplate": "{{device.label}} {{attribute}} is between {{minimum}} and {{maximum}}",
+            "i18n": {}
+        },
+        "supportedArgument": {
+            "label": "Arguments",
+            "description": "Arguments supported by the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {}
+            }
+        },
         "errorState": {
-            "label": "errorState",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "Erreur",
+            "description": "Status supported by the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "pipelineBlockage": {
+                        "label": "Tuyau bloqué"
+                    },
+                    "grindingSystemAbnormality": {
+                        "label": "Vérifier le système de broyage"
+                    },
+                    "coffeeBeansRunOut": {
+                        "label": "En rupture de café"
+                    },
+                    "wasteWaterTrayFull": {
+                        "label": "Bac à eau plein"
+                    },
+                    "coffeeGroundsTankFull": {
+                        "label": "Récipient à marc de café plein"
+                    },
+                    "wasteWaterTrayError": {
+                        "label": "Vérifier le bac à eau"
+                    },
+                    "ntcAbnormality": {
+                        "label": "Vérifier le capteur de température"
+                    },
+                    "brewingBoilerError": {
+                        "label": "Vérifier la chaudière"
+                    },
+                    "abnormalCommunication": {
+                        "label": "Problème de connexion"
+                    },
+                    "transmissionSystemAbnormality": {
+                        "label": "Problème de signal"
+                    },
+                    "waterTankShortOfWater": {
+                        "label": "Manque d'eau dans le réservoir"
+                    },
+                    "coffeeSpoutCoverError": {
+                        "label": "Vérifier le couvercle du bec de la cafetière"
+                    },
+                    "coffeeGroundsTankError": {
+                        "label": "Vérifier le récipient à marc de café"
+                    },
+                    "valveFaulty": {
+                        "label": "Vérifier la vanne"
+                    },
+                    "brewingUnitError": {
+                        "label": "Vérifier l'unité de chauffage"
+                    },
+                    "temperatureIsTooLow": {
+                        "label": "La température est trop basse"
+                    },
+                    "noError": {
+                        "label": "No error"
+                    },
+                    "temperatureIsTooHigh": {
+                        "label": "La température est trop élevée"
+                    },
+                    "brewingDoorOpen": {
+                        "label": "Trappe de l'unité de chauffage ouverte"
+                    },
+                    "boilerDisconnection": {
+                        "label": "Cafetière électrique déconnectée"
+                    }
+                }
+            }
+        },
+        "waterAmountRange": {
+            "label": "Water amount range",
+            "description": "``{\"minimum\":\"0..∞\", \"maximum\":\"0..∞\", \"step\":\"1..∞\"}``",
+            "displayTemplate": "{{device.label}} {{attribute}} is between {{minimum}} and {{maximum}}",
             "i18n": {}
         },
         "coffeeMakerOperationStatus": {
-            "label": "coffeeMakerOperationStatus",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "État",
+            "description": "Current state of the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {
                 "value": {
                     "making": {
-                        "label": "making"
+                        "label": "Préparation"
                     },
                     "stopped": {
-                        "label": "stopped"
+                        "label": "Arrêté"
                     },
                     "ready": {
-                        "label": "ready"
+                        "label": "Prêt"
                     },
                     "initializing": {
-                        "label": "initializing"
+                        "label": "Initialisation en cours…"
                     },
                     "complete": {
-                        "label": "complete"
+                        "label": "Terminé"
                     },
                     "error": {
-                        "label": "error"
+                        "label": "Erreur"
                     }
                 }
             }
         },
-        "supportedCommands": {
-            "label": "supportedCommands",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+        "coffeeAmountRange": {
+            "label": "Coffee amount range",
+            "description": "``{\"minimum\":\"0..∞\", \"maximum\":\"0..∞\", \"step\":\"1..∞\"}``",
+            "displayTemplate": "{{device.label}} {{attribute}} is between {{minimum}} and {{maximum}}",
             "i18n": {}
         },
+        "supportedCommands": {
+            "label": "supported extra commands by the coffee maker",
+            "description": "Extra commands supported by the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "stop": {
+                        "label": "Stop"
+                    },
+                    "makeCoffee": {
+                        "label": "Make Coffee"
+                    },
+                    "makeCustomizedCoffee": {
+                        "label": "Make Manual Coffee"
+                    }
+                }
+            }
+        },
         "supportedCoffeeMakerOperationStatus": {
-            "label": "supportedCoffeeMakerOperationStatus",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "supported machine statuses",
+            "description": "Status supported by the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "stopped": {
+                        "label": "Stopped"
+                    },
+                    "making": {
+                        "label": "Making"
+                    },
+                    "ready": {
+                        "label": "Ready"
+                    },
+                    "initializing": {
+                        "label": "Initializing"
+                    },
+                    "error": {
+                        "label": "Error"
+                    },
+                    "complete": {
+                        "label": "Complete"
+                    }
+                }
+            }
+        },
+        "coffeeStrengthRange": {
+            "label": "Coffee strength range",
+            "description": "``{\"minimum\":\"1..5\", \"maximum\":\"1..5\", \"step\":\"1..5\"}``",
+            "displayTemplate": "{{device.label}} {{attribute}} is between {{minimum}} and {{maximum}}",
             "i18n": {}
         },
         "supportedMenu": {
-            "label": "supportedMenu",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "supported menu by the coffee maker",
+            "description": "Menu supported by the coffee maker",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "hotMilkFoam": {
+                        "label": "Hot Milk Foam"
+                    },
+                    "espresso": {
+                        "label": "Espresso"
+                    },
+                    "cappuccino": {
+                        "label": "Cappuccino"
+                    },
+                    "aPotOfCoffee": {
+                        "label": "A Pot Of Coffee"
+                    },
+                    "ristretto": {
+                        "label": "Ristretto"
+                    },
+                    "demitasse": {
+                        "label": "Demitasse"
+                    },
+                    "americano": {
+                        "label": "Americano"
+                    },
+                    "latteMacchiato": {
+                        "label": "Latte Macchiato"
+                    },
+                    "hotMilk": {
+                        "label": "Hot Milk"
+                    },
+                    "cremaCoffee": {
+                        "label": "Crema Coffee"
+                    },
+                    "coffeeLatte": {
+                        "label": "Coffee Latte"
+                    },
+                    "doubleEspresso": {
+                        "label": "Double Espresso"
+                    },
+                    "cafeaulait": {
+                        "label": "Cafe au Lait"
+                    },
+                    "classicCoffee": {
+                        "label": "Classic Coffee"
+                    },
+                    "flatWhite": {
+                        "label": "Flat White"
+                    },
+                    "hotWater": {
+                        "label": "Hot Water"
+                    }
+                }
+            }
+        },
+        "milkAmountRange": {
+            "label": "Milk amount range",
+            "description": "``{\"minimum\":\"0..∞\", \"maximum\":\"0..∞\", \"step\":\"1..∞\"}``",
+            "displayTemplate": "{{device.label}} {{attribute}} is between {{minimum}} and {{maximum}}",
             "i18n": {}
         }
     },
     "commands": {
         "stop": {
-            "label": "stop",
+            "label": "Arrêter",
+            "description": "Stop making coffee",
             "arguments": {}
         },
         "makeCoffee": {
-            "label": "makeCoffee",
-            "arguments": {}
+            "label": "Menu",
+            "description": "Make coffee with menu",
+            "arguments": {
+                "state": {
+                    "i18n": {
+                        "hotMilkFoam": {
+                            "label": "Mousse de lait chaud"
+                        },
+                        "espresso": {
+                            "label": "Expresso"
+                        },
+                        "cappuccino": {
+                            "label": "Cappuccino"
+                        },
+                        "aPotOfCoffee": {
+                            "label": "Pot de café"
+                        },
+                        "americano": {
+                            "label": "Allongé"
+                        },
+                        "ristretto": {
+                            "label": "Ristretto"
+                        },
+                        "latteMacchiato": {
+                            "label": "Latte macchiato"
+                        },
+                        "demitasse": {
+                            "label": "Demi-tasse"
+                        },
+                        "hotMilk": {
+                            "label": "Lait chaud"
+                        },
+                        "coffeeLatte": {
+                            "label": "Café latte"
+                        },
+                        "cremaCoffee": {
+                            "label": "Café crème"
+                        },
+                        "doubleEspresso": {
+                            "label": "Double expresso"
+                        },
+                        "cafeaulait": {
+                            "label": "Café au lait"
+                        },
+                        "classicCoffee": {
+                            "label": "Café classique"
+                        },
+                        "flatWhite": {
+                            "label": "Flat white"
+                        },
+                        "hotWater": {
+                            "label": "Eau chaude"
+                        }
+                    },
+                    "description": "The menu to be made"
+                }
+            }
+        },
+        "makeCustomizedCoffee": {
+            "label": "Make manual coffee",
+            "description": "Make coffee with customizable settings including strength, amount, and temperature",
+            "arguments": {
+                "beverageSetting": {
+                    "i18n": {
+                        "wateramount description": {
+                            "label": "The amount of water"
+                        },
+                        "wateramount": {
+                            "label": "Water Amount"
+                        },
+                        "temperature description": {
+                            "label": "The temperature of the coffee"
+                        },
+                        "coffeestrength": {
+                            "label": "Coffee Strength"
+                        },
+                        "temperature": {
+                            "label": "Temperature"
+                        },
+                        "milkamount": {
+                            "label": "Milk Amount"
+                        },
+                        "milkamount description": {
+                            "label": "The amount of milk"
+                        },
+                        "coffeeamount description": {
+                            "label": "The amount of coffee"
+                        },
+                        "coffeeamount": {
+                            "label": "Coffee Amount"
+                        },
+                        "coffeestrength description": {
+                            "label": "The strength of the coffee"
+                        }
+                    },
+                    "description": "The settings to use when making coffee"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/json/coffeeMakerOperation.json b/json/coffeeMakerOperation.json
index 4b7aad9c..7ccd275b 100644
--- a/json/coffeeMakerOperation.json
+++ b/json/coffeeMakerOperation.json
@@ -5,36 +5,68 @@
     "name": "Coffee Maker Operation",
     "ephemeral": false,
     "attributes": {
-        "errorState": {
+        "temperatureRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "title": "TemperatureValue",
+                                "type": "number",
+                                "minimum": -460,
+                                "maximum": 10000
+                            },
+                            "maximum": {
+                                "title": "TemperatureValue",
+                                "type": "number",
+                                "minimum": -460,
+                                "maximum": 10000
+                            },
+                            "step": {
+                                "title": "TemperatureValue",
+                                "type": "number",
+                                "minimum": -460,
+                                "maximum": 10000
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "F",
+                            "C"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedArgument": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
                         "type": "array",
                         "items": {
-                            "title": "CoffeeMakerError",
+                            "title": "CoffeeMakerManualSetting",
                             "type": "string",
                             "enum": [
-                                "noError",
-                                "abnormalCommunication",
-                                "boilerDisconnection",
-                                "ntcAbnormality",
-                                "transmissionSystemAbnormality",
-                                "grindingSystemAbnormality",
-                                "pipelineBlockage",
-                                "coffeeBeansRunOut",
-                                "temperatureIsTooLow",
-                                "temperatureIsTooHigh",
-                                "waterTankShortOfWater",
-                                "valveFaulty",
-                                "brewingDoorOpen",
-                                "wasteWaterTrayError",
-                                "wasteWaterTrayFull",
-                                "coffeeGroundsTankError",
-                                "coffeeGroundsTankFull",
-                                "coffeeSpoutCoverError",
-                                "brewingUnitError",
-                                "brewingBoilerError"
+                                "beverageSetting.coffeeStrength",
+                                "beverageSetting.coffeeAmount",
+                                "beverageSetting.waterAmount",
+                                "beverageSetting.milkAmount",
+                                "beverageSetting.temperature"
                             ]
                         }
                     }
@@ -46,6 +78,86 @@
             },
             "enumCommands": []
         },
+        "errorState": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "CoffeeMakerError",
+                        "type": "string",
+                        "enum": [
+                            "noError",
+                            "abnormalCommunication",
+                            "boilerDisconnection",
+                            "ntcAbnormality",
+                            "transmissionSystemAbnormality",
+                            "grindingSystemAbnormality",
+                            "pipelineBlockage",
+                            "coffeeBeansRunOut",
+                            "temperatureIsTooLow",
+                            "temperatureIsTooHigh",
+                            "waterTankShortOfWater",
+                            "valveFaulty",
+                            "brewingDoorOpen",
+                            "wasteWaterTrayError",
+                            "wasteWaterTrayFull",
+                            "coffeeGroundsTankError",
+                            "coffeeGroundsTankFull",
+                            "coffeeSpoutCoverError",
+                            "brewingUnitError",
+                            "brewingBoilerError"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "waterAmountRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "step": {
+                                "type": "integer",
+                                "minimum": 1
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "ml",
+                            "oz"
+                        ],
+                        "default": "ml"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
         "coffeeMakerOperationStatus": {
             "schema": {
                 "type": "object",
@@ -70,6 +182,48 @@
             },
             "enumCommands": []
         },
+        "coffeeAmountRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "step": {
+                                "type": "integer",
+                                "minimum": 1
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "ml",
+                            "oz"
+                        ],
+                        "default": "ml"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
         "supportedCommands": {
             "schema": {
                 "type": "object",
@@ -80,7 +234,9 @@
                             "title": "CoffeeMakerCommand",
                             "type": "string",
                             "enum": [
-                                "stop"
+                                "stop",
+                                "makeCoffee",
+                                "makeCustomizedCoffee"
                             ]
                         }
                     }
@@ -119,6 +275,43 @@
             },
             "enumCommands": []
         },
+        "coffeeStrengthRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": 1,
+                                "maximum": 5
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": 1,
+                                "maximum": 5
+                            },
+                            "step": {
+                                "type": "integer",
+                                "minimum": 1,
+                                "maximum": 5
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
         "supportedMenu": {
             "schema": {
                 "type": "object",
@@ -155,12 +348,55 @@
                 ]
             },
             "enumCommands": []
+        },
+        "milkAmountRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "step": {
+                                "type": "integer",
+                                "minimum": 1
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "ml",
+                            "oz"
+                        ],
+                        "default": "ml"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
         }
     },
     "commands": {
         "stop": {
             "name": "stop",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "makeCoffee": {
             "name": "makeCoffee",
@@ -191,7 +427,40 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
+        },
+        "makeCustomizedCoffee": {
+            "name": "makeCustomizedCoffee",
+            "arguments": [
+                {
+                    "name": "beverageSetting",
+                    "optional": false,
+                    "schema": {
+                        "title": "CoffeeMakerManualSettingArgument",
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "coffeeStrength": {
+                                "type": "number"
+                            },
+                            "coffeeAmount": {
+                                "type": "number"
+                            },
+                            "waterAmount": {
+                                "type": "number"
+                            },
+                            "milkAmount": {
+                                "type": "number"
+                            },
+                            "temperature": {
+                                "type": "number"
+                            }
+                        }
+                    }
+                }
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/coffeeMakerOperationPresentation.json b/json/coffeeMakerOperationPresentation.json
new file mode 100644
index 00000000..2c6492c0
--- /dev/null
+++ b/json/coffeeMakerOperationPresentation.json
@@ -0,0 +1,635 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{coffeeMakerOperationStatus.value}}",
+                "alternatives": [
+                    {
+                        "key": "initializing",
+                        "value": "Initialising…",
+                        "type": "active"
+                    },
+                    {
+                        "key": "ready",
+                        "value": "Ready",
+                        "type": "inactive"
+                    },
+                    {
+                        "key": "making",
+                        "value": "Brewing",
+                        "type": "active"
+                    },
+                    {
+                        "key": "complete",
+                        "value": "Complete",
+                        "type": "active"
+                    },
+                    {
+                        "key": "error",
+                        "value": "Error",
+                        "type": "inactive"
+                    },
+                    {
+                        "key": "stopped",
+                        "value": "Stopped",
+                        "type": "inactive"
+                    }
+                ]
+            }
+        ],
+        "actions": [
+            {
+                "displayType": "pushButton",
+                "pushButton": {
+                    "command": "stop"
+                }
+            }
+        ],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "Status",
+            "displayType": "state",
+            "state": {
+                "label": "{{coffeeMakerOperationStatus.value}}",
+                "alternatives": [
+                    {
+                        "key": "initializing",
+                        "value": "Initialising…",
+                        "type": "active"
+                    },
+                    {
+                        "key": "ready",
+                        "value": "Ready",
+                        "type": "inactive"
+                    },
+                    {
+                        "key": "making",
+                        "value": "Brewing",
+                        "type": "active"
+                    },
+                    {
+                        "key": "complete",
+                        "value": "Complete",
+                        "type": "active"
+                    },
+                    {
+                        "key": "error",
+                        "value": "Error",
+                        "type": "inactive"
+                    },
+                    {
+                        "key": "stopped",
+                        "value": "Stopped",
+                        "type": "inactive"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Menu",
+            "displayType": "list",
+            "list": {
+                "command": {
+                    "name": "makeCoffee",
+                    "alternatives": [
+                        {
+                            "key": "espresso",
+                            "value": "Espresso",
+                            "type": "active"
+                        },
+                        {
+                            "key": "doubleEspresso",
+                            "value": "Double espresso",
+                            "type": "active"
+                        },
+                        {
+                            "key": "americano",
+                            "value": "Americano",
+                            "type": "active"
+                        },
+                        {
+                            "key": "hotWater",
+                            "value": "Hot water",
+                            "type": "active"
+                        },
+                        {
+                            "key": "latteMacchiato",
+                            "value": "Latte macchiato",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cappuccino",
+                            "value": "Cappuccino",
+                            "type": "active"
+                        },
+                        {
+                            "key": "coffeeLatte",
+                            "value": "Cafe latte",
+                            "type": "active"
+                        },
+                        {
+                            "key": "hotMilk",
+                            "value": "Hot milk",
+                            "type": "active"
+                        },
+                        {
+                            "key": "classicCoffee",
+                            "value": "Classic coffee",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cremaCoffee",
+                            "value": "Crema coffee",
+                            "type": "active"
+                        },
+                        {
+                            "key": "ristretto",
+                            "value": "Ristretto",
+                            "type": "active"
+                        },
+                        {
+                            "key": "flatWhite",
+                            "value": "Flat white",
+                            "type": "active"
+                        },
+                        {
+                            "key": "aPotOfCoffee",
+                            "value": "Pot of coffee",
+                            "type": "active"
+                        },
+                        {
+                            "key": "hotMilkFoam",
+                            "value": "Hot milk foam",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cafeaulait",
+                            "value": "Cafe au lait",
+                            "type": "active"
+                        },
+                        {
+                            "key": "demitasse",
+                            "value": "Demitasse",
+                            "type": "active"
+                        }
+                    ],
+                    "argumentType": "string",
+                    "supportedValues": "supportedMenu.value"
+                }
+            }
+        },
+        {
+            "label": "Stop",
+            "displayType": "list",
+            "list": {
+                "command": {
+                    "alternatives": [
+                        {
+                            "key": "stop",
+                            "value": "Stop",
+                            "type": "active"
+                        }
+                    ],
+                    "supportedValues": "supportedCommands.value"
+                }
+            }
+        },
+        {
+            "label": "Error",
+            "displayType": "state",
+            "state": {
+                "label": "{{errorState.value}}",
+                "alternatives": [
+                    {
+                        "key": "noError",
+                        "value": "No error",
+                        "type": "inactive"
+                    },
+                    {
+                        "key": "abnormalCommunication",
+                        "value": "Connection issue",
+                        "type": "active"
+                    },
+                    {
+                        "key": "boilerDisconnection",
+                        "value": "Coffee boiler disconnected",
+                        "type": "active"
+                    },
+                    {
+                        "key": "ntcAbnormality",
+                        "value": "Check temperature sensor",
+                        "type": "active"
+                    },
+                    {
+                        "key": "transmissionSystemAbnormality",
+                        "value": "Signal issue",
+                        "type": "active"
+                    },
+                    {
+                        "key": "grindingSystemAbnormality",
+                        "value": "Check grinding system",
+                        "type": "active"
+                    },
+                    {
+                        "key": "pipelineBlockage",
+                        "value": "Pipeline blocked",
+                        "type": "active"
+                    },
+                    {
+                        "key": "coffeeBeansRunOut",
+                        "value": "Out of coffee beans",
+                        "type": "active"
+                    },
+                    {
+                        "key": "temperatureIsTooLow",
+                        "value": "Temperature is too low",
+                        "type": "active"
+                    },
+                    {
+                        "key": "temperatureIsTooHigh",
+                        "value": "Temperature is too high",
+                        "type": "active"
+                    },
+                    {
+                        "key": "waterTankShortOfWater",
+                        "value": "Not enough water in tank",
+                        "type": "active"
+                    },
+                    {
+                        "key": "valveFaulty",
+                        "value": "Check valve",
+                        "type": "active"
+                    },
+                    {
+                        "key": "brewingDoorOpen",
+                        "value": "Brewing door open",
+                        "type": "active"
+                    },
+                    {
+                        "key": "wasteWaterTrayError",
+                        "value": "Check water tray",
+                        "type": "active"
+                    },
+                    {
+                        "key": "wasteWaterTrayFull",
+                        "value": "Water tray full",
+                        "type": "active"
+                    },
+                    {
+                        "key": "coffeeGroundsTankError",
+                        "value": "Check coffee grounds tank",
+                        "type": "active"
+                    },
+                    {
+                        "key": "coffeeGroundsTankFull",
+                        "value": "Coffee grounds tank full",
+                        "type": "active"
+                    },
+                    {
+                        "key": "coffeeSpoutCoverError",
+                        "value": "Check coffee spout cover",
+                        "type": "active"
+                    },
+                    {
+                        "key": "brewingUnitError",
+                        "value": "Check brewing unit",
+                        "type": "active"
+                    },
+                    {
+                        "key": "brewingBoilerError",
+                        "value": "Check brewing boiler",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Coffee Strength",
+            "displayType": "slider",
+            "slider": {
+                "range": [
+                    1,
+                    5
+                ],
+                "unit": "coffeeStrengthRange.unit",
+                "supportedValues": "coffeeStrengthRange.value",
+                "alternatives": [
+                    {
+                        "key": "{{ARGUMENT_NAME}}",
+                        "value": "beverageSetting.coffeeStrength",
+                        "type": "active"
+                    }
+                ],
+                "command": "makeCustomizedCoffee",
+                "argumentType": "object"
+            }
+        },
+        {
+            "label": "Coffee Amount",
+            "displayType": "slider",
+            "slider": {
+                "range": [
+                    0,
+                    10
+                ],
+                "unit": "coffeeAmountRange.unit",
+                "supportedValues": "coffeeAmountRange.value",
+                "alternatives": [
+                    {
+                        "key": "{{ARGUMENT_NAME}}",
+                        "value": "beverageSetting.coffeeAmount",
+                        "type": "active"
+                    }
+                ],
+                "command": "makeCustomizedCoffee",
+                "argumentType": "object"
+            }
+        },
+        {
+            "label": "Water Amount",
+            "displayType": "slider",
+            "slider": {
+                "range": [
+                    0,
+                    10
+                ],
+                "unit": "waterAmountRange.unit",
+                "supportedValues": "waterAmountRange.value",
+                "alternatives": [
+                    {
+                        "key": "{{ARGUMENT_NAME}}",
+                        "value": "beverageSetting.waterAmount",
+                        "type": "active"
+                    }
+                ],
+                "command": "makeCustomizedCoffee",
+                "argumentType": "object"
+            }
+        },
+        {
+            "label": "Milk Amount",
+            "displayType": "slider",
+            "slider": {
+                "range": [
+                    0,
+                    10
+                ],
+                "unit": "milkAmountRange.unit",
+                "supportedValues": "milkAmountRange.value",
+                "alternatives": [
+                    {
+                        "key": "{{ARGUMENT_NAME}}",
+                        "value": "beverageSetting.milkAmount",
+                        "type": "active"
+                    }
+                ],
+                "command": "makeCustomizedCoffee",
+                "argumentType": "object"
+            }
+        },
+        {
+            "label": "Temperature",
+            "displayType": "slider",
+            "slider": {
+                "range": [
+                    20,
+                    80
+                ],
+                "unit": "temperatureRange.unit",
+                "supportedValues": "temperatureRange.value",
+                "alternatives": [
+                    {
+                        "key": "{{ARGUMENT_NAME}}",
+                        "value": "beverageSetting.temperature",
+                        "type": "active"
+                    }
+                ],
+                "command": "makeCustomizedCoffee",
+                "argumentType": "object"
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "Status",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "initializing",
+                            "value": "Initialising…",
+                            "type": "active"
+                        },
+                        {
+                            "key": "ready",
+                            "value": "Ready",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "making",
+                            "value": "Brewing",
+                            "type": "active"
+                        },
+                        {
+                            "key": "complete",
+                            "value": "Complete",
+                            "type": "active"
+                        },
+                        {
+                            "key": "error",
+                            "value": "Error",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "stopped",
+                            "value": "Stopped",
+                            "type": "inactive"
+                        }
+                    ],
+                    "supportedValues": "supportedCoffeeMakerOperationStatus.value",
+                    "value": "coffeeMakerOperationStatus.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": [
+            {
+                "label": "Menu",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "espresso",
+                            "value": "Espresso",
+                            "type": "active"
+                        },
+                        {
+                            "key": "doubleEspresso",
+                            "value": "Double espresso",
+                            "type": "active"
+                        },
+                        {
+                            "key": "americano",
+                            "value": "Americano",
+                            "type": "active"
+                        },
+                        {
+                            "key": "hotWater",
+                            "value": "Hot water",
+                            "type": "active"
+                        },
+                        {
+                            "key": "latteMacchiato",
+                            "value": "Latte macchiato",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cappuccino",
+                            "value": "Cappuccino",
+                            "type": "active"
+                        },
+                        {
+                            "key": "coffeeLatte",
+                            "value": "Cafe latte",
+                            "type": "active"
+                        },
+                        {
+                            "key": "hotMilk",
+                            "value": "Hot milk",
+                            "type": "active"
+                        },
+                        {
+                            "key": "classicCoffee",
+                            "value": "Classic coffee",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cremaCoffee",
+                            "value": "Crema coffee",
+                            "type": "active"
+                        },
+                        {
+                            "key": "ristretto",
+                            "value": "Ristretto",
+                            "type": "active"
+                        },
+                        {
+                            "key": "flatWhite",
+                            "value": "Flat white",
+                            "type": "active"
+                        },
+                        {
+                            "key": "aPotOfCoffee",
+                            "value": "Pot of coffee",
+                            "type": "active"
+                        },
+                        {
+                            "key": "hotMilkFoam",
+                            "value": "Hot milk foam",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cafeaulait",
+                            "value": "Cafe au lait",
+                            "type": "active"
+                        },
+                        {
+                            "key": "demitasse",
+                            "value": "Demitasse",
+                            "type": "active"
+                        }
+                    ],
+                    "supportedValues": "supportedMenu.value",
+                    "command": "makeCoffee",
+                    "argumentType": "string"
+                }
+            },
+            {
+                "label": "Make manual coffee",
+                "displayType": "multiArgCommand",
+                "multiArgCommand": {
+                    "command": "makeCustomizedCoffee",
+                    "arguments": [
+                        {
+                            "label": "Coffee Strength",
+                            "displayType": "slider",
+                            "slider": {
+                                "range": [
+                                    1,
+                                    5
+                                ],
+                                "unit": "coffeeStrengthRange.unit",
+                                "supportedValues": "coffeeStrengthRange.value",
+                                "name": "beverageSetting.coffeeStrength",
+                                "argumentType": "number"
+                            }
+                        },
+                        {
+                            "label": "Coffee Amount",
+                            "displayType": "slider",
+                            "slider": {
+                                "range": [
+                                    0,
+                                    10
+                                ],
+                                "unit": "coffeeAmountRange.unit",
+                                "supportedValues": "coffeeAmountRange.value",
+                                "name": "beverageSetting.coffeeAmount",
+                                "argumentType": "number"
+                            }
+                        },
+                        {
+                            "label": "Water Amount",
+                            "displayType": "slider",
+                            "slider": {
+                                "range": [
+                                    0,
+                                    10
+                                ],
+                                "unit": "waterAmountRange.unit",
+                                "supportedValues": "waterAmountRange.value",
+                                "name": "beverageSetting.waterAmount",
+                                "argumentType": "number"
+                            }
+                        },
+                        {
+                            "label": "Milk Amount",
+                            "displayType": "slider",
+                            "slider": {
+                                "range": [
+                                    0,
+                                    10
+                                ],
+                                "unit": "milkAmountRange.unit",
+                                "supportedValues": "milkAmountRange.value",
+                                "name": "beverageSetting.milkAmount",
+                                "argumentType": "number"
+                            }
+                        },
+                        {
+                            "label": "Temperature",
+                            "displayType": "slider",
+                            "slider": {
+                                "range": [
+                                    20,
+                                    80
+                                ],
+                                "unit": "temperatureRange.unit",
+                                "supportedValues": "temperatureRange.value",
+                                "name": "beverageSetting.temperature",
+                                "argumentType": "number"
+                            }
+                        }
+                    ],
+                    "supportedValues": "supportedArgument.value"
+                }
+            }
+        ]
+    },
+    "id": "coffeeMakerOperation",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/colorControl.json b/json/colorControl.json
index fedf56be..06e4e70e 100755
--- a/json/colorControl.json
+++ b/json/colorControl.json
@@ -34,7 +34,6 @@
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setColor",
             "enumCommands": []
         },
         "hue": {
@@ -86,7 +85,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setHue": {
             "name": "setHue",
@@ -100,7 +100,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setSaturation": {
             "name": "setSaturation",
@@ -114,7 +115,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/colorControlPresentation.json b/json/colorControlPresentation.json
index df4c1d31..3da55e18 100755
--- a/json/colorControlPresentation.json
+++ b/json/colorControlPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Colour control",
             "displayType": "numberField",
             "numberField": {
                 "value": "hue.value",
@@ -15,7 +15,7 @@
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Colour control",
             "displayType": "numberField",
             "numberField": {
                 "value": "saturation.value",
@@ -33,7 +33,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Colour control",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setColor",
diff --git a/json/colorModePresentation.json b/json/colorModePresentation.json
index 6a0d1008..df69244e 100755
--- a/json/colorModePresentation.json
+++ b/json/colorModePresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "color",
-                        "value": "{{i18n.attributes.colorMode.i18n.value.color.label}}",
+                        "value": "Colour",
                         "type": "active"
                     },
                     {
                         "key": "colorTemperature",
-                        "value": "{{i18n.attributes.colorMode.i18n.value.colorTemperature.label}}",
+                        "value": "Colour temperature",
                         "type": "active"
                     },
                     {
                         "key": "other",
-                        "value": "{{i18n.attributes.colorMode.i18n.value.other.label}}",
+                        "value": "Other",
                         "type": "active"
                     }
                 ]
@@ -27,24 +27,24 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Colour mode",
             "displayType": "state",
             "state": {
                 "label": "{{colorMode.value}}",
                 "alternatives": [
                     {
                         "key": "color",
-                        "value": "{{i18n.attributes.colorMode.i18n.value.color.label}}",
+                        "value": "Colour",
                         "type": "active"
                     },
                     {
                         "key": "colorTemperature",
-                        "value": "{{i18n.attributes.colorMode.i18n.value.colorTemperature.label}}",
+                        "value": "Colour temperature",
                         "type": "active"
                     },
                     {
                         "key": "other",
-                        "value": "{{i18n.attributes.colorMode.i18n.value.other.label}}",
+                        "value": "Other",
                         "type": "active"
                     }
                 ]
@@ -54,23 +54,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Colour mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "color",
-                            "value": "{{i18n.attributes.colorMode.i18n.value.color.label}}",
+                            "value": "Colour",
                             "type": "active"
                         },
                         {
                             "key": "colorTemperature",
-                            "value": "{{i18n.attributes.colorMode.i18n.value.colorTemperature.label}}",
+                            "value": "Colour temperature",
                             "type": "active"
                         },
                         {
                             "key": "other",
-                            "value": "{{i18n.attributes.colorMode.i18n.value.other.label}}",
+                            "value": "Other",
                             "type": "active"
                         }
                     ],
diff --git a/json/colorTemperaturePresentation.json b/json/colorTemperaturePresentation.json
index b8875cab..ea6116f6 100755
--- a/json/colorTemperaturePresentation.json
+++ b/json/colorTemperaturePresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Colour temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -29,7 +29,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Colour temperature",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -45,7 +45,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Colour temperature",
                 "displayType": "slider",
                 "slider": {
                     "range": [
diff --git a/json/consumable.i18n.en.json b/json/consumable.i18n.en.json
index 9032da61..3ad426eb 100755
--- a/json/consumable.i18n.en.json
+++ b/json/consumable.i18n.en.json
@@ -16,7 +16,7 @@
                         "label": "Missing"
                     },
                     "replace": {
-                        "label": "Replace"
+                        "label": "Needs replacement"
                     },
                     "good": {
                         "label": "Good"
diff --git a/json/consumable.i18n.fr.json b/json/consumable.i18n.fr.json
index d32500ce..d31ff684 100755
--- a/json/consumable.i18n.fr.json
+++ b/json/consumable.i18n.fr.json
@@ -16,7 +16,7 @@
                         "label": "Manquant"
                     },
                     "replace": {
-                        "label": "Remplacement"
+                        "label": "Remplacement requis"
                     },
                     "good": {
                         "label": "Bon"
diff --git a/json/consumableLifePresentation.json b/json/consumableLifePresentation.json
index 7f402b3b..2dfd5dc4 100644
--- a/json/consumableLifePresentation.json
+++ b/json/consumableLifePresentation.json
@@ -1,45 +1,45 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Consumable replacement",
             "displayType": "state",
             "state": {
                 "label": "{{lifespan.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.type.label}}",
+            "label": "Consumable replacement",
             "displayType": "state",
             "state": {
                 "label": "{{type.value}}",
                 "alternatives": [
                     {
                         "key": "desiccant",
-                        "value": "{{i18n.attributes.type.i18n.value.desiccant.label}}",
+                        "value": "Desiccant",
                         "type": "active"
                     },
                     {
                         "key": "diffuser",
-                        "value": "{{i18n.attributes.type.i18n.value.diffuser.label}}",
+                        "value": "Diffuser",
                         "type": "active"
                     },
                     {
                         "key": "filter",
-                        "value": "{{i18n.attributes.type.i18n.value.filter.label}}",
+                        "value": "Filter",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.startDate.label}}",
+            "label": "Last replacement date",
             "displayType": "state",
             "state": {
                 "label": "{{startDate.value}}"
             }
         },
         {
-            "label": "{{i18n.commands.reset.label}}",
+            "label": "Reset",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "reset"
diff --git a/json/consumablePresentation.json b/json/consumablePresentation.json
index e75f98db..b655d6f1 100755
--- a/json/consumablePresentation.json
+++ b/json/consumablePresentation.json
@@ -6,27 +6,27 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.consumableStatus.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "maintenance_required",
-                        "value": "{{i18n.attributes.consumableStatus.i18n.value.maintenance_required.label}}",
+                        "value": "Maintenance required",
                         "type": "active"
                     },
                     {
                         "key": "missing",
-                        "value": "{{i18n.attributes.consumableStatus.i18n.value.missing.label}}",
+                        "value": "Missing",
                         "type": "active"
                     },
                     {
                         "key": "order",
-                        "value": "{{i18n.attributes.consumableStatus.i18n.value.order.label}}",
+                        "value": "Order",
                         "type": "active"
                     },
                     {
                         "key": "replace",
-                        "value": "{{i18n.attributes.consumableStatus.i18n.value.replace.label}}",
+                        "value": "Needs replacement",
                         "type": "active"
                     }
                 ]
@@ -37,34 +37,34 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Consumable item",
             "displayType": "state",
             "state": {
                 "label": "{{consumableStatus.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.consumableStatus.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "maintenance_required",
-                        "value": "{{i18n.attributes.consumableStatus.i18n.value.maintenance_required.label}}",
+                        "value": "Maintenance required",
                         "type": "active"
                     },
                     {
                         "key": "missing",
-                        "value": "{{i18n.attributes.consumableStatus.i18n.value.missing.label}}",
+                        "value": "Missing",
                         "type": "active"
                     },
                     {
                         "key": "order",
-                        "value": "{{i18n.attributes.consumableStatus.i18n.value.order.label}}",
+                        "value": "Order",
                         "type": "active"
                     },
                     {
                         "key": "replace",
-                        "value": "{{i18n.attributes.consumableStatus.i18n.value.replace.label}}",
+                        "value": "Needs replacement",
                         "type": "active"
                     }
                 ]
@@ -74,33 +74,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Consumable item",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.consumableStatus.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "maintenance_required",
-                            "value": "{{i18n.attributes.consumableStatus.i18n.value.maintenance_required.label}}",
+                            "value": "Maintenance required",
                             "type": "active"
                         },
                         {
                             "key": "missing",
-                            "value": "{{i18n.attributes.consumableStatus.i18n.value.missing.label}}",
+                            "value": "Missing",
                             "type": "active"
                         },
                         {
                             "key": "order",
-                            "value": "{{i18n.attributes.consumableStatus.i18n.value.order.label}}",
+                            "value": "Order",
                             "type": "active"
                         },
                         {
                             "key": "replace",
-                            "value": "{{i18n.attributes.consumableStatus.i18n.value.replace.label}}",
+                            "value": "Needs replacement",
                             "type": "active"
                         }
                     ],
diff --git a/json/contactSensorPresentation.json b/json/contactSensorPresentation.json
index 219a55ba..11d1f4b3 100755
--- a/json/contactSensorPresentation.json
+++ b/json/contactSensorPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "open",
-                        "value": "{{i18n.attributes.contact.i18n.value.open.label}}",
+                        "value": "Open",
                         "type": "active"
                     },
                     {
                         "key": "closed",
-                        "value": "{{i18n.attributes.contact.i18n.value.closed.label}}",
+                        "value": "Closed",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Contact sensor",
             "displayType": "state",
             "state": {
                 "label": "{{contact.value}}",
                 "alternatives": [
                     {
                         "key": "open",
-                        "value": "{{i18n.attributes.contact.i18n.value.open.label}}",
+                        "value": "Open",
                         "type": "active"
                     },
                     {
                         "key": "closed",
-                        "value": "{{i18n.attributes.contact.i18n.value.closed.label}}",
+                        "value": "Closed",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Contact sensor",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "open",
-                            "value": "{{i18n.attributes.contact.i18n.value.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "closed",
-                            "value": "{{i18n.attributes.contact.i18n.value.closed.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/containerStatePresentation.json b/json/containerStatePresentation.json
index 2f072a4f..bb71f53c 100644
--- a/json/containerStatePresentation.json
+++ b/json/containerStatePresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "empty",
-                        "value": "{{i18n.attributes.containerState.i18n.value.empty.label}}",
+                        "value": "Empty",
                         "type": "active"
                     },
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.containerState.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "active"
                     },
                     {
                         "key": "full",
-                        "value": "{{i18n.attributes.containerState.i18n.value.full.label}}",
+                        "value": "Full",
                         "type": "active"
                     }
                 ]
@@ -27,58 +27,58 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.containerState.label}}",
+            "label": "Container state",
             "displayType": "state",
             "state": {
                 "label": "{{containerState.value}}",
                 "alternatives": [
                     {
                         "key": "empty",
-                        "value": "{{i18n.attributes.containerState.i18n.value.empty.label}}",
+                        "value": "Empty",
                         "type": "active"
                     },
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.containerState.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "active"
                     },
                     {
                         "key": "full",
-                        "value": "{{i18n.attributes.containerState.i18n.value.full.label}}",
+                        "value": "Full",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.content.label}}",
+            "label": "Container state",
             "displayType": "state",
             "state": {
                 "label": "{{content.value}}",
                 "alternatives": [
                     {
                         "key": "food",
-                        "value": "{{i18n.attributes.content.i18n.value.food.label}}",
+                        "value": "Food",
                         "type": "active"
                     },
                     {
                         "key": "water",
-                        "value": "{{i18n.attributes.content.i18n.value.water.label}}",
+                        "value": "Water",
                         "type": "active"
                     },
                     {
                         "key": "liquid",
-                        "value": "{{i18n.attributes.content.i18n.value.liquid.label}}",
+                        "value": "Liquid",
                         "type": "active"
                     },
                     {
                         "key": "consumable",
-                        "value": "{{i18n.attributes.content.i18n.value.consumable.label}}",
+                        "value": "Consumable item",
                         "type": "active"
                     },
                     {
                         "key": "excretions",
-                        "value": "{{i18n.attributes.content.i18n.value.excretions.label}}",
+                        "value": "Pet waste",
                         "type": "active"
                     }
                 ]
@@ -88,23 +88,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Container state",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "empty",
-                            "value": "{{i18n.attributes.containerState.i18n.value.empty.label}}",
+                            "value": "Empty",
                             "type": "active"
                         },
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.containerState.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "full",
-                            "value": "{{i18n.attributes.containerState.i18n.value.full.label}}",
+                            "value": "Full",
                             "type": "active"
                         }
                     ],
diff --git a/json/cookTimePresentation.json b/json/cookTimePresentation.json
index 0aac7d4f..380e933f 100644
--- a/json/cookTimePresentation.json
+++ b/json/cookTimePresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Cook time",
             "displayType": "numberField",
             "numberField": {
                 "value": "cookTime.value",
@@ -29,7 +29,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Cook time",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "cookTime.value",
@@ -45,7 +45,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Cook time",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setCookTime",
diff --git a/json/currentMeasurementPresentation.json b/json/currentMeasurementPresentation.json
index 6e1ac041..824cf933 100755
--- a/json/currentMeasurementPresentation.json
+++ b/json/currentMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Electric current",
             "displayType": "state",
             "state": {
                 "label": "{{current.value}}",
@@ -21,7 +21,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Electric current",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "current.value",
diff --git a/json/custom.accessibility.i18n.en.json b/json/custom.accessibility.i18n.en.json
new file mode 100644
index 00000000..e663155d
--- /dev/null
+++ b/json/custom.accessibility.i18n.en.json
@@ -0,0 +1,11 @@
+{
+    "tag": "en",
+    "label": "Accessibility",
+    "attributes": {},
+    "commands": {
+        "setAccessibility": {
+            "label": "setAccessibility",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/custom.accessibility.i18n.fr.json b/json/custom.accessibility.i18n.fr.json
new file mode 100644
index 00000000..e663155d
--- /dev/null
+++ b/json/custom.accessibility.i18n.fr.json
@@ -0,0 +1,11 @@
+{
+    "tag": "en",
+    "label": "Accessibility",
+    "attributes": {},
+    "commands": {
+        "setAccessibility": {
+            "label": "setAccessibility",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/custom.airConditionerOdorController.json b/json/custom.airConditionerOdorController.json
index 19dae62c..ee7dc71f 100755
--- a/json/custom.airConditionerOdorController.json
+++ b/json/custom.airConditionerOdorController.json
@@ -39,7 +39,6 @@
                     "value"
                 ]
             },
-            "setter": "setAirConditionerOdorControllerState",
             "enumCommands": []
         }
     },
@@ -58,7 +57,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.airConditionerOptionalMode.i18n.en.json b/json/custom.airConditionerOptionalMode.i18n.en.json
index 9ed10d29..575c1328 100755
--- a/json/custom.airConditionerOptionalMode.i18n.en.json
+++ b/json/custom.airConditionerOptionalMode.i18n.en.json
@@ -16,10 +16,10 @@
                         "label": "motionDirect"
                     },
                     "windFree": {
-                        "label": "Wind free on"
+                        "label": "WindFree on"
                     },
                     "windFreeSleep": {
-                        "label": "Wind free and Good sleep on"
+                        "label": "WindFree and Good sleep on"
                     },
                     "energySaving": {
                         "label": "energySaving"
@@ -77,10 +77,10 @@
                             "label": "Dry Comfort on"
                         },
                         "windFree": {
-                            "label": "Wind free on"
+                            "label": "WindFree on"
                         },
                         "windFreeSleep": {
-                            "label": "Wind free and Good sleep on"
+                            "label": "WindFree and Good sleep on"
                         },
                         "quiet": {
                             "label": "Quiet on"
diff --git a/json/custom.airConditionerOptionalMode.json b/json/custom.airConditionerOptionalMode.json
index 14cb6a70..3507f5b4 100755
--- a/json/custom.airConditionerOptionalMode.json
+++ b/json/custom.airConditionerOptionalMode.json
@@ -10,9 +10,7 @@
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "array",
                         "items": {
-                            "type": "string",
                             "enum": [
                                 "off",
                                 "energySaving",
@@ -45,7 +43,6 @@
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "string",
                         "enum": [
                             "off",
                             "energySaving",
@@ -70,7 +67,6 @@
                     "value"
                 ]
             },
-            "setter": "setAcOptionalMode",
             "enumCommands": []
         }
     },
@@ -82,7 +78,6 @@
                     "name": "mode",
                     "optional": false,
                     "schema": {
-                        "type": "string",
                         "enum": [
                             "off",
                             "energySaving",
@@ -102,7 +97,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.airConditionerOptionalModePresentation.json b/json/custom.airConditionerOptionalModePresentation.json
index 945222f4..9df6c382 100755
--- a/json/custom.airConditionerOptionalModePresentation.json
+++ b/json/custom.airConditionerOptionalModePresentation.json
@@ -2,43 +2,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Options",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.acOptionalMode.i18n.value.off.label}}",
+                            "value": "Options off",
                             "type": "active"
                         },
                         {
                             "key": "speed",
-                            "value": "{{i18n.attributes.acOptionalMode.i18n.value.speed.label}}",
+                            "value": "Speed on",
                             "type": "active"
                         },
                         {
                             "key": "quiet",
-                            "value": "{{i18n.attributes.acOptionalMode.i18n.value.quiet.label}}",
+                            "value": "Quiet on",
                             "type": "active"
                         },
                         {
                             "key": "windFree",
-                            "value": "{{i18n.attributes.acOptionalMode.i18n.value.windFree.label}}",
+                            "value": "WindFree on",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.attributes.acOptionalMode.i18n.value.sleep.label}}",
+                            "value": "Good sleep on",
                             "type": "active"
                         },
                         {
                             "key": "windFreeSleep",
-                            "value": "{{i18n.attributes.acOptionalMode.i18n.value.windFreeSleep.label}}",
+                            "value": "WindFree and Good sleep on",
                             "type": "active"
                         },
                         {
                             "key": "dryComfort",
-                            "value": "{{i18n.attributes.acOptionalMode.i18n.value.dryComfort.label}}",
+                            "value": "Dry Comfort on",
                             "type": "active"
                         }
                     ],
@@ -51,43 +51,43 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Options",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setAcOptionalMode.arguments.mode.i18n.off.label}}",
+                            "value": "Options off",
                             "type": "active"
                         },
                         {
                             "key": "speed",
-                            "value": "{{i18n.commands.setAcOptionalMode.arguments.mode.i18n.speed.label}}",
+                            "value": "Speed on",
                             "type": "active"
                         },
                         {
                             "key": "quiet",
-                            "value": "{{i18n.commands.setAcOptionalMode.arguments.mode.i18n.quiet.label}}",
+                            "value": "Quiet on",
                             "type": "active"
                         },
                         {
                             "key": "windFree",
-                            "value": "{{i18n.commands.setAcOptionalMode.arguments.mode.i18n.windFree.label}}",
+                            "value": "WindFree on",
                             "type": "active"
                         },
                         {
                             "key": "sleep",
-                            "value": "{{i18n.commands.setAcOptionalMode.arguments.mode.i18n.sleep.label}}",
+                            "value": "Good sleep on",
                             "type": "active"
                         },
                         {
                             "key": "windFreeSleep",
-                            "value": "{{i18n.commands.setAcOptionalMode.arguments.mode.i18n.windFreeSleep.label}}",
+                            "value": "WindFree and Good sleep on",
                             "type": "active"
                         },
                         {
                             "key": "dryComfort",
-                            "value": "{{i18n.commands.setAcOptionalMode.arguments.mode.i18n.dryComfort.label}}",
+                            "value": "Dry Comfort on",
                             "type": "active"
                         }
                     ],
diff --git a/json/custom.airConditionerTropicalNightMode.json b/json/custom.airConditionerTropicalNightMode.json
index ac84a7b3..d4ce625a 100755
--- a/json/custom.airConditionerTropicalNightMode.json
+++ b/json/custom.airConditionerTropicalNightMode.json
@@ -13,13 +13,6 @@
                         "minimum": 0,
                         "type": "integer",
                         "maximum": 35
-                    },
-                    "unit": {
-                        "type": "string",
-                        "enum": [
-                            "h"
-                        ],
-                        "default": "h"
                     }
                 },
                 "additionalProperties": false,
@@ -27,7 +20,6 @@
                     "value"
                 ]
             },
-            "setter": "setAcTropicalNightModeLevel",
             "enumCommands": []
         }
     },
@@ -42,16 +34,10 @@
                         "minimum": 0,
                         "type": "integer",
                         "maximum": 35
-                    },
-                    "unit": {
-                        "type": "string",
-                        "enum": [
-                            "h"
-                        ],
-                        "default": "h"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.airPurifierOperationMode.json b/json/custom.airPurifierOperationMode.json
index 3df6bddb..d8a2095a 100755
--- a/json/custom.airPurifierOperationMode.json
+++ b/json/custom.airPurifierOperationMode.json
@@ -18,7 +18,6 @@
                     "value"
                 ]
             },
-            "setter": "setApOperationMode",
             "enumCommands": []
         },
         "supportedApOperationMode": {
@@ -51,7 +50,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.autoCleaningModePresentation.json b/json/custom.autoCleaningModePresentation.json
index 8c7178aa..f774ec8e 100644
--- a/json/custom.autoCleaningModePresentation.json
+++ b/json/custom.autoCleaningModePresentation.json
@@ -2,7 +2,7 @@
     "dashboard": {
         "states": [
             {
-                "label": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_AC_DEVICE_CARD_AUTO_CLEANING}}"
+                "label": "Auto cleaning… "
             }
         ],
         "actions": [],
diff --git a/json/custom.cooktopOperatingStatePresentation.json b/json/custom.cooktopOperatingStatePresentation.json
index 5d88992e..a7965cb4 100755
--- a/json/custom.cooktopOperatingStatePresentation.json
+++ b/json/custom.cooktopOperatingStatePresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.cooktopOperatingState.i18n.value.ready.label}}",
+                        "value": "Cooktop Ready",
                         "type": "active"
                     },
                     {
                         "key": "run",
-                        "value": "{{i18n.attributes.cooktopOperatingState.i18n.value.run.label}}",
+                        "value": "Cooktop Working",
                         "type": "active"
                     }
                 ]
@@ -23,18 +23,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Cooktop status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "ready",
-                            "value": "{{i18n.attributes.cooktopOperatingState.i18n.value.ready.label}}",
+                            "value": "Cooktop Ready",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.attributes.cooktopOperatingState.i18n.value.run.label}}",
+                            "value": "Cooktop Working",
                             "type": "active"
                         }
                     ],
diff --git a/json/custom.deviceReportStateConfiguration.json b/json/custom.deviceReportStateConfiguration.json
index 72ac7cc9..15d13e8a 100755
--- a/json/custom.deviceReportStateConfiguration.json
+++ b/json/custom.deviceReportStateConfiguration.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setReportStateRealtimePeriod",
             "enumCommands": []
         },
         "reportStateRealtime": {
@@ -64,7 +63,6 @@
                     "value"
                 ]
             },
-            "setter": "setReportStateRealtime",
             "enumCommands": []
         },
         "reportStatePeriod": {
@@ -84,7 +82,6 @@
                     "value"
                 ]
             },
-            "setter": "setReportStatePeriod",
             "enumCommands": []
         }
     },
@@ -103,7 +100,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setReportStateRealtime": {
             "name": "setReportStateRealtime",
@@ -141,7 +139,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setReportStateRealtimePeriod": {
             "name": "setReportStateRealtimePeriod",
@@ -157,7 +156,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.dishwasherDelayStartTime.json b/json/custom.dishwasherDelayStartTime.json
index 7670dff7..c31891c7 100755
--- a/json/custom.dishwasherDelayStartTime.json
+++ b/json/custom.dishwasherDelayStartTime.json
@@ -19,7 +19,6 @@
                     "value"
                 ]
             },
-            "setter":"setDishwasherDelayStartTime",
             "enumCommands": []
         }
     },
@@ -35,7 +34,8 @@
                         "pattern": "^((([0-1][0-9]|2[0-3]):([0-5][0-9]):00)|(24:00:00))$"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.dishwasherDiagnosis.json b/json/custom.dishwasherDiagnosis.json
index 5bea0ea4..0149fc53 100755
--- a/json/custom.dishwasherDiagnosis.json
+++ b/json/custom.dishwasherDiagnosis.json
@@ -24,7 +24,6 @@
                     "value"
                 ]
             },
-            "setter":"setDishwasherDiagnosis",
             "enumCommands": []
         }
     },
@@ -45,7 +44,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.dishwasherHighTempDry.json b/json/custom.dishwasherHighTempDry.json
index 8aa7864b..a4c0ebb4 100755
--- a/json/custom.dishwasherHighTempDry.json
+++ b/json/custom.dishwasherHighTempDry.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter":"setDishwasherHighTempDry",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.dishwasherOperatingProgressPresentation.json b/json/custom.dishwasherOperatingProgressPresentation.json
index 21f7cc72..4fdf6ab2 100755
--- a/json/custom.dishwasherOperatingProgressPresentation.json
+++ b/json/custom.dishwasherOperatingProgressPresentation.json
@@ -6,27 +6,27 @@
                 "alternatives": [
                     {
                         "key": "wash",
-                        "value": "{{i18n.attributes.dishwasherOperatingProgress.i18n.value.wash.label}}",
+                        "value": "Washing",
                         "type": "active"
                     },
                     {
                         "key": "rinse",
-                        "value": "{{i18n.attributes.dishwasherOperatingProgress.i18n.value.rinse.label}}",
+                        "value": "Rinsing",
                         "type": "active"
                     },
                     {
                         "key": "drying",
-                        "value": "{{i18n.attributes.dishwasherOperatingProgress.i18n.value.drying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "finish",
-                        "value": "{{i18n.attributes.dishwasherOperatingProgress.i18n.value.finish.label}}",
+                        "value": "Finishing",
                         "type": "active"
                     },
                     {
                         "key": "delaywash",
-                        "value": "{{i18n.attributes.dishwasherOperatingProgress.i18n.value.delaywash.label}}",
+                        "value": "Delay start is set",
                         "type": "active"
                     }
                 ]
@@ -38,33 +38,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Washing progress",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "wash",
-                            "value": "{{i18n.attributes.dishwasherOperatingProgress.i18n.value.wash.label}}",
+                            "value": "Washing",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.attributes.dishwasherOperatingProgress.i18n.value.rinse.label}}",
+                            "value": "Rinsing",
                             "type": "active"
                         },
                         {
                             "key": "drying",
-                            "value": "{{i18n.attributes.dishwasherOperatingProgress.i18n.value.drying.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "finish",
-                            "value": "{{i18n.attributes.dishwasherOperatingProgress.i18n.value.finish.label}}",
+                            "value": "Finishing",
                             "type": "active"
                         },
                         {
                             "key": "delaywash",
-                            "value": "{{i18n.attributes.dishwasherOperatingProgress.i18n.value.delaywash.label}}",
+                            "value": "Delay start is set",
                             "type": "active"
                         }
                     ],
diff --git a/json/custom.dishwasherSanitize.json b/json/custom.dishwasherSanitize.json
index 815c14af..ec57ff97 100755
--- a/json/custom.dishwasherSanitize.json
+++ b/json/custom.dishwasherSanitize.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter":"setDishwasherSanitize",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.dishwasherSelectedZone.json b/json/custom.dishwasherSelectedZone.json
index 6379601a..344f48d0 100755
--- a/json/custom.dishwasherSelectedZone.json
+++ b/json/custom.dishwasherSelectedZone.json
@@ -24,7 +24,6 @@
                     "value"
                 ]
             },
-            "setter": "setDishwasherSelectedZone",
             "enumCommands": []
         }
     },
@@ -45,7 +44,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.dishwasherSpeedBooster.json b/json/custom.dishwasherSpeedBooster.json
index e3d210a8..26afc1d8 100755
--- a/json/custom.dishwasherSpeedBooster.json
+++ b/json/custom.dishwasherSpeedBooster.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setDishwasherSpeedBooster",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.dishwasherZoneBooster.json b/json/custom.dishwasherZoneBooster.json
index 5337c967..d22c7335 100755
--- a/json/custom.dishwasherZoneBooster.json
+++ b/json/custom.dishwasherZoneBooster.json
@@ -24,7 +24,6 @@
                     "value"
                 ]
             },
-            "setter": "setDishwasherZoneBooster",
             "enumCommands": []
         }
     },
@@ -45,7 +44,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.dryerWrinklePrevent.json b/json/custom.dryerWrinklePrevent.json
index f1cd851b..e1c1ddeb 100755
--- a/json/custom.dryerWrinklePrevent.json
+++ b/json/custom.dryerWrinklePrevent.json
@@ -42,7 +42,6 @@
                     "value"
                 ]
             },
-            "setter": "setDryerWrinklePrevent",
             "enumCommands": []
         }
     },
@@ -61,7 +60,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.energyType.json b/json/custom.energyType.json
index d89eaab4..268f4414 100755
--- a/json/custom.energyType.json
+++ b/json/custom.energyType.json
@@ -72,7 +72,6 @@
                     "value"
                 ]
             },
-            "setter": "setEnergySavingLevel",
             "enumCommands": []
         },
         "energySavingInfo": {
@@ -184,7 +183,8 @@
                         "type": "integer"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.error.json b/json/custom.error.json
index fe9cebb6..ab431149 100755
--- a/json/custom.error.json
+++ b/json/custom.error.json
@@ -18,7 +18,6 @@
                     "value"
                 ]
             },
-            "setter": "setError",
             "enumCommands": []
         }
     },
@@ -33,7 +32,8 @@
                         "type": "object"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.filterUsageTime.json b/json/custom.filterUsageTime.json
index c7f0f350..98c96eb1 100755
--- a/json/custom.filterUsageTime.json
+++ b/json/custom.filterUsageTime.json
@@ -18,14 +18,14 @@
                     "value"
                 ]
             },
-            "setter": "resetFilterUsageTime",
             "enumCommands": []
         }
     },
     "commands": {
         "resetFilterUsageTime": {
             "name": "resetFilterUsageTime",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.fridgeMode.i18n.en.json b/json/custom.fridgeMode.i18n.en.json
index 3eb8bfd3..0cb9e3e4 100755
--- a/json/custom.fridgeMode.i18n.en.json
+++ b/json/custom.fridgeMode.i18n.en.json
@@ -33,6 +33,9 @@
                     "kimchi_storage_cold": {
                         "label": "Regular kimchi (Cold+)"
                     },
+                    "storage_freezer_soft_degree_n5": {
+                        "label": "Soft Freeze"
+                    },
                     "storage_freezer_meat_fish": {
                         "label": "Meat/fish"
                     },
@@ -69,6 +72,12 @@
                     "kimchi_ripe_dongchimi": {
                         "label": "Ferment watery kimchi"
                     },
+                    "storage_freezer_degree_n19": {
+                        "label": "Freezer"
+                    },
+                    "kimchi_ripe_crunch_lab": {
+                        "label": "6 days Cold+"
+                    },
                     "kimchi_storage_normal": {
                         "label": "Regular kimchi (Cold) "
                     },
@@ -114,6 +123,9 @@
                     "storage_fridge_general": {
                         "label": "Fridge"
                     },
+                    "storage_fridge_degree_p2": {
+                        "label": "Fridge"
+                    },
                     "storage_rice_wine": {
                         "label": "Wine/rice"
                     },
@@ -132,6 +144,16 @@
                 }
             }
         },
+        "supportedFridgeOptions": {
+            "label": "supportedFridgeOptions",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "supportedFullFridgeModes": {
+            "label": "supportedFullFridgeModes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
         "supportedFridgeModes": {
             "label": "supportedFridgeModes",
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
diff --git a/json/custom.fridgeMode.i18n.fr.json b/json/custom.fridgeMode.i18n.fr.json
index 3eb8bfd3..0cb9e3e4 100644
--- a/json/custom.fridgeMode.i18n.fr.json
+++ b/json/custom.fridgeMode.i18n.fr.json
@@ -33,6 +33,9 @@
                     "kimchi_storage_cold": {
                         "label": "Regular kimchi (Cold+)"
                     },
+                    "storage_freezer_soft_degree_n5": {
+                        "label": "Soft Freeze"
+                    },
                     "storage_freezer_meat_fish": {
                         "label": "Meat/fish"
                     },
@@ -69,6 +72,12 @@
                     "kimchi_ripe_dongchimi": {
                         "label": "Ferment watery kimchi"
                     },
+                    "storage_freezer_degree_n19": {
+                        "label": "Freezer"
+                    },
+                    "kimchi_ripe_crunch_lab": {
+                        "label": "6 days Cold+"
+                    },
                     "kimchi_storage_normal": {
                         "label": "Regular kimchi (Cold) "
                     },
@@ -114,6 +123,9 @@
                     "storage_fridge_general": {
                         "label": "Fridge"
                     },
+                    "storage_fridge_degree_p2": {
+                        "label": "Fridge"
+                    },
                     "storage_rice_wine": {
                         "label": "Wine/rice"
                     },
@@ -132,6 +144,16 @@
                 }
             }
         },
+        "supportedFridgeOptions": {
+            "label": "supportedFridgeOptions",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "supportedFullFridgeModes": {
+            "label": "supportedFullFridgeModes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
         "supportedFridgeModes": {
             "label": "supportedFridgeModes",
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
diff --git a/json/custom.fridgeMode.json b/json/custom.fridgeMode.json
index a547f740..a5a7be98 100755
--- a/json/custom.fridgeMode.json
+++ b/json/custom.fridgeMode.json
@@ -33,7 +33,42 @@
                     "value"
                 ]
             },
-            "setter": "setFridgeMode",
+            "enumCommands": []
+        },
+        "supportedFridgeOptions": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedFullFridgeModes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
             "enumCommands": []
         },
         "supportedFridgeModes": {
@@ -41,10 +76,10 @@
                 "type": "object",
                 "properties": {
                     "value": {
+                        "type": "array",
                         "items": {
                             "type": "string"
-                        },
-                        "type": "array"
+                        }
                     }
                 },
                 "additionalProperties": false,
@@ -66,7 +101,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.fridgeModePresentation.json b/json/custom.fridgeModePresentation.json
index 77891188..af5a6f52 100644
--- a/json/custom.fridgeModePresentation.json
+++ b/json/custom.fridgeModePresentation.json
@@ -12,782 +12,862 @@
                         "alternatives": [
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL.label}}",
+                                "value": "Ferment kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_NORMAL_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL_TEMP.label}}",
+                                "value": "Normal fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_LOW_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_LOW_TEMP.label}}",
+                                "value": "Slow fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_DONGCHIMI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_DONGCHIMI.label}}",
+                                "value": "Ferment watery kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_KKAKDUGI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_KKAKDUGI.label}}",
+                                "value": "Ferment radish kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_GAT_KIMCHI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_GAT_KIMCHI.label}}",
+                                "value": "갓 김치 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_YOUNG_RADISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_YOUNG_RADISH.label}}",
+                                "value": "열무 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_RIPENED",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_RIPENED.label}}",
+                                "value": "묵은지 숙성",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIT_KIMCHI_RIPE_CRUNCH_LAB",
+                                "value": "6 days Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_NORMAL.label}}",
+                                "value": "Regular kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_COLD.label}}",
+                                "value": "Regular kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_WARM.label}}",
+                                "value": "Regular kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_LOW_SALT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT.label}}",
+                                "value": "Low salt kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_CRUNFCH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_CRUNFCH.label}}",
+                                "value": "1hr Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_BUY",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_BUY.label}}",
+                                "value": "Packaged kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_LOW_SALT_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_NORMAL.label}}",
+                                "value": "Low salt kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_LOW_SALT_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_COLD.label}}",
+                                "value": "Low salt kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_LOW_SALT_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_WARM.label}}",
+                                "value": "Low salt kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_NORMAL.label}}",
+                                "value": "Fridge (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_COLD.label}}",
+                                "value": "Fridge (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_WARM.label}}",
+                                "value": "Fridge (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_GENERAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_GENERAL.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_VEGETABLES_FRUIT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_VEGETABLES_FRUIT.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_DRINK",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_DRINK.label}}",
+                                "value": "Drinks",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRESH_CEREAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_CEREAL.label}}",
+                                "value": "Grains",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRESH_SOUP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_SOUP.label}}",
+                                "value": "Sauces",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRESH_POTATO_BANANA",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_POTATO_BANANA.label}}",
+                                "value": "Rood vegetables",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRESH_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_WINE.label}}",
+                                "value": "Wine",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FREEZER_MEAT_FISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_MEAT_FISH.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_RICE_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_RICE_WINE.label}}",
+                                "value": "Wine/rice",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_VEGETABLE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_VEGETABLE.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_MEAT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_MEAT.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FREEZER",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER.label}}",
+                                "value": "Freezer",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FREEZER_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_NORMAL.label}}",
+                                "value": "Freezer (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FREEZER_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_COLD.label}}",
+                                "value": "Freezer (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FREEZER_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_WARM.label}}",
+                                "value": "Freezer (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_MEAT_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.MEAT_RIPE_NORMAL.label}}",
+                                "value": "Meat aging",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_OFF",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.OFF.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_SCAN_NC_P",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_SCAN_NC_P.label}}",
+                                "value": "Scan keep",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIT_STORAGE_FREEZER_DEGREE_N19",
+                                "value": "Freezer",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIT_STORAGE_FREEZER_SOFT_DEGREE_N5",
+                                "value": "Soft Freeze",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIT_STORAGE_FRIDGE_DEGREE_P2",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL.label}}",
+                                "value": "Ferment kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_NORMAL_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL_TEMP.label}}",
+                                "value": "Normal fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_LOW_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_LOW_TEMP.label}}",
+                                "value": "Slow fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_DONGCHIMI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_DONGCHIMI.label}}",
+                                "value": "Ferment watery kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_KKAKDUGI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_KKAKDUGI.label}}",
+                                "value": "Ferment radish kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_GAT_KIMCHI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_GAT_KIMCHI.label}}",
+                                "value": "갓 김치 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_YOUNG_RADISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_YOUNG_RADISH.label}}",
+                                "value": "열무 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_RIPENED",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_RIPENED.label}}",
+                                "value": "묵은지 숙성",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIM_KIMCHI_RIPE_CRUNCH_LAB",
+                                "value": "6 days Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_NORMAL.label}}",
+                                "value": "Regular kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_COLD.label}}",
+                                "value": "Regular kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_WARM.label}}",
+                                "value": "Regular kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_LOW_SALT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT.label}}",
+                                "value": "Low salt kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_CRUNFCH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_CRUNFCH.label}}",
+                                "value": "1hr Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_BUY",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_BUY.label}}",
+                                "value": "Packaged kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_LOW_SALT_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_NORMAL.label}}",
+                                "value": "Low salt kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_LOW_SALT_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_COLD.label}}",
+                                "value": "Low salt kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_LOW_SALT_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_WARM.label}}",
+                                "value": "Low salt kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_NORMAL.label}}",
+                                "value": "Fridge (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_COLD.label}}",
+                                "value": "Fridge (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_WARM.label}}",
+                                "value": "Fridge (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_GENERAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_GENERAL.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_VEGETABLES_FRUIT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_VEGETABLES_FRUIT.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_DRINK",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_DRINK.label}}",
+                                "value": "Drinks",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRESH_CEREAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_CEREAL.label}}",
+                                "value": "Grains",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRESH_SOUP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_SOUP.label}}",
+                                "value": "Sauces",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRESH_POTATO_BANANA",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_POTATO_BANANA.label}}",
+                                "value": "Rood vegetables",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRESH_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_WINE.label}}",
+                                "value": "Wine",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FREEZER_MEAT_FISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_MEAT_FISH.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_RICE_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_RICE_WINE.label}}",
+                                "value": "Wine/rice",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_VEGETABLE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_VEGETABLE.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_MEAT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_MEAT.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FREEZER",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER.label}}",
+                                "value": "Freezer",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FREEZER_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_NORMAL.label}}",
+                                "value": "Freezer (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FREEZER_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_COLD.label}}",
+                                "value": "Freezer (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FREEZER_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_WARM.label}}",
+                                "value": "Freezer (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_MEAT_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.MEAT_RIPE_NORMAL.label}}",
+                                "value": "Meat aging",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_OFF",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.OFF.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_SCAN_NC_P",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_SCAN_NC_P.label}}",
+                                "value": "Scan keep",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIM_STORAGE_FREEZER_DEGREE_N19",
+                                "value": "Freezer",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIM_STORAGE_FREEZER_SOFT_DEGREE_N5",
+                                "value": "Soft Freeze",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIM_STORAGE_FRIDGE_DEGREE_P2",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL.label}}",
+                                "value": "Ferment kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_NORMAL_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL_TEMP.label}}",
+                                "value": "Normal fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_LOW_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_LOW_TEMP.label}}",
+                                "value": "Slow fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_DONGCHIMI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_DONGCHIMI.label}}",
+                                "value": "Ferment watery kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_KKAKDUGI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_KKAKDUGI.label}}",
+                                "value": "Ferment radish kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_GAT_KIMCHI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_GAT_KIMCHI.label}}",
+                                "value": "갓 김치 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_YOUNG_RADISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_YOUNG_RADISH.label}}",
+                                "value": "열무 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_RIPENED",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_RIPENED.label}}",
+                                "value": "묵은지 숙성",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIB_KIMCHI_RIPE_CRUNCH_LAB",
+                                "value": "6 days Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_NORMAL.label}}",
+                                "value": "Regular kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_COLD.label}}",
+                                "value": "Regular kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_WARM.label}}",
+                                "value": "Regular kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_LOW_SALT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT.label}}",
+                                "value": "Low salt kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_CRUNFCH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_CRUNFCH.label}}",
+                                "value": "1hr Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_BUY",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_BUY.label}}",
+                                "value": "Packaged kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_LOW_SALT_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_NORMAL.label}}",
+                                "value": "Low salt kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_LOW_SALT_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_COLD.label}}",
+                                "value": "Low salt kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_LOW_SALT_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_WARM.label}}",
+                                "value": "Low salt kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_NORMAL.label}}",
+                                "value": "Fridge (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_COLD.label}}",
+                                "value": "Fridge (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_WARM.label}}",
+                                "value": "Fridge (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_GENERAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_GENERAL.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_VEGETABLES_FRUIT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_VEGETABLES_FRUIT.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_DRINK",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_DRINK.label}}",
+                                "value": "Drinks",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRESH_CEREAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_CEREAL.label}}",
+                                "value": "Grains",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRESH_SOUP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_SOUP.label}}",
+                                "value": "Sauces",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRESH_POTATO_BANANA",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_POTATO_BANANA.label}}",
+                                "value": "Rood vegetables",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRESH_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_WINE.label}}",
+                                "value": "Wine",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FREEZER_MEAT_FISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_MEAT_FISH.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_RICE_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_RICE_WINE.label}}",
+                                "value": "Wine/rice",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_VEGETABLE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_VEGETABLE.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_MEAT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_MEAT.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FREEZER",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER.label}}",
+                                "value": "Freezer",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FREEZER_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_NORMAL.label}}",
+                                "value": "Freezer (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FREEZER_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_COLD.label}}",
+                                "value": "Freezer (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FREEZER_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_WARM.label}}",
+                                "value": "Freezer (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_MEAT_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.MEAT_RIPE_NORMAL.label}}",
+                                "value": "Meat aging",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_OFF",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.OFF.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_SCAN_NC_P",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_SCAN_NC_P.label}}",
+                                "value": "Scan keep",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIB_STORAGE_FREEZER_DEGREE_N19",
+                                "value": "Freezer",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIB_STORAGE_FREEZER_SOFT_DEGREE_N5",
+                                "value": "Soft Freeze",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIB_STORAGE_FRIDGE_DEGREE_P2",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL.label}}",
+                                "value": "Ferment kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_NORMAL_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL_TEMP.label}}",
+                                "value": "Normal fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_LOW_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_LOW_TEMP.label}}",
+                                "value": "Slow fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_DONGCHIMI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_DONGCHIMI.label}}",
+                                "value": "Ferment watery kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_KKAKDUGI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_KKAKDUGI.label}}",
+                                "value": "Ferment radish kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_GAT_KIMCHI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_GAT_KIMCHI.label}}",
+                                "value": "갓 김치 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_YOUNG_RADISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_YOUNG_RADISH.label}}",
+                                "value": "열무 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_RIPENED",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_RIPENED.label}}",
+                                "value": "묵은지 숙성",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHI_KIMCHI_RIPE_CRUNCH_LAB",
+                                "value": "6 days Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_NORMAL.label}}",
+                                "value": "Regular kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_COLD.label}}",
+                                "value": "Regular kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_WARM.label}}",
+                                "value": "Regular kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_LOW_SALT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT.label}}",
+                                "value": "Low salt kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_CRUNFCH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_CRUNFCH.label}}",
+                                "value": "1hr Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_BUY",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_BUY.label}}",
+                                "value": "Packaged kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_LOW_SALT_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_NORMAL.label}}",
+                                "value": "Low salt kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_LOW_SALT_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_COLD.label}}",
+                                "value": "Low salt kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_LOW_SALT_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_WARM.label}}",
+                                "value": "Low salt kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_NORMAL.label}}",
+                                "value": "Fridge (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_COLD.label}}",
+                                "value": "Fridge (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_WARM.label}}",
+                                "value": "Fridge (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_GENERAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_GENERAL.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_VEGETABLES_FRUIT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_VEGETABLES_FRUIT.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_DRINK",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_DRINK.label}}",
+                                "value": "Drinks",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRESH_CEREAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_CEREAL.label}}",
+                                "value": "Grains",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRESH_SOUP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_SOUP.label}}",
+                                "value": "Sauces",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRESH_POTATO_BANANA",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_POTATO_BANANA.label}}",
+                                "value": "Rood vegetables",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRESH_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_WINE.label}}",
+                                "value": "Wine",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FREEZER_MEAT_FISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_MEAT_FISH.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_RICE_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_RICE_WINE.label}}",
+                                "value": "Wine/rice",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_VEGETABLE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_VEGETABLE.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_MEAT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_MEAT.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FREEZER",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER.label}}",
+                                "value": "Freezer",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FREEZER_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_NORMAL.label}}",
+                                "value": "Freezer (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FREEZER_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_COLD.label}}",
+                                "value": "Freezer (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FREEZER_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_WARM.label}}",
+                                "value": "Freezer (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_MEAT_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.MEAT_RIPE_NORMAL.label}}",
+                                "value": "Meat aging",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_OFF",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.OFF.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_SCAN_NC_P",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_SCAN_NC_P.label}}",
+                                "value": "Scan keep",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHI_STORAGE_FREEZER_DEGREE_N19",
+                                "value": "Freezer",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHI_STORAGE_FREEZER_SOFT_DEGREE_N5",
+                                "value": "Soft Freeze",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHI_STORAGE_FRIDGE_DEGREE_P2",
+                                "value": "Fridge",
                                 "type": "active"
                             }
                         ],
@@ -800,782 +880,862 @@
                         "alternatives": [
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL.label}}",
+                                "value": "Ferment kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_NORMAL_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL_TEMP.label}}",
+                                "value": "Normal fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_LOW_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_LOW_TEMP.label}}",
+                                "value": "Slow fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_DONGCHIMI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_DONGCHIMI.label}}",
+                                "value": "Ferment watery kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_KKAKDUGI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_KKAKDUGI.label}}",
+                                "value": "Ferment radish kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_GAT_KIMCHI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_GAT_KIMCHI.label}}",
+                                "value": "갓 김치 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_YOUNG_RADISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_YOUNG_RADISH.label}}",
+                                "value": "열무 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_RIPE_RIPENED",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_RIPENED.label}}",
+                                "value": "묵은지 숙성",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIT_KIMCHI_RIPE_CRUNCH_LAB",
+                                "value": "6 days Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_NORMAL.label}}",
+                                "value": "Regular kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_COLD.label}}",
+                                "value": "Regular kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_WARM.label}}",
+                                "value": "Regular kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_LOW_SALT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT.label}}",
+                                "value": "Low salt kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_CRUNFCH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_CRUNFCH.label}}",
+                                "value": "1hr Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_BUY",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_BUY.label}}",
+                                "value": "Packaged kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_LOW_SALT_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_NORMAL.label}}",
+                                "value": "Low salt kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_LOW_SALT_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_COLD.label}}",
+                                "value": "Low salt kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_LOW_SALT_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_WARM.label}}",
+                                "value": "Low salt kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_NORMAL.label}}",
+                                "value": "Fridge (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_COLD.label}}",
+                                "value": "Fridge (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_WARM.label}}",
+                                "value": "Fridge (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_GENERAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_GENERAL.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_VEGETABLES_FRUIT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_VEGETABLES_FRUIT.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRIDGE_DRINK",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_DRINK.label}}",
+                                "value": "Drinks",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRESH_CEREAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_CEREAL.label}}",
+                                "value": "Grains",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRESH_SOUP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_SOUP.label}}",
+                                "value": "Sauces",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRESH_POTATO_BANANA",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_POTATO_BANANA.label}}",
+                                "value": "Rood vegetables",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FRESH_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_WINE.label}}",
+                                "value": "Wine",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FREEZER_MEAT_FISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_MEAT_FISH.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_RICE_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_RICE_WINE.label}}",
+                                "value": "Wine/rice",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_VEGETABLE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_VEGETABLE.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_MEAT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_MEAT.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FREEZER",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER.label}}",
+                                "value": "Freezer",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FREEZER_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_NORMAL.label}}",
+                                "value": "Freezer (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FREEZER_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_COLD.label}}",
+                                "value": "Freezer (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_STORAGE_FREEZER_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_WARM.label}}",
+                                "value": "Freezer (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_MEAT_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.MEAT_RIPE_NORMAL.label}}",
+                                "value": "Meat aging",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_OFF",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.OFF.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIT_KIMCHI_STORAGE_SCAN_NC_P",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_SCAN_NC_P.label}}",
+                                "value": "Scan keep",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIT_STORAGE_FREEZER_DEGREE_N19",
+                                "value": "Freezer",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIT_STORAGE_FREEZER_SOFT_DEGREE_N5",
+                                "value": "Soft Freeze",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIT_STORAGE_FRIDGE_DEGREE_P2",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL.label}}",
+                                "value": "Ferment kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_NORMAL_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL_TEMP.label}}",
+                                "value": "Normal fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_LOW_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_LOW_TEMP.label}}",
+                                "value": "Slow fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_DONGCHIMI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_DONGCHIMI.label}}",
+                                "value": "Ferment watery kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_KKAKDUGI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_KKAKDUGI.label}}",
+                                "value": "Ferment radish kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_GAT_KIMCHI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_GAT_KIMCHI.label}}",
+                                "value": "갓 김치 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_YOUNG_RADISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_YOUNG_RADISH.label}}",
+                                "value": "열무 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_RIPE_RIPENED",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_RIPENED.label}}",
+                                "value": "묵은지 숙성",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIM_KIMCHI_RIPE_CRUNCH_LAB",
+                                "value": "6 days Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_NORMAL.label}}",
+                                "value": "Regular kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_COLD.label}}",
+                                "value": "Regular kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_WARM.label}}",
+                                "value": "Regular kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_LOW_SALT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT.label}}",
+                                "value": "Low salt kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_CRUNFCH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_CRUNFCH.label}}",
+                                "value": "1hr Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_BUY",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_BUY.label}}",
+                                "value": "Packaged kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_LOW_SALT_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_NORMAL.label}}",
+                                "value": "Low salt kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_LOW_SALT_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_COLD.label}}",
+                                "value": "Low salt kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_LOW_SALT_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_WARM.label}}",
+                                "value": "Low salt kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_NORMAL.label}}",
+                                "value": "Fridge (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_COLD.label}}",
+                                "value": "Fridge (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_WARM.label}}",
+                                "value": "Fridge (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_GENERAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_GENERAL.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_VEGETABLES_FRUIT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_VEGETABLES_FRUIT.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRIDGE_DRINK",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_DRINK.label}}",
+                                "value": "Drinks",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRESH_CEREAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_CEREAL.label}}",
+                                "value": "Grains",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRESH_SOUP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_SOUP.label}}",
+                                "value": "Sauces",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRESH_POTATO_BANANA",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_POTATO_BANANA.label}}",
+                                "value": "Rood vegetables",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FRESH_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_WINE.label}}",
+                                "value": "Wine",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FREEZER_MEAT_FISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_MEAT_FISH.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_RICE_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_RICE_WINE.label}}",
+                                "value": "Wine/rice",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_VEGETABLE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_VEGETABLE.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_MEAT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_MEAT.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FREEZER",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER.label}}",
+                                "value": "Freezer",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FREEZER_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_NORMAL.label}}",
+                                "value": "Freezer (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FREEZER_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_COLD.label}}",
+                                "value": "Freezer (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_STORAGE_FREEZER_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_WARM.label}}",
+                                "value": "Freezer (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_MEAT_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.MEAT_RIPE_NORMAL.label}}",
+                                "value": "Meat aging",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_OFF",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.OFF.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIM_KIMCHI_STORAGE_SCAN_NC_P",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_SCAN_NC_P.label}}",
+                                "value": "Scan keep",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIM_STORAGE_FREEZER_DEGREE_N19",
+                                "value": "Freezer",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIM_STORAGE_FREEZER_SOFT_DEGREE_N5",
+                                "value": "Soft Freeze",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIM_STORAGE_FRIDGE_DEGREE_P2",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL.label}}",
+                                "value": "Ferment kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_NORMAL_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL_TEMP.label}}",
+                                "value": "Normal fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_LOW_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_LOW_TEMP.label}}",
+                                "value": "Slow fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_DONGCHIMI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_DONGCHIMI.label}}",
+                                "value": "Ferment watery kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_KKAKDUGI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_KKAKDUGI.label}}",
+                                "value": "Ferment radish kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_GAT_KIMCHI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_GAT_KIMCHI.label}}",
+                                "value": "갓 김치 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_YOUNG_RADISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_YOUNG_RADISH.label}}",
+                                "value": "열무 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_RIPE_RIPENED",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_RIPENED.label}}",
+                                "value": "묵은지 숙성",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIB_KIMCHI_RIPE_CRUNCH_LAB",
+                                "value": "6 days Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_NORMAL.label}}",
+                                "value": "Regular kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_COLD.label}}",
+                                "value": "Regular kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_WARM.label}}",
+                                "value": "Regular kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_LOW_SALT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT.label}}",
+                                "value": "Low salt kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_CRUNFCH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_CRUNFCH.label}}",
+                                "value": "1hr Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_BUY",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_BUY.label}}",
+                                "value": "Packaged kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_LOW_SALT_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_NORMAL.label}}",
+                                "value": "Low salt kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_LOW_SALT_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_COLD.label}}",
+                                "value": "Low salt kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_LOW_SALT_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_WARM.label}}",
+                                "value": "Low salt kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_NORMAL.label}}",
+                                "value": "Fridge (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_COLD.label}}",
+                                "value": "Fridge (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_WARM.label}}",
+                                "value": "Fridge (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_GENERAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_GENERAL.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_VEGETABLES_FRUIT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_VEGETABLES_FRUIT.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRIDGE_DRINK",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_DRINK.label}}",
+                                "value": "Drinks",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRESH_CEREAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_CEREAL.label}}",
+                                "value": "Grains",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRESH_SOUP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_SOUP.label}}",
+                                "value": "Sauces",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRESH_POTATO_BANANA",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_POTATO_BANANA.label}}",
+                                "value": "Rood vegetables",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FRESH_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_WINE.label}}",
+                                "value": "Wine",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FREEZER_MEAT_FISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_MEAT_FISH.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_RICE_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_RICE_WINE.label}}",
+                                "value": "Wine/rice",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_VEGETABLE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_VEGETABLE.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_MEAT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_MEAT.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FREEZER",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER.label}}",
+                                "value": "Freezer",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FREEZER_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_NORMAL.label}}",
+                                "value": "Freezer (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FREEZER_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_COLD.label}}",
+                                "value": "Freezer (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_STORAGE_FREEZER_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_WARM.label}}",
+                                "value": "Freezer (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_MEAT_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.MEAT_RIPE_NORMAL.label}}",
+                                "value": "Meat aging",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_OFF",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.OFF.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHIB_KIMCHI_STORAGE_SCAN_NC_P",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_SCAN_NC_P.label}}",
+                                "value": "Scan keep",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIB_STORAGE_FREEZER_DEGREE_N19",
+                                "value": "Freezer",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIB_STORAGE_FREEZER_SOFT_DEGREE_N5",
+                                "value": "Soft Freeze",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHIB_STORAGE_FRIDGE_DEGREE_P2",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL.label}}",
+                                "value": "Ferment kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_NORMAL_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_NORMAL_TEMP.label}}",
+                                "value": "Normal fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_LOW_TEMP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_LOW_TEMP.label}}",
+                                "value": "Slow fermenting",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_DONGCHIMI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_DONGCHIMI.label}}",
+                                "value": "Ferment watery kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_KKAKDUGI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_KKAKDUGI.label}}",
+                                "value": "Ferment radish kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_GAT_KIMCHI",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_GAT_KIMCHI.label}}",
+                                "value": "갓 김치 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_YOUNG_RADISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_YOUNG_RADISH.label}}",
+                                "value": "열무 숙성",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_RIPE_RIPENED",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_RIPE_RIPENED.label}}",
+                                "value": "묵은지 숙성",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHI_KIMCHI_RIPE_CRUNCH_LAB",
+                                "value": "6 days Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_NORMAL.label}}",
+                                "value": "Regular kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_COLD.label}}",
+                                "value": "Regular kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_WARM.label}}",
+                                "value": "Regular kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_LOW_SALT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT.label}}",
+                                "value": "Low salt kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_CRUNFCH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_CRUNFCH.label}}",
+                                "value": "1hr Cold+",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_BUY",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_BUY.label}}",
+                                "value": "Packaged kimchi",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_LOW_SALT_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_NORMAL.label}}",
+                                "value": "Low salt kimchi (Cold) ",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_LOW_SALT_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_COLD.label}}",
+                                "value": "Low salt kimchi (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_LOW_SALT_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_LOW_SALT_WARM.label}}",
+                                "value": "Low salt kimchi (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_NORMAL.label}}",
+                                "value": "Fridge (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_COLD.label}}",
+                                "value": "Fridge (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_WARM.label}}",
+                                "value": "Fridge (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_GENERAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_GENERAL.label}}",
+                                "value": "Fridge",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_VEGETABLES_FRUIT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_VEGETABLES_FRUIT.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRIDGE_DRINK",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRIDGE_DRINK.label}}",
+                                "value": "Drinks",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRESH_CEREAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_CEREAL.label}}",
+                                "value": "Grains",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRESH_SOUP",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_SOUP.label}}",
+                                "value": "Sauces",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRESH_POTATO_BANANA",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_POTATO_BANANA.label}}",
+                                "value": "Rood vegetables",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FRESH_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FRESH_WINE.label}}",
+                                "value": "Wine",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FREEZER_MEAT_FISH",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_MEAT_FISH.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_RICE_WINE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_RICE_WINE.label}}",
+                                "value": "Wine/rice",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_VEGETABLE",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_VEGETABLE.label}}",
+                                "value": "Vegetables/fruits",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_MEAT",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_MEAT.label}}",
+                                "value": "Meat/fish",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FREEZER",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER.label}}",
+                                "value": "Freezer",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FREEZER_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_NORMAL.label}}",
+                                "value": "Freezer (Cold)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FREEZER_COLD",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_COLD.label}}",
+                                "value": "Freezer (Cold+)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_STORAGE_FREEZER_WARM",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.STORAGE_FREEZER_WARM.label}}",
+                                "value": "Freezer (Cool)",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_MEAT_RIPE_NORMAL",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.MEAT_RIPE_NORMAL.label}}",
+                                "value": "Meat aging",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_OFF",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.OFF.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "KIMCHI_KIMCHI_STORAGE_SCAN_NC_P",
-                                "value": "{{i18n.attributes.fridgeMode.i18n.value.KIMCHI_STORAGE_SCAN_NC_P.label}}",
+                                "value": "Scan keep",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHI_STORAGE_FREEZER_DEGREE_N19",
+                                "value": "Freezer",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHI_STORAGE_FREEZER_SOFT_DEGREE_N5",
+                                "value": "Soft Freeze",
+                                "type": "active"
+                            },
+                            {
+                                "key": "KIMCHI_STORAGE_FRIDGE_DEGREE_P2",
+                                "value": "Fridge",
                                 "type": "active"
                             }
                         ]
diff --git a/json/custom.launchapp.i18n.en.json b/json/custom.launchapp.i18n.en.json
new file mode 100644
index 00000000..a9acf237
--- /dev/null
+++ b/json/custom.launchapp.i18n.en.json
@@ -0,0 +1,11 @@
+{
+    "tag": "en",
+    "label": "launchApp",
+    "attributes": {},
+    "commands": {
+        "launchApp": {
+            "label": "launchApp",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/custom.launchapp.i18n.fr.json b/json/custom.launchapp.i18n.fr.json
new file mode 100644
index 00000000..a9acf237
--- /dev/null
+++ b/json/custom.launchapp.i18n.fr.json
@@ -0,0 +1,11 @@
+{
+    "tag": "en",
+    "label": "launchApp",
+    "attributes": {},
+    "commands": {
+        "launchApp": {
+            "label": "launchApp",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/custom.lowerDevicePower.json b/json/custom.lowerDevicePower.json
index cde2cecc..aca2b9b7 100755
--- a/json/custom.lowerDevicePower.json
+++ b/json/custom.lowerDevicePower.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setPowerState",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.outingMode.json b/json/custom.outingMode.json
index ebbd3bf8..9d73f518 100755
--- a/json/custom.outingMode.json
+++ b/json/custom.outingMode.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setOutingMode",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.outingModePresentation.json b/json/custom.outingModePresentation.json
index c57e41b8..8b253863 100755
--- a/json/custom.outingModePresentation.json
+++ b/json/custom.outingModePresentation.json
@@ -3,18 +3,18 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Outing",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setOutingMode.arguments.mode.i18n.on.label}}",
+                            "value": "Outing On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setOutingMode.arguments.mode.i18n.off.label}}",
+                            "value": "Outing Off",
                             "type": "active"
                         }
                     ],
diff --git a/json/custom.ovenCavityStatusPresentation.json b/json/custom.ovenCavityStatusPresentation.json
index 4beaf78a..d18dfa5c 100755
--- a/json/custom.ovenCavityStatusPresentation.json
+++ b/json/custom.ovenCavityStatusPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.ovenCavityStatus.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.ovenCavityStatus.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "active"
                     }
                 ]
diff --git a/json/custom.periodicSensing.json b/json/custom.periodicSensing.json
index 190bc2d1..54ac79cf 100755
--- a/json/custom.periodicSensing.json
+++ b/json/custom.periodicSensing.json
@@ -16,7 +16,6 @@
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setAutomaticExecutionSetting",
             "enumCommands": []
         },
         "automaticExecutionMode": {
@@ -30,7 +29,6 @@
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setAutomaticExecutionMode",
             "enumCommands": []
         },
         "supportedAutomaticExecutionSetting": {
@@ -82,7 +80,6 @@
                     "value"
                 ]
             },
-            "setter": "setPeriodicSensing",
             "enumCommands": []
         },
         "periodicSensingInterval": {
@@ -96,7 +93,6 @@
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setPeriodicSensingInterval",
             "enumCommands": []
         },
         "lastSensingTime": {
@@ -156,7 +152,8 @@
     "commands": {
         "periodicSensingOn": {
             "name": "periodicSensingOn",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setPeriodicSensingInterval": {
             "name": "setPeriodicSensingInterval",
@@ -168,7 +165,8 @@
                         "type": "integer"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setPeriodicSensing": {
             "name": "setPeriodicSensing",
@@ -191,7 +189,8 @@
                         "type": "integer"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setAutomaticExecutionMode": {
             "name": "setAutomaticExecutionMode",
@@ -203,7 +202,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setAutomaticExecutionSetting": {
             "name": "setAutomaticExecutionSetting",
@@ -215,15 +215,18 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "periodicSensingOff": {
             "name": "periodicSensingOff",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "triggerManualSensing": {
             "name": "triggerManualSensing",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.periodicSensingPresentation.json b/json/custom.periodicSensingPresentation.json
index 406b2d1e..52e0fae1 100755
--- a/json/custom.periodicSensingPresentation.json
+++ b/json/custom.periodicSensingPresentation.json
@@ -11,27 +11,27 @@
                     },
                     {
                         "key": "Kr1",
-                        "value": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_AIR_SENSOR_INDOOR_GOOD}}",
+                        "value": "Indoor: Good",
                         "type": "inactive"
                     },
                     {
                         "key": "Kr2",
-                        "value": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_AIR_SENSOR_INDOOR_NORMAL}}",
+                        "value": "Indoor: Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "Kr3",
-                        "value": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_AIR_SENSOR_INDOOR_POOR}}",
+                        "value": "Indoor: Poor",
                         "type": "inactive"
                     },
                     {
                         "key": "Kr4",
-                        "value": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_AIR_SENSOR_INDOOR_VERY_POOR}}",
+                        "value": "Indoor: Very poor",
                         "type": "inactive"
                     },
                     {
                         "key": "Kr5",
-                        "value": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_AIR_SENSOR_INDOOR_VERY_POOR}}",
+                        "value": "Indoor: Very poor",
                         "type": "inactive"
                     }
                 ]
diff --git a/json/custom.picturemode.json b/json/custom.picturemode.json
index cffb4f88..2701368e 100755
--- a/json/custom.picturemode.json
+++ b/json/custom.picturemode.json
@@ -10,19 +10,12 @@
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "string",
-                        "enum": [
-                            "dynamic",
-                            "movie",
-                            "standard",
-                            "unknown"
-                        ]
+                        "type": "string"
                     }
                 },
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setPictureMode",
             "enumCommands": []
         },
         "supportedPictureModes": {
@@ -30,13 +23,7 @@
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "string",
-                        "enum": [
-                            "dynamic",
-                            "movie",
-                            "standard",
-                            "unknown"
-                        ]
+                        "type": "array"
                     }
                 },
                 "additionalProperties": false,
@@ -54,13 +41,7 @@
                             "type": "object",
                             "properties": {
                                 "id": {
-                                    "type": "string",
-                                    "enum": [
-                                        "dynamic",
-                                        "movie",
-                                        "standard",
-                                        "unknown"
-                                    ]
+                                    "type": "string"
                                 },
                                 "name": {
                                     "type": "string"
@@ -84,16 +65,11 @@
                     "name": "mode",
                     "optional": false,
                     "schema": {
-                        "type": "string",
-                        "enum": [
-                            "dynamic",
-                            "movie",
-                            "standard",
-                            "unknown"
-                        ]
+                        "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.picturemodePresentation.json b/json/custom.picturemodePresentation.json
index 42e24120..f5ff7e0d 100755
--- a/json/custom.picturemodePresentation.json
+++ b/json/custom.picturemodePresentation.json
@@ -34,7 +34,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.commands.setPictureMode.label}}",
+                "label": "Change Picture Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
diff --git a/json/custom.recording.i18n.en.json b/json/custom.recording.i18n.en.json
new file mode 100644
index 00000000..73ccae1a
--- /dev/null
+++ b/json/custom.recording.i18n.en.json
@@ -0,0 +1,15 @@
+{
+    "tag": "en",
+    "label": "Recording",
+    "attributes": {},
+    "commands": {
+        "recordStart": {
+            "label": "recordStart",
+            "arguments": {}
+        },
+        "recordStop": {
+            "label": "recordStop",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/custom.recording.i18n.fr.json b/json/custom.recording.i18n.fr.json
new file mode 100644
index 00000000..73ccae1a
--- /dev/null
+++ b/json/custom.recording.i18n.fr.json
@@ -0,0 +1,15 @@
+{
+    "tag": "en",
+    "label": "Recording",
+    "attributes": {},
+    "commands": {
+        "recordStart": {
+            "label": "recordStart",
+            "arguments": {}
+        },
+        "recordStop": {
+            "label": "recordStop",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/custom.robotCleanerBatteryFullStatus.json b/json/custom.robotCleanerBatteryFullStatus.json
index 7faaa7bf..45e8d01b 100755
--- a/json/custom.robotCleanerBatteryFullStatus.json
+++ b/json/custom.robotCleanerBatteryFullStatus.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setRobotCleanerBatteryFullStatus",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.robotCleanerBehavior.json b/json/custom.robotCleanerBehavior.json
index e39a4935..97b6625c 100755
--- a/json/custom.robotCleanerBehavior.json
+++ b/json/custom.robotCleanerBehavior.json
@@ -24,7 +24,6 @@
                     "value"
                 ]
             },
-            "setter": "setRobotCleanerBehavior",
             "enumCommands": []
         }
     },
@@ -45,7 +44,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.robotCleanerRepeatCleanOption.json b/json/custom.robotCleanerRepeatCleanOption.json
index 43cfef54..9b7821c5 100755
--- a/json/custom.robotCleanerRepeatCleanOption.json
+++ b/json/custom.robotCleanerRepeatCleanOption.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setRobotCleanerRepeatCleanOption",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.robotCleanerRepeatCleanSupport.json b/json/custom.robotCleanerRepeatCleanSupport.json
index 18c23271..c4aeb3e4 100755
--- a/json/custom.robotCleanerRepeatCleanSupport.json
+++ b/json/custom.robotCleanerRepeatCleanSupport.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setRobotCleanerRepeatCleanSupport",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.robotCleanerSmartControl.json b/json/custom.robotCleanerSmartControl.json
index d06618d2..a02b1d04 100755
--- a/json/custom.robotCleanerSmartControl.json
+++ b/json/custom.robotCleanerSmartControl.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setRobotCleanerSmartControl",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.robotCleanerSmartTurboMode.json b/json/custom.robotCleanerSmartTurboMode.json
index 4e4e9f15..061a9893 100755
--- a/json/custom.robotCleanerSmartTurboMode.json
+++ b/json/custom.robotCleanerSmartTurboMode.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setRobotCleanerSmartTurboMode",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.robotCleanerSoundSet.json b/json/custom.robotCleanerSoundSet.json
index 9cd8debb..e1854b12 100755
--- a/json/custom.robotCleanerSoundSet.json
+++ b/json/custom.robotCleanerSoundSet.json
@@ -26,7 +26,6 @@
                     "value"
                 ]
             },
-            "setter": "setRobotCleanerSoundSet",
             "enumCommands": []
         }
     },
@@ -49,7 +48,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.soundmode.json b/json/custom.soundmode.json
index c4bf22d4..66307267 100755
--- a/json/custom.soundmode.json
+++ b/json/custom.soundmode.json
@@ -35,20 +35,12 @@
                 "type": "object",
                 "properties": {
                     "value": {
-                        "enum": [
-                            "clear voice",
-                            "movie",
-                            "music",
-                            "standard",
-                            "unknown"
-                        ],
                         "type": "string"
                     }
                 },
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setSoundMode",
             "enumCommands": []
         },
         "supportedSoundModes": {
@@ -76,16 +68,11 @@
                     "name": "mode",
                     "optional": false,
                     "schema": {
-                        "enum": [
-                            "clear voice",
-                            "movie",
-                            "music",
-                            "standard"
-                        ],
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.soundmodePresentation.json b/json/custom.soundmodePresentation.json
index b71f2de4..e5a8cb82 100755
--- a/json/custom.soundmodePresentation.json
+++ b/json/custom.soundmodePresentation.json
@@ -34,7 +34,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.commands.setSoundMode.label}}",
+                "label": "Change Sound Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
diff --git a/json/custom.spiMode.json b/json/custom.spiMode.json
index 60427d4b..26697a2a 100755
--- a/json/custom.spiMode.json
+++ b/json/custom.spiMode.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setSpiMode",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.spiModePresentation.json b/json/custom.spiModePresentation.json
index 89c02eba..602c4da3 100755
--- a/json/custom.spiModePresentation.json
+++ b/json/custom.spiModePresentation.json
@@ -3,18 +3,18 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Purify",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setSpiMode.arguments.mode.i18n.on.label}}",
+                            "value": "Turn on",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setSpiMode.arguments.mode.i18n.off.label}}",
+                            "value": "Turn off",
                             "type": "active"
                         }
                     ],
diff --git a/json/custom.steamClosetCourse.json b/json/custom.steamClosetCourse.json
index e22d6be8..631da35c 100755
--- a/json/custom.steamClosetCourse.json
+++ b/json/custom.steamClosetCourse.json
@@ -96,7 +96,6 @@
                     "value"
                 ]
             },
-            "setter": "setSteamClosetCourse",
             "enumCommands": []
         }
     },
@@ -141,7 +140,8 @@
                         "title": "SteamClosetCourse"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.steamClosetOperatingState.i18n.en.json b/json/custom.steamClosetOperatingState.i18n.en.json
index 018e94d4..1e5329d0 100755
--- a/json/custom.steamClosetOperatingState.i18n.en.json
+++ b/json/custom.steamClosetOperatingState.i18n.en.json
@@ -13,18 +13,18 @@
             "i18n": {}
         },
         "steamClosetMachineState": {
-            "label": "steamClosetMachineState",
+            "label": "Device status",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
                 "value": {
                     "stop": {
-                        "label": "stop"
+                        "label": "On"
                     },
                     "run": {
-                        "label": "run"
+                        "label": "Caring"
                     },
                     "pause": {
-                        "label": "pause"
+                        "label": "Paused"
                     }
                 }
             }
diff --git a/json/custom.steamClosetOperatingState.i18n.fr.json b/json/custom.steamClosetOperatingState.i18n.fr.json
index 44834543..b357224b 100755
--- a/json/custom.steamClosetOperatingState.i18n.fr.json
+++ b/json/custom.steamClosetOperatingState.i18n.fr.json
@@ -13,18 +13,18 @@
             "i18n": {}
         },
         "steamClosetMachineState": {
-            "label": "steamClosetMachineState",
+            "label": "État de l'appareil",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
                 "value": {
                     "stop": {
-                        "label": "stop"
+                        "label": "Activation"
                     },
                     "run": {
-                        "label": "run"
+                        "label": "Nettoyage"
                     },
                     "pause": {
-                        "label": "pause"
+                        "label": "Pause"
                     }
                 }
             }
diff --git a/json/custom.steamClosetOperatingState.json b/json/custom.steamClosetOperatingState.json
index fadea4ac..f11f218b 100755
--- a/json/custom.steamClosetOperatingState.json
+++ b/json/custom.steamClosetOperatingState.json
@@ -70,7 +70,6 @@
                     "value"
                 ]
             },
-            "setter": "setSteamClosetMachineState",
             "enumCommands": []
         },
         "supportedSteamClosetMachineState": {
@@ -178,7 +177,6 @@
                     "value"
                 ]
             },
-            "setter": "setSteamClosetDelayEndTime",
             "enumCommands": []
         },
         "remainingTime": {
@@ -218,7 +216,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setSteamClosetMachineState": {
             "name": "setSteamClosetMachineState",
@@ -235,7 +234,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.steamClosetOperatingStatePresentation.json b/json/custom.steamClosetOperatingStatePresentation.json
index c5bad492..bde8c5da 100755
--- a/json/custom.steamClosetOperatingStatePresentation.json
+++ b/json/custom.steamClosetOperatingStatePresentation.json
@@ -2,21 +2,21 @@
     "dashboard": {
         "states": [
             {
-                "label": "{{operatingState.value}}",
+                "label": "{{steamClosetMachineState.value}}",
                 "alternatives": [
                     {
-                        "key": "ready",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.ready.label}}",
+                        "key": "stop",
+                        "value": "On",
                         "type": "active"
                     },
                     {
-                        "key": "running",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.running.label}}",
+                        "key": "run",
+                        "value": "Caring",
                         "type": "active"
                     },
                     {
-                        "key": "paused",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.paused.label}}",
+                        "key": "pause",
+                        "value": "Paused",
                         "type": "active"
                     }
                 ]
@@ -26,42 +26,42 @@
                 "alternatives": [
                     {
                         "key": "drying",
-                        "value": "{{i18n.attributes.steamClosetJobState.i18n.value.drying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "steaming",
-                        "value": "{{i18n.attributes.steamClosetJobState.i18n.value.steaming.label}}",
+                        "value": "Steaming",
                         "type": "active"
                     },
                     {
                         "key": "airwashing",
-                        "value": "{{i18n.attributes.steamClosetJobState.i18n.value.airwashing.label}}",
+                        "value": "Aircleaning",
                         "type": "active"
                     },
                     {
                         "key": "sterilizing",
-                        "value": "{{i18n.attributes.steamClosetJobState.i18n.value.sterilizing.label}}",
+                        "value": "Sanitizing",
                         "type": "active"
                     },
                     {
                         "key": "dehumidifying",
-                        "value": "{{i18n.attributes.steamClosetJobState.i18n.value.dehumidifying.label}}",
+                        "value": "Dehumidifying",
                         "type": "active"
                     },
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.steamClosetJobState.i18n.value.none.label}}",
+                        "value": "Preparing",
                         "type": "active"
                     },
                     {
                         "key": "descaling",
-                        "value": "{{i18n.attributes.steamClosetJobState.i18n.value.descaling.label}}",
+                        "value": "Descaling",
                         "type": "active"
                     },
                     {
                         "key": "descalingFinish",
-                        "value": "{{i18n.attributes.steamClosetJobState.i18n.value.descalingFinish.label}}",
+                        "value": "Cycle complete",
                         "type": "active"
                     }
                 ]
@@ -70,7 +70,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.commands.start.label}}",
+                "label": "Start",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "setSteamClosetMachineState",
@@ -88,7 +88,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.cancel.label}}",
+                "label": "Cancel",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "setSteamClosetMachineState",
@@ -106,7 +106,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.pause.label}}",
+                "label": "Pause",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "setSteamClosetMachineState",
@@ -124,7 +124,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.resume.label}}",
+                "label": "Resume",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "setSteamClosetMachineState",
@@ -142,7 +142,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.ok.label}}",
+                "label": "OK",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "setSteamClosetMachineState",
@@ -163,43 +163,69 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Device status",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "stop",
+                            "value": "Ready",
+                            "type": "active"
+                        },
+                        {
+                            "key": "run",
+                            "value": "Caring",
+                            "type": "active"
+                        },
+                        {
+                            "key": "pause",
+                            "value": "Paused",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "steamClosetMachineState.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Caring Progress",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "drying",
-                            "value": "{{i18n.attributes.steamClosetJobState.i18n.value.drying.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "steaming",
-                            "value": "{{i18n.attributes.steamClosetJobState.i18n.value.steaming.label}}",
+                            "value": "Steaming",
                             "type": "active"
                         },
                         {
                             "key": "airwashing",
-                            "value": "{{i18n.attributes.steamClosetJobState.i18n.value.airwashing.label}}",
+                            "value": "Aircleaning",
                             "type": "active"
                         },
                         {
                             "key": "sterilizing",
-                            "value": "{{i18n.attributes.steamClosetJobState.i18n.value.sterilizing.label}}",
+                            "value": "Sanitizing",
                             "type": "active"
                         },
                         {
                             "key": "dehumidifying",
-                            "value": "{{i18n.attributes.steamClosetJobState.i18n.value.dehumidifying.label}}",
+                            "value": "Dehumidifying",
                             "type": "active"
                         },
                         {
                             "key": "finish",
-                            "value": "{{i18n.attributes.steamClosetJobState.i18n.value.finish.label}}",
+                            "value": "Cycle complete",
                             "type": "active"
                         },
                         {
                             "key": "keepFresh",
-                            "value": "{{i18n.attributes.steamClosetJobState.i18n.value.keepFresh.label}}",
+                            "value": "Keep fresh",
                             "type": "active"
                         }
                     ],
diff --git a/json/custom.steamClosetSilentMode.json b/json/custom.steamClosetSilentMode.json
index 16608f15..bf3fc30a 100755
--- a/json/custom.steamClosetSilentMode.json
+++ b/json/custom.steamClosetSilentMode.json
@@ -23,7 +23,6 @@
                     "value"
                 ]
             },
-            "setter": "setSteamClosetSilentMode",
             "enumCommands": []
         }
     },
@@ -43,7 +42,8 @@
                         "title": "SteamClosetSilentMode"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.steamClosetWrinklePrevent.json b/json/custom.steamClosetWrinklePrevent.json
index 3698fd03..b5e849cd 100755
--- a/json/custom.steamClosetWrinklePrevent.json
+++ b/json/custom.steamClosetWrinklePrevent.json
@@ -23,7 +23,6 @@
                     "value"
                 ]
             },
-            "setter": "setSteamClosetWrinklePrevent",
             "enumCommands": []
         }
     },
@@ -43,7 +42,8 @@
                         "title": "SteamClosetWrinklePrevent"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.supportedOptionsPresentation.json b/json/custom.supportedOptionsPresentation.json
index 8987296a..3cdf5793 100644
--- a/json/custom.supportedOptionsPresentation.json
+++ b/json/custom.supportedOptionsPresentation.json
@@ -4,7 +4,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.label}}",
+                "label": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT",
                 "displayType": "list",
                 "list": {
                     "command": {
@@ -12,912 +12,917 @@
                         "alternatives": [
                             {
                                 "key": "01",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.01.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_01",
                                 "type": "active"
                             },
                             {
                                 "key": "02",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.02.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_02",
                                 "type": "active"
                             },
                             {
                                 "key": "03",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.03.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_03",
                                 "type": "active"
                             },
                             {
                                 "key": "04",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.04.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_04",
                                 "type": "active"
                             },
                             {
                                 "key": "05",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.05.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_05",
                                 "type": "active"
                             },
                             {
                                 "key": "06",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.06.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_06",
                                 "type": "active"
                             },
                             {
                                 "key": "07",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.07.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_07",
                                 "type": "active"
                             },
                             {
                                 "key": "08",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.08.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_08",
                                 "type": "active"
                             },
                             {
                                 "key": "09",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.09.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_09",
                                 "type": "active"
                             },
                             {
                                 "key": "0A",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.0A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_0A",
                                 "type": "active"
                             },
                             {
                                 "key": "0B",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.0B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_0B",
                                 "type": "active"
                             },
                             {
                                 "key": "0C",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.0C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_0C",
                                 "type": "active"
                             },
                             {
                                 "key": "0D",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.0D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_0D",
                                 "type": "active"
                             },
                             {
                                 "key": "0E",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.0E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_0E",
                                 "type": "active"
                             },
                             {
                                 "key": "0F",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.0F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_0F",
                                 "type": "active"
                             },
                             {
                                 "key": "10",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.10.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_10",
                                 "type": "active"
                             },
                             {
                                 "key": "11",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.11.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_11",
                                 "type": "active"
                             },
                             {
                                 "key": "12",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.12.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_12",
                                 "type": "active"
                             },
                             {
                                 "key": "13",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.13.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_13",
                                 "type": "active"
                             },
                             {
                                 "key": "14",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.14.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_14",
                                 "type": "active"
                             },
                             {
                                 "key": "15",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.15.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_15",
                                 "type": "active"
                             },
                             {
                                 "key": "16",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.16.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_16",
                                 "type": "active"
                             },
                             {
                                 "key": "17",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.17.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_17",
                                 "type": "active"
                             },
                             {
                                 "key": "18",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.18.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_18",
                                 "type": "active"
                             },
                             {
                                 "key": "19",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.19.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_19",
                                 "type": "active"
                             },
                             {
                                 "key": "1A",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.1A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_1A",
                                 "type": "active"
                             },
                             {
                                 "key": "1B",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.1B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_1B",
                                 "type": "active"
                             },
                             {
                                 "key": "1C",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.1C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_1C",
                                 "type": "active"
                             },
                             {
                                 "key": "1D",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.1D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_1D",
                                 "type": "active"
                             },
                             {
                                 "key": "1E",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.1E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_1E",
                                 "type": "active"
                             },
                             {
                                 "key": "1F",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.1F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_1F",
                                 "type": "active"
                             },
                             {
                                 "key": "20",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.20.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_20",
                                 "type": "active"
                             },
                             {
                                 "key": "21",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.21.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_21",
                                 "type": "active"
                             },
                             {
                                 "key": "22",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.22.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_22",
                                 "type": "active"
                             },
                             {
                                 "key": "23",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.23.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_23",
                                 "type": "active"
                             },
                             {
                                 "key": "24",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.24.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_24",
                                 "type": "active"
                             },
                             {
                                 "key": "25",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.25.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_25",
                                 "type": "active"
                             },
                             {
                                 "key": "26",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.26.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_26",
                                 "type": "active"
                             },
                             {
                                 "key": "27",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.27.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_27",
                                 "type": "active"
                             },
                             {
                                 "key": "28",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.28.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_28",
                                 "type": "active"
                             },
                             {
                                 "key": "29",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.29.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_29",
                                 "type": "active"
                             },
                             {
                                 "key": "2A",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.2A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_2A",
                                 "type": "active"
                             },
                             {
                                 "key": "2B",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.2B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_2B",
                                 "type": "active"
                             },
                             {
                                 "key": "2C",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.2C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_2C",
                                 "type": "active"
                             },
                             {
                                 "key": "2D",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.2D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_2D",
                                 "type": "active"
                             },
                             {
                                 "key": "2E",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.2E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_2E",
                                 "type": "active"
                             },
                             {
                                 "key": "2F",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.2F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_2F",
                                 "type": "active"
                             },
                             {
                                 "key": "30",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.30.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_30",
                                 "type": "active"
                             },
                             {
                                 "key": "31",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.31.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_31",
                                 "type": "active"
                             },
                             {
                                 "key": "32",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.32.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_32",
                                 "type": "active"
                             },
                             {
                                 "key": "33",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.33.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_33",
                                 "type": "active"
                             },
                             {
                                 "key": "34",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.34.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_34",
                                 "type": "active"
                             },
                             {
                                 "key": "35",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.35.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_35",
                                 "type": "active"
                             },
                             {
                                 "key": "36",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.36.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_36",
                                 "type": "active"
                             },
                             {
                                 "key": "37",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.37.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_37",
                                 "type": "active"
                             },
                             {
                                 "key": "38",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.38.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_38",
                                 "type": "active"
                             },
                             {
                                 "key": "39",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.39.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_39",
                                 "type": "active"
                             },
                             {
                                 "key": "3A",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.3A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_3A",
                                 "type": "active"
                             },
                             {
                                 "key": "3B",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.3B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_3B",
                                 "type": "active"
                             },
                             {
                                 "key": "3C",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.3C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_3C",
                                 "type": "active"
                             },
                             {
                                 "key": "3D",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.3D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_3D",
                                 "type": "active"
                             },
                             {
                                 "key": "3E",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.3E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_3E",
                                 "type": "active"
                             },
                             {
                                 "key": "3F",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.3F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_3F",
                                 "type": "active"
                             },
                             {
                                 "key": "40",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.40.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_40",
                                 "type": "active"
                             },
                             {
                                 "key": "41",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.41.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_41",
                                 "type": "active"
                             },
                             {
                                 "key": "42",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.42.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_42",
                                 "type": "active"
                             },
                             {
                                 "key": "43",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.43.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_43",
                                 "type": "active"
                             },
                             {
                                 "key": "44",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.44.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_44",
                                 "type": "active"
                             },
                             {
                                 "key": "45",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.45.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_45",
                                 "type": "active"
                             },
                             {
                                 "key": "46",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.46.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_46",
                                 "type": "active"
                             },
                             {
                                 "key": "47",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.47.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_47",
                                 "type": "active"
                             },
                             {
                                 "key": "48",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.48.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_48",
                                 "type": "active"
                             },
                             {
                                 "key": "49",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.49.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_49",
                                 "type": "active"
                             },
                             {
                                 "key": "4A",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.4A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_4A",
                                 "type": "active"
                             },
                             {
                                 "key": "4B",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.4B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_4B",
                                 "type": "active"
                             },
                             {
                                 "key": "4C",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.4C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_4C",
                                 "type": "active"
                             },
                             {
                                 "key": "4D",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.4D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_4D",
                                 "type": "active"
                             },
                             {
                                 "key": "4E",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.4E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_4E",
                                 "type": "active"
                             },
                             {
                                 "key": "4F",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.4F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_4F",
                                 "type": "active"
                             },
                             {
                                 "key": "50",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.50.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_50",
                                 "type": "active"
                             },
                             {
                                 "key": "51",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.51.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_51",
                                 "type": "active"
                             },
                             {
                                 "key": "52",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.52.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_52",
                                 "type": "active"
                             },
                             {
                                 "key": "53",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.53.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_53",
                                 "type": "active"
                             },
                             {
                                 "key": "54",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.54.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_54",
                                 "type": "active"
                             },
                             {
                                 "key": "55",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.55.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_55",
                                 "type": "active"
                             },
                             {
                                 "key": "56",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.56.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_56",
                                 "type": "active"
                             },
                             {
                                 "key": "57",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.57.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_57",
                                 "type": "active"
                             },
                             {
                                 "key": "58",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.58.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_58",
                                 "type": "active"
                             },
                             {
                                 "key": "59",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.59.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_59",
                                 "type": "active"
                             },
                             {
                                 "key": "5A",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.5A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_5A",
                                 "type": "active"
                             },
                             {
                                 "key": "5B",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.5B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_5B",
                                 "type": "active"
                             },
                             {
                                 "key": "5C",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.5C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_5C",
                                 "type": "active"
                             },
                             {
                                 "key": "5D",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.5D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_5D",
                                 "type": "active"
                             },
                             {
                                 "key": "5E",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.5E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_5E",
                                 "type": "active"
                             },
                             {
                                 "key": "5F",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.5F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_5F",
                                 "type": "active"
                             },
                             {
                                 "key": "60",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.60.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_60",
                                 "type": "active"
                             },
                             {
                                 "key": "61",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.61.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_61",
                                 "type": "active"
                             },
                             {
                                 "key": "62",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.62.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_62",
                                 "type": "active"
                             },
                             {
                                 "key": "63",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.63.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_63",
                                 "type": "active"
                             },
                             {
                                 "key": "64",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.64.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_64",
                                 "type": "active"
                             },
                             {
                                 "key": "65",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.65.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_65",
                                 "type": "active"
                             },
                             {
                                 "key": "66",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.66.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_66",
                                 "type": "active"
                             },
                             {
                                 "key": "67",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.67.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_67",
                                 "type": "active"
                             },
                             {
                                 "key": "68",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.68.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_68",
                                 "type": "active"
                             },
                             {
                                 "key": "69",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.69.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_69",
                                 "type": "active"
                             },
                             {
                                 "key": "6A",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.6A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_6A",
                                 "type": "active"
                             },
                             {
                                 "key": "6B",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.6B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_6B",
                                 "type": "active"
                             },
                             {
                                 "key": "6C",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.6C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_6C",
                                 "type": "active"
                             },
                             {
                                 "key": "6D",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.6D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_6D",
                                 "type": "active"
                             },
                             {
                                 "key": "6E",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.6E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_6E",
                                 "type": "active"
                             },
                             {
                                 "key": "6F",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.6F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_6F",
                                 "type": "active"
                             },
                             {
                                 "key": "70",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.70.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_70",
                                 "type": "active"
                             },
                             {
                                 "key": "71",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.71.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_71",
                                 "type": "active"
                             },
                             {
                                 "key": "72",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.72.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_72",
                                 "type": "active"
                             },
                             {
                                 "key": "73",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.73.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_73",
                                 "type": "active"
                             },
                             {
                                 "key": "74",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.74.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_74",
                                 "type": "active"
                             },
                             {
                                 "key": "75",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.75.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_75",
                                 "type": "active"
                             },
                             {
                                 "key": "76",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.76.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_76",
                                 "type": "active"
                             },
                             {
                                 "key": "77",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.77.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_77",
                                 "type": "active"
                             },
                             {
                                 "key": "78",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.78.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_78",
                                 "type": "active"
                             },
                             {
                                 "key": "79",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.79.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_79",
                                 "type": "active"
                             },
                             {
                                 "key": "7A",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.7A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_7A",
                                 "type": "active"
                             },
                             {
                                 "key": "7B",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.7B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_7B",
                                 "type": "active"
                             },
                             {
                                 "key": "7C",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.7C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_7C",
                                 "type": "active"
                             },
                             {
                                 "key": "7D",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.7D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_7D",
                                 "type": "active"
                             },
                             {
                                 "key": "7E",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.7E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_7E",
                                 "type": "active"
                             },
                             {
                                 "key": "7F",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.7F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_7F",
                                 "type": "active"
                             },
                             {
                                 "key": "80",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.80.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_80",
                                 "type": "active"
                             },
                             {
                                 "key": "81",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.81.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_81",
                                 "type": "active"
                             },
                             {
                                 "key": "82",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.82.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_82",
                                 "type": "active"
                             },
                             {
                                 "key": "83",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.83.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_83",
                                 "type": "active"
                             },
                             {
                                 "key": "84",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.84.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_84",
                                 "type": "active"
                             },
                             {
                                 "key": "85",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.85.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_85",
                                 "type": "active"
                             },
                             {
                                 "key": "86",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.86.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_86",
                                 "type": "active"
                             },
                             {
                                 "key": "87",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.87.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_87",
                                 "type": "active"
                             },
                             {
                                 "key": "88",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.88.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_88",
                                 "type": "active"
                             },
                             {
                                 "key": "89",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.89.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_89",
                                 "type": "active"
                             },
                             {
                                 "key": "8A",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.8A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_8A",
                                 "type": "active"
                             },
                             {
                                 "key": "8B",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.8B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_8B",
                                 "type": "active"
                             },
                             {
                                 "key": "8C",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.8C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_8C",
                                 "type": "active"
                             },
                             {
                                 "key": "8D",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.8D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_8D",
                                 "type": "active"
                             },
                             {
                                 "key": "8E",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.8E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_8E",
                                 "type": "active"
                             },
                             {
                                 "key": "8F",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.8F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_8F",
                                 "type": "active"
                             },
                             {
                                 "key": "90",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.90.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_90",
                                 "type": "active"
                             },
                             {
                                 "key": "91",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.91.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_91",
                                 "type": "active"
                             },
                             {
                                 "key": "92",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.92.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_92",
                                 "type": "active"
                             },
                             {
                                 "key": "93",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.93.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_93",
                                 "type": "active"
                             },
                             {
                                 "key": "94",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.94.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_94",
                                 "type": "active"
                             },
                             {
                                 "key": "95",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.95.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_95",
                                 "type": "active"
                             },
                             {
                                 "key": "96",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.96.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_96",
                                 "type": "active"
                             },
                             {
                                 "key": "97",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.97.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_97",
                                 "type": "active"
                             },
                             {
                                 "key": "98",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.98.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_98",
                                 "type": "active"
                             },
                             {
                                 "key": "99",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.99.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_99",
                                 "type": "active"
                             },
                             {
                                 "key": "9A",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.9A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_9A",
                                 "type": "active"
                             },
                             {
                                 "key": "9B",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.9B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_9B",
                                 "type": "active"
                             },
                             {
                                 "key": "9C",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.9C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_9C",
                                 "type": "active"
                             },
                             {
                                 "key": "9D",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.9D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_9D",
                                 "type": "active"
                             },
                             {
                                 "key": "9E",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.9E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_9E",
                                 "type": "active"
                             },
                             {
                                 "key": "9F",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.9F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_9F",
                                 "type": "active"
                             },
                             {
                                 "key": "A0",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.A0.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_A0",
                                 "type": "active"
                             },
                             {
                                 "key": "A1",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.A1.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_A1",
                                 "type": "active"
                             },
                             {
                                 "key": "A2",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.A2.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_A2",
                                 "type": "active"
                             },
                             {
                                 "key": "A3",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.A3.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_A3",
                                 "type": "active"
                             },
                             {
                                 "key": "A4",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.A4.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_A4",
                                 "type": "active"
                             },
                             {
                                 "key": "A5",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.A5.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_A5",
                                 "type": "active"
                             },
                             {
                                 "key": "A6",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.A6.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_A6",
                                 "type": "active"
                             },
                             {
                                 "key": "A7",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.A7.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_A7",
                                 "type": "active"
                             },
                             {
                                 "key": "A8",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.A8.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_A8",
                                 "type": "active"
                             },
                             {
                                 "key": "A9",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.A9.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_A9",
                                 "type": "active"
                             },
                             {
                                 "key": "AA",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.AA.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_AA",
                                 "type": "active"
                             },
                             {
                                 "key": "AB",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.AB.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_AB",
                                 "type": "active"
                             },
                             {
                                 "key": "AC",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.AC.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_AC",
                                 "type": "active"
                             },
                             {
                                 "key": "AD",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.AD.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_AD",
                                 "type": "active"
                             },
                             {
                                 "key": "AE",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.AE.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_AE",
                                 "type": "active"
                             },
                             {
                                 "key": "AF",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.AF.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_AF",
                                 "type": "active"
                             },
                             {
                                 "key": "B0",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.B0.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_B0",
                                 "type": "active"
                             },
                             {
                                 "key": "B1",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.B1.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_B1",
                                 "type": "active"
                             },
                             {
                                 "key": "B2",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.B2.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_B2",
                                 "type": "active"
                             },
                             {
                                 "key": "B3",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.B3.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_B3",
                                 "type": "active"
                             },
                             {
                                 "key": "B4",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.B4.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_B4",
                                 "type": "active"
                             },
                             {
                                 "key": "B5",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.B5.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_B5",
                                 "type": "active"
                             },
                             {
                                 "key": "B6",
-                                "value": "{{i18n.commands.setCourse.arguments.course.i18n.B6.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_B6",
+                                "type": "active"
+                            },
+                            {
+                                "key": "B7",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_COMMANDS_SETCOURSE_COURSE_B7",
                                 "type": "active"
                             }
                         ],
@@ -930,967 +935,972 @@
                         "alternatives": [
                             {
                                 "key": "01",
-                                "value": "{{i18n.attributes.course.i18n.value.01.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_01",
                                 "type": "active"
                             },
                             {
                                 "key": "02",
-                                "value": "{{i18n.attributes.course.i18n.value.02.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_02",
                                 "type": "active"
                             },
                             {
                                 "key": "03",
-                                "value": "{{i18n.attributes.course.i18n.value.03.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_03",
                                 "type": "active"
                             },
                             {
                                 "key": "04",
-                                "value": "{{i18n.attributes.course.i18n.value.04.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_04",
                                 "type": "active"
                             },
                             {
                                 "key": "05",
-                                "value": "{{i18n.attributes.course.i18n.value.05.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_05",
                                 "type": "active"
                             },
                             {
                                 "key": "06",
-                                "value": "{{i18n.attributes.course.i18n.value.06.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_06",
                                 "type": "active"
                             },
                             {
                                 "key": "07",
-                                "value": "{{i18n.attributes.course.i18n.value.07.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_07",
                                 "type": "active"
                             },
                             {
                                 "key": "08",
-                                "value": "{{i18n.attributes.course.i18n.value.08.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_08",
                                 "type": "active"
                             },
                             {
                                 "key": "09",
-                                "value": "{{i18n.attributes.course.i18n.value.09.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_09",
                                 "type": "active"
                             },
                             {
                                 "key": "0A",
-                                "value": "{{i18n.attributes.course.i18n.value.0A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_0A",
                                 "type": "active"
                             },
                             {
                                 "key": "0B",
-                                "value": "{{i18n.attributes.course.i18n.value.0B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_0B",
                                 "type": "active"
                             },
                             {
                                 "key": "0C",
-                                "value": "{{i18n.attributes.course.i18n.value.0C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_0C",
                                 "type": "active"
                             },
                             {
                                 "key": "0D",
-                                "value": "{{i18n.attributes.course.i18n.value.0D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_0D",
                                 "type": "active"
                             },
                             {
                                 "key": "0E",
-                                "value": "{{i18n.attributes.course.i18n.value.0E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_0E",
                                 "type": "active"
                             },
                             {
                                 "key": "0F",
-                                "value": "{{i18n.attributes.course.i18n.value.0F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_0F",
                                 "type": "active"
                             },
                             {
                                 "key": "10",
-                                "value": "{{i18n.attributes.course.i18n.value.10.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_10",
                                 "type": "active"
                             },
                             {
                                 "key": "11",
-                                "value": "{{i18n.attributes.course.i18n.value.11.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_11",
                                 "type": "active"
                             },
                             {
                                 "key": "12",
-                                "value": "{{i18n.attributes.course.i18n.value.12.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_12",
                                 "type": "active"
                             },
                             {
                                 "key": "13",
-                                "value": "{{i18n.attributes.course.i18n.value.13.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_13",
                                 "type": "active"
                             },
                             {
                                 "key": "14",
-                                "value": "{{i18n.attributes.course.i18n.value.14.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_14",
                                 "type": "active"
                             },
                             {
                                 "key": "15",
-                                "value": "{{i18n.attributes.course.i18n.value.15.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_15",
                                 "type": "active"
                             },
                             {
                                 "key": "16",
-                                "value": "{{i18n.attributes.course.i18n.value.16.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_16",
                                 "type": "active"
                             },
                             {
                                 "key": "17",
-                                "value": "{{i18n.attributes.course.i18n.value.17.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_17",
                                 "type": "active"
                             },
                             {
                                 "key": "18",
-                                "value": "{{i18n.attributes.course.i18n.value.18.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_18",
                                 "type": "active"
                             },
                             {
                                 "key": "19",
-                                "value": "{{i18n.attributes.course.i18n.value.19.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_19",
                                 "type": "active"
                             },
                             {
                                 "key": "1A",
-                                "value": "{{i18n.attributes.course.i18n.value.1A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_1A",
                                 "type": "active"
                             },
                             {
                                 "key": "1B",
-                                "value": "{{i18n.attributes.course.i18n.value.1B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_1B",
                                 "type": "active"
                             },
                             {
                                 "key": "1C",
-                                "value": "{{i18n.attributes.course.i18n.value.1C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_1C",
                                 "type": "active"
                             },
                             {
                                 "key": "1D",
-                                "value": "{{i18n.attributes.course.i18n.value.1D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_1D",
                                 "type": "active"
                             },
                             {
                                 "key": "1E",
-                                "value": "{{i18n.attributes.course.i18n.value.1E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_1E",
                                 "type": "active"
                             },
                             {
                                 "key": "1F",
-                                "value": "{{i18n.attributes.course.i18n.value.1F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_1F",
                                 "type": "active"
                             },
                             {
                                 "key": "20",
-                                "value": "{{i18n.attributes.course.i18n.value.20.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_20",
                                 "type": "active"
                             },
                             {
                                 "key": "21",
-                                "value": "{{i18n.attributes.course.i18n.value.21.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_21",
                                 "type": "active"
                             },
                             {
                                 "key": "22",
-                                "value": "{{i18n.attributes.course.i18n.value.22.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_22",
                                 "type": "active"
                             },
                             {
                                 "key": "23",
-                                "value": "{{i18n.attributes.course.i18n.value.23.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_23",
                                 "type": "active"
                             },
                             {
                                 "key": "24",
-                                "value": "{{i18n.attributes.course.i18n.value.24.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_24",
                                 "type": "active"
                             },
                             {
                                 "key": "25",
-                                "value": "{{i18n.attributes.course.i18n.value.25.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_25",
                                 "type": "active"
                             },
                             {
                                 "key": "26",
-                                "value": "{{i18n.attributes.course.i18n.value.26.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_26",
                                 "type": "active"
                             },
                             {
                                 "key": "27",
-                                "value": "{{i18n.attributes.course.i18n.value.27.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_27",
                                 "type": "active"
                             },
                             {
                                 "key": "28",
-                                "value": "{{i18n.attributes.course.i18n.value.28.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_28",
                                 "type": "active"
                             },
                             {
                                 "key": "29",
-                                "value": "{{i18n.attributes.course.i18n.value.29.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_29",
                                 "type": "active"
                             },
                             {
                                 "key": "2A",
-                                "value": "{{i18n.attributes.course.i18n.value.2A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_2A",
                                 "type": "active"
                             },
                             {
                                 "key": "2B",
-                                "value": "{{i18n.attributes.course.i18n.value.2B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_2B",
                                 "type": "active"
                             },
                             {
                                 "key": "2C",
-                                "value": "{{i18n.attributes.course.i18n.value.2C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_2C",
                                 "type": "active"
                             },
                             {
                                 "key": "2D",
-                                "value": "{{i18n.attributes.course.i18n.value.2D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_2D",
                                 "type": "active"
                             },
                             {
                                 "key": "2E",
-                                "value": "{{i18n.attributes.course.i18n.value.2E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_2E",
                                 "type": "active"
                             },
                             {
                                 "key": "2F",
-                                "value": "{{i18n.attributes.course.i18n.value.2F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_2F",
                                 "type": "active"
                             },
                             {
                                 "key": "30",
-                                "value": "{{i18n.attributes.course.i18n.value.30.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_30",
                                 "type": "active"
                             },
                             {
                                 "key": "31",
-                                "value": "{{i18n.attributes.course.i18n.value.31.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_31",
                                 "type": "active"
                             },
                             {
                                 "key": "32",
-                                "value": "{{i18n.attributes.course.i18n.value.32.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_32",
                                 "type": "active"
                             },
                             {
                                 "key": "33",
-                                "value": "{{i18n.attributes.course.i18n.value.33.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_33",
                                 "type": "active"
                             },
                             {
                                 "key": "34",
-                                "value": "{{i18n.attributes.course.i18n.value.34.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_34",
                                 "type": "active"
                             },
                             {
                                 "key": "35",
-                                "value": "{{i18n.attributes.course.i18n.value.35.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_35",
                                 "type": "active"
                             },
                             {
                                 "key": "36",
-                                "value": "{{i18n.attributes.course.i18n.value.36.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_36",
                                 "type": "active"
                             },
                             {
                                 "key": "37",
-                                "value": "{{i18n.attributes.course.i18n.value.37.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_37",
                                 "type": "active"
                             },
                             {
                                 "key": "38",
-                                "value": "{{i18n.attributes.course.i18n.value.38.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_38",
                                 "type": "active"
                             },
                             {
                                 "key": "39",
-                                "value": "{{i18n.attributes.course.i18n.value.39.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_39",
                                 "type": "active"
                             },
                             {
                                 "key": "3A",
-                                "value": "{{i18n.attributes.course.i18n.value.3A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_3A",
                                 "type": "active"
                             },
                             {
                                 "key": "3B",
-                                "value": "{{i18n.attributes.course.i18n.value.3B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_3B",
                                 "type": "active"
                             },
                             {
                                 "key": "3C",
-                                "value": "{{i18n.attributes.course.i18n.value.3C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_3C",
                                 "type": "active"
                             },
                             {
                                 "key": "3D",
-                                "value": "{{i18n.attributes.course.i18n.value.3D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_3D",
                                 "type": "active"
                             },
                             {
                                 "key": "3E",
-                                "value": "{{i18n.attributes.course.i18n.value.3E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_3E",
                                 "type": "active"
                             },
                             {
                                 "key": "3F",
-                                "value": "{{i18n.attributes.course.i18n.value.3F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_3F",
                                 "type": "active"
                             },
                             {
                                 "key": "40",
-                                "value": "{{i18n.attributes.course.i18n.value.40.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_40",
                                 "type": "active"
                             },
                             {
                                 "key": "41",
-                                "value": "{{i18n.attributes.course.i18n.value.41.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_41",
                                 "type": "active"
                             },
                             {
                                 "key": "42",
-                                "value": "{{i18n.attributes.course.i18n.value.42.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_42",
                                 "type": "active"
                             },
                             {
                                 "key": "43",
-                                "value": "{{i18n.attributes.course.i18n.value.43.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_43",
                                 "type": "active"
                             },
                             {
                                 "key": "44",
-                                "value": "{{i18n.attributes.course.i18n.value.44.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_44",
                                 "type": "active"
                             },
                             {
                                 "key": "45",
-                                "value": "{{i18n.attributes.course.i18n.value.45.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_45",
                                 "type": "active"
                             },
                             {
                                 "key": "46",
-                                "value": "{{i18n.attributes.course.i18n.value.46.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_46",
                                 "type": "active"
                             },
                             {
                                 "key": "47",
-                                "value": "{{i18n.attributes.course.i18n.value.47.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_47",
                                 "type": "active"
                             },
                             {
                                 "key": "48",
-                                "value": "{{i18n.attributes.course.i18n.value.48.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_48",
                                 "type": "active"
                             },
                             {
                                 "key": "49",
-                                "value": "{{i18n.attributes.course.i18n.value.49.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_49",
                                 "type": "active"
                             },
                             {
                                 "key": "4A",
-                                "value": "{{i18n.attributes.course.i18n.value.4A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_4A",
                                 "type": "active"
                             },
                             {
                                 "key": "4B",
-                                "value": "{{i18n.attributes.course.i18n.value.4B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_4B",
                                 "type": "active"
                             },
                             {
                                 "key": "4C",
-                                "value": "{{i18n.attributes.course.i18n.value.4C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_4C",
                                 "type": "active"
                             },
                             {
                                 "key": "4D",
-                                "value": "{{i18n.attributes.course.i18n.value.4D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_4D",
                                 "type": "active"
                             },
                             {
                                 "key": "4E",
-                                "value": "{{i18n.attributes.course.i18n.value.4E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_4E",
                                 "type": "active"
                             },
                             {
                                 "key": "4F",
-                                "value": "{{i18n.attributes.course.i18n.value.4F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_4F",
                                 "type": "active"
                             },
                             {
                                 "key": "50",
-                                "value": "{{i18n.attributes.course.i18n.value.50.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_50",
                                 "type": "active"
                             },
                             {
                                 "key": "51",
-                                "value": "{{i18n.attributes.course.i18n.value.51.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_51",
                                 "type": "active"
                             },
                             {
                                 "key": "52",
-                                "value": "{{i18n.attributes.course.i18n.value.52.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_52",
                                 "type": "active"
                             },
                             {
                                 "key": "53",
-                                "value": "{{i18n.attributes.course.i18n.value.53.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_53",
                                 "type": "active"
                             },
                             {
                                 "key": "54",
-                                "value": "{{i18n.attributes.course.i18n.value.54.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_54",
                                 "type": "active"
                             },
                             {
                                 "key": "55",
-                                "value": "{{i18n.attributes.course.i18n.value.55.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_55",
                                 "type": "active"
                             },
                             {
                                 "key": "56",
-                                "value": "{{i18n.attributes.course.i18n.value.56.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_56",
                                 "type": "active"
                             },
                             {
                                 "key": "57",
-                                "value": "{{i18n.attributes.course.i18n.value.57.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_57",
                                 "type": "active"
                             },
                             {
                                 "key": "58",
-                                "value": "{{i18n.attributes.course.i18n.value.58.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_58",
                                 "type": "active"
                             },
                             {
                                 "key": "59",
-                                "value": "{{i18n.attributes.course.i18n.value.59.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_59",
                                 "type": "active"
                             },
                             {
                                 "key": "5A",
-                                "value": "{{i18n.attributes.course.i18n.value.5A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_5A",
                                 "type": "active"
                             },
                             {
                                 "key": "5B",
-                                "value": "{{i18n.attributes.course.i18n.value.5B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_5B",
                                 "type": "active"
                             },
                             {
                                 "key": "5C",
-                                "value": "{{i18n.attributes.course.i18n.value.5C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_5C",
                                 "type": "active"
                             },
                             {
                                 "key": "5D",
-                                "value": "{{i18n.attributes.course.i18n.value.5D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_5D",
                                 "type": "active"
                             },
                             {
                                 "key": "5E",
-                                "value": "{{i18n.attributes.course.i18n.value.5E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_5E",
                                 "type": "active"
                             },
                             {
                                 "key": "5F",
-                                "value": "{{i18n.attributes.course.i18n.value.5F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_5F",
                                 "type": "active"
                             },
                             {
                                 "key": "60",
-                                "value": "{{i18n.attributes.course.i18n.value.60.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_60",
                                 "type": "active"
                             },
                             {
                                 "key": "61",
-                                "value": "{{i18n.attributes.course.i18n.value.61.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_61",
                                 "type": "active"
                             },
                             {
                                 "key": "62",
-                                "value": "{{i18n.attributes.course.i18n.value.62.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_62",
                                 "type": "active"
                             },
                             {
                                 "key": "63",
-                                "value": "{{i18n.attributes.course.i18n.value.63.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_63",
                                 "type": "active"
                             },
                             {
                                 "key": "64",
-                                "value": "{{i18n.attributes.course.i18n.value.64.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_64",
                                 "type": "active"
                             },
                             {
                                 "key": "65",
-                                "value": "{{i18n.attributes.course.i18n.value.65.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_65",
                                 "type": "active"
                             },
                             {
                                 "key": "66",
-                                "value": "{{i18n.attributes.course.i18n.value.66.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_66",
                                 "type": "active"
                             },
                             {
                                 "key": "67",
-                                "value": "{{i18n.attributes.course.i18n.value.67.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_67",
                                 "type": "active"
                             },
                             {
                                 "key": "68",
-                                "value": "{{i18n.attributes.course.i18n.value.68.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_68",
                                 "type": "active"
                             },
                             {
                                 "key": "69",
-                                "value": "{{i18n.attributes.course.i18n.value.69.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_69",
                                 "type": "active"
                             },
                             {
                                 "key": "6A",
-                                "value": "{{i18n.attributes.course.i18n.value.6A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_6A",
                                 "type": "active"
                             },
                             {
                                 "key": "6B",
-                                "value": "{{i18n.attributes.course.i18n.value.6B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_6B",
                                 "type": "active"
                             },
                             {
                                 "key": "6C",
-                                "value": "{{i18n.attributes.course.i18n.value.6C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_6C",
                                 "type": "active"
                             },
                             {
                                 "key": "6D",
-                                "value": "{{i18n.attributes.course.i18n.value.6D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_6D",
                                 "type": "active"
                             },
                             {
                                 "key": "6E",
-                                "value": "{{i18n.attributes.course.i18n.value.6E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_6E",
                                 "type": "active"
                             },
                             {
                                 "key": "6F",
-                                "value": "{{i18n.attributes.course.i18n.value.6F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_6F",
                                 "type": "active"
                             },
                             {
                                 "key": "70",
-                                "value": "{{i18n.attributes.course.i18n.value.70.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_70",
                                 "type": "active"
                             },
                             {
                                 "key": "71",
-                                "value": "{{i18n.attributes.course.i18n.value.71.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_71",
                                 "type": "active"
                             },
                             {
                                 "key": "72",
-                                "value": "{{i18n.attributes.course.i18n.value.72.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_72",
                                 "type": "active"
                             },
                             {
                                 "key": "73",
-                                "value": "{{i18n.attributes.course.i18n.value.73.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_73",
                                 "type": "active"
                             },
                             {
                                 "key": "74",
-                                "value": "{{i18n.attributes.course.i18n.value.74.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_74",
                                 "type": "active"
                             },
                             {
                                 "key": "75",
-                                "value": "{{i18n.attributes.course.i18n.value.75.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_75",
                                 "type": "active"
                             },
                             {
                                 "key": "76",
-                                "value": "{{i18n.attributes.course.i18n.value.76.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_76",
                                 "type": "active"
                             },
                             {
                                 "key": "77",
-                                "value": "{{i18n.attributes.course.i18n.value.77.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_77",
                                 "type": "active"
                             },
                             {
                                 "key": "78",
-                                "value": "{{i18n.attributes.course.i18n.value.78.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_78",
                                 "type": "active"
                             },
                             {
                                 "key": "79",
-                                "value": "{{i18n.attributes.course.i18n.value.79.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_79",
                                 "type": "active"
                             },
                             {
                                 "key": "7A",
-                                "value": "{{i18n.attributes.course.i18n.value.7A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_7A",
                                 "type": "active"
                             },
                             {
                                 "key": "7B",
-                                "value": "{{i18n.attributes.course.i18n.value.7B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_7B",
                                 "type": "active"
                             },
                             {
                                 "key": "7C",
-                                "value": "{{i18n.attributes.course.i18n.value.7C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_7C",
                                 "type": "active"
                             },
                             {
                                 "key": "7D",
-                                "value": "{{i18n.attributes.course.i18n.value.7D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_7D",
                                 "type": "active"
                             },
                             {
                                 "key": "7E",
-                                "value": "{{i18n.attributes.course.i18n.value.7E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_7E",
                                 "type": "active"
                             },
                             {
                                 "key": "7F",
-                                "value": "{{i18n.attributes.course.i18n.value.7F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_7F",
                                 "type": "active"
                             },
                             {
                                 "key": "80",
-                                "value": "{{i18n.attributes.course.i18n.value.80.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_80",
                                 "type": "active"
                             },
                             {
                                 "key": "81",
-                                "value": "{{i18n.attributes.course.i18n.value.81.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_81",
                                 "type": "active"
                             },
                             {
                                 "key": "82",
-                                "value": "{{i18n.attributes.course.i18n.value.82.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_82",
                                 "type": "active"
                             },
                             {
                                 "key": "83",
-                                "value": "{{i18n.attributes.course.i18n.value.83.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_83",
                                 "type": "active"
                             },
                             {
                                 "key": "84",
-                                "value": "{{i18n.attributes.course.i18n.value.84.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_84",
                                 "type": "active"
                             },
                             {
                                 "key": "85",
-                                "value": "{{i18n.attributes.course.i18n.value.85.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_85",
                                 "type": "active"
                             },
                             {
                                 "key": "86",
-                                "value": "{{i18n.attributes.course.i18n.value.86.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_86",
                                 "type": "active"
                             },
                             {
                                 "key": "87",
-                                "value": "{{i18n.attributes.course.i18n.value.87.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_87",
                                 "type": "active"
                             },
                             {
                                 "key": "88",
-                                "value": "{{i18n.attributes.course.i18n.value.88.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_88",
                                 "type": "active"
                             },
                             {
                                 "key": "89",
-                                "value": "{{i18n.attributes.course.i18n.value.89.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_89",
                                 "type": "active"
                             },
                             {
                                 "key": "8A",
-                                "value": "{{i18n.attributes.course.i18n.value.8A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_8A",
                                 "type": "active"
                             },
                             {
                                 "key": "8B",
-                                "value": "{{i18n.attributes.course.i18n.value.8B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_8B",
                                 "type": "active"
                             },
                             {
                                 "key": "8C",
-                                "value": "{{i18n.attributes.course.i18n.value.8C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_8C",
                                 "type": "active"
                             },
                             {
                                 "key": "8D",
-                                "value": "{{i18n.attributes.course.i18n.value.8D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_8D",
                                 "type": "active"
                             },
                             {
                                 "key": "8E",
-                                "value": "{{i18n.attributes.course.i18n.value.8E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_8E",
                                 "type": "active"
                             },
                             {
                                 "key": "8F",
-                                "value": "{{i18n.attributes.course.i18n.value.8F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_8F",
                                 "type": "active"
                             },
                             {
                                 "key": "90",
-                                "value": "{{i18n.attributes.course.i18n.value.90.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_90",
                                 "type": "active"
                             },
                             {
                                 "key": "91",
-                                "value": "{{i18n.attributes.course.i18n.value.91.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_91",
                                 "type": "active"
                             },
                             {
                                 "key": "92",
-                                "value": "{{i18n.attributes.course.i18n.value.92.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_92",
                                 "type": "active"
                             },
                             {
                                 "key": "93",
-                                "value": "{{i18n.attributes.course.i18n.value.93.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_93",
                                 "type": "active"
                             },
                             {
                                 "key": "94",
-                                "value": "{{i18n.attributes.course.i18n.value.94.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_94",
                                 "type": "active"
                             },
                             {
                                 "key": "95",
-                                "value": "{{i18n.attributes.course.i18n.value.95.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_95",
                                 "type": "active"
                             },
                             {
                                 "key": "96",
-                                "value": "{{i18n.attributes.course.i18n.value.96.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_96",
                                 "type": "active"
                             },
                             {
                                 "key": "97",
-                                "value": "{{i18n.attributes.course.i18n.value.97.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_97",
                                 "type": "active"
                             },
                             {
                                 "key": "98",
-                                "value": "{{i18n.attributes.course.i18n.value.98.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_98",
                                 "type": "active"
                             },
                             {
                                 "key": "99",
-                                "value": "{{i18n.attributes.course.i18n.value.99.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_99",
                                 "type": "active"
                             },
                             {
                                 "key": "9A",
-                                "value": "{{i18n.attributes.course.i18n.value.9A.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_9A",
                                 "type": "active"
                             },
                             {
                                 "key": "9B",
-                                "value": "{{i18n.attributes.course.i18n.value.9B.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_9B",
                                 "type": "active"
                             },
                             {
                                 "key": "9C",
-                                "value": "{{i18n.attributes.course.i18n.value.9C.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_9C",
                                 "type": "active"
                             },
                             {
                                 "key": "9D",
-                                "value": "{{i18n.attributes.course.i18n.value.9D.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_9D",
                                 "type": "active"
                             },
                             {
                                 "key": "9E",
-                                "value": "{{i18n.attributes.course.i18n.value.9E.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_9E",
                                 "type": "active"
                             },
                             {
                                 "key": "9F",
-                                "value": "{{i18n.attributes.course.i18n.value.9F.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_9F",
                                 "type": "active"
                             },
                             {
                                 "key": "A0",
-                                "value": "{{i18n.attributes.course.i18n.value.A0.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_A0",
                                 "type": "active"
                             },
                             {
                                 "key": "A1",
-                                "value": "{{i18n.attributes.course.i18n.value.A1.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_A1",
                                 "type": "active"
                             },
                             {
                                 "key": "A2",
-                                "value": "{{i18n.attributes.course.i18n.value.A2.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_A2",
                                 "type": "active"
                             },
                             {
                                 "key": "A3",
-                                "value": "{{i18n.attributes.course.i18n.value.A3.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_A3",
                                 "type": "active"
                             },
                             {
                                 "key": "A4",
-                                "value": "{{i18n.attributes.course.i18n.value.A4.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_A4",
                                 "type": "active"
                             },
                             {
                                 "key": "A5",
-                                "value": "{{i18n.attributes.course.i18n.value.A5.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_A5",
                                 "type": "active"
                             },
                             {
                                 "key": "A6",
-                                "value": "{{i18n.attributes.course.i18n.value.A6.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_A6",
                                 "type": "active"
                             },
                             {
                                 "key": "A7",
-                                "value": "{{i18n.attributes.course.i18n.value.A7.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_A7",
                                 "type": "active"
                             },
                             {
                                 "key": "A8",
-                                "value": "{{i18n.attributes.course.i18n.value.A8.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_A8",
                                 "type": "active"
                             },
                             {
                                 "key": "A9",
-                                "value": "{{i18n.attributes.course.i18n.value.A9.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_A9",
                                 "type": "active"
                             },
                             {
                                 "key": "AA",
-                                "value": "{{i18n.attributes.course.i18n.value.AA.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_AA",
                                 "type": "active"
                             },
                             {
                                 "key": "AB",
-                                "value": "{{i18n.attributes.course.i18n.value.AB.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_AB",
                                 "type": "active"
                             },
                             {
                                 "key": "AC",
-                                "value": "{{i18n.attributes.course.i18n.value.AC.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_AC",
                                 "type": "active"
                             },
                             {
                                 "key": "AD",
-                                "value": "{{i18n.attributes.course.i18n.value.AD.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_AD",
                                 "type": "active"
                             },
                             {
                                 "key": "AE",
-                                "value": "{{i18n.attributes.course.i18n.value.AE.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_AE",
                                 "type": "active"
                             },
                             {
                                 "key": "AF",
-                                "value": "{{i18n.attributes.course.i18n.value.AF.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_AF",
                                 "type": "active"
                             },
                             {
                                 "key": "B0",
-                                "value": "{{i18n.attributes.course.i18n.value.B0.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_B0",
                                 "type": "active"
                             },
                             {
                                 "key": "B1",
-                                "value": "{{i18n.attributes.course.i18n.value.B1.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_B1",
                                 "type": "active"
                             },
                             {
                                 "key": "B2",
-                                "value": "{{i18n.attributes.course.i18n.value.B2.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_B2",
                                 "type": "active"
                             },
                             {
                                 "key": "B3",
-                                "value": "{{i18n.attributes.course.i18n.value.B3.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_B3",
                                 "type": "active"
                             },
                             {
                                 "key": "B4",
-                                "value": "{{i18n.attributes.course.i18n.value.B4.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_B4",
                                 "type": "active"
                             },
                             {
                                 "key": "B5",
-                                "value": "{{i18n.attributes.course.i18n.value.B5.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_B5",
                                 "type": "active"
                             },
                             {
                                 "key": "B6",
-                                "value": "{{i18n.attributes.course.i18n.value.B6.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_B6",
+                                "type": "active"
+                            },
+                            {
+                                "key": "B7",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_B7",
                                 "type": "active"
                             },
                             {
                                 "key": "F1",
-                                "value": "{{i18n.attributes.course.i18n.value.F1.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_F1",
                                 "type": "active"
                             },
                             {
                                 "key": "F2",
-                                "value": "{{i18n.attributes.course.i18n.value.F2.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_F2",
                                 "type": "active"
                             },
                             {
                                 "key": "F3",
-                                "value": "{{i18n.attributes.course.i18n.value.F3.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_F3",
                                 "type": "active"
                             },
                             {
                                 "key": "F4",
-                                "value": "{{i18n.attributes.course.i18n.value.F4.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_F4",
                                 "type": "active"
                             },
                             {
                                 "key": "F5",
-                                "value": "{{i18n.attributes.course.i18n.value.F5.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_F5",
                                 "type": "active"
                             },
                             {
                                 "key": "F6",
-                                "value": "{{i18n.attributes.course.i18n.value.F6.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_F6",
                                 "type": "active"
                             },
                             {
                                 "key": "F7",
-                                "value": "{{i18n.attributes.course.i18n.value.F7.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_F7",
                                 "type": "active"
                             },
                             {
                                 "key": "F8",
-                                "value": "{{i18n.attributes.course.i18n.value.F8.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_F8",
                                 "type": "active"
                             },
                             {
                                 "key": "F9",
-                                "value": "{{i18n.attributes.course.i18n.value.F9.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_F9",
                                 "type": "active"
                             },
                             {
                                 "key": "FA",
-                                "value": "{{i18n.attributes.course.i18n.value.FA.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_FA",
                                 "type": "active"
                             },
                             {
                                 "key": "FB",
-                                "value": "{{i18n.attributes.course.i18n.value.FB.label}}",
+                                "value": "___PO_CODE_CAPABILITY.CUSTOM.SUPPORTEDOPTIONS_DEFAULT_ATTRIBUTES_COURSE_FB",
                                 "type": "active"
                             }
                         ]
diff --git a/json/custom.tvsearch.i18n.en.json b/json/custom.tvsearch.i18n.en.json
new file mode 100644
index 00000000..dca8b26e
--- /dev/null
+++ b/json/custom.tvsearch.i18n.en.json
@@ -0,0 +1,11 @@
+{
+    "tag": "en",
+    "label": "tvSearch",
+    "attributes": {},
+    "commands": {
+        "search": {
+            "label": "search",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/custom.tvsearch.i18n.fr.json b/json/custom.tvsearch.i18n.fr.json
new file mode 100644
index 00000000..dca8b26e
--- /dev/null
+++ b/json/custom.tvsearch.i18n.fr.json
@@ -0,0 +1,11 @@
+{
+    "tag": "en",
+    "label": "tvSearch",
+    "attributes": {},
+    "commands": {
+        "search": {
+            "label": "search",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/custom.virusDoctorMode.json b/json/custom.virusDoctorMode.json
index ff0e0a0d..160e3263 100755
--- a/json/custom.virusDoctorMode.json
+++ b/json/custom.virusDoctorMode.json
@@ -22,7 +22,6 @@
                     "value"
                 ]
             },
-            "setter": "setVirusDoctorMode",
             "enumCommands": []
         }
     },
@@ -41,7 +40,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.washerAddwashAlarm.json b/json/custom.washerAddwashAlarm.json
index 868176c6..06e62151 100755
--- a/json/custom.washerAddwashAlarm.json
+++ b/json/custom.washerAddwashAlarm.json
@@ -28,7 +28,6 @@
                     "value"
                 ]
             },
-            "setter": "setWasherAddwashAlarm",
             "enumCommands": []
         }
     },
@@ -53,7 +52,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.washerAutoDetergent.json b/json/custom.washerAutoDetergent.json
index bbeff70e..09508bce 100755
--- a/json/custom.washerAutoDetergent.json
+++ b/json/custom.washerAutoDetergent.json
@@ -25,7 +25,6 @@
                     "value"
                 ]
             },
-            "setter": "setWasherAutoDetergent",
             "enumCommands": []
         }
     },
@@ -44,7 +43,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.washerAutoSoftener.json b/json/custom.washerAutoSoftener.json
index 4276c9bd..788db546 100755
--- a/json/custom.washerAutoSoftener.json
+++ b/json/custom.washerAutoSoftener.json
@@ -25,7 +25,6 @@
                     "value"
                 ]
             },
-            "setter": "setWasherAutoSoftener",
             "enumCommands": []
         }
     },
@@ -44,7 +43,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.washerRinseCycles.json b/json/custom.washerRinseCycles.json
index d5ca3243..fa164780 100755
--- a/json/custom.washerRinseCycles.json
+++ b/json/custom.washerRinseCycles.json
@@ -55,7 +55,6 @@
                     "value"
                 ]
             },
-            "setter": "setWasherRinseCycles",
             "enumCommands": []
         }
     },
@@ -78,7 +77,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.washerSoilLevel.json b/json/custom.washerSoilLevel.json
index 67df4c20..a6b55cd0 100755
--- a/json/custom.washerSoilLevel.json
+++ b/json/custom.washerSoilLevel.json
@@ -59,7 +59,6 @@
                     "value"
                 ]
             },
-            "setter": "setWasherSoilLevel",
             "enumCommands": []
         }
     },
@@ -84,7 +83,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.washerSpinLevel.json b/json/custom.washerSpinLevel.json
index 6a990261..bb20e88b 100755
--- a/json/custom.washerSpinLevel.json
+++ b/json/custom.washerSpinLevel.json
@@ -91,7 +91,6 @@
                     "value"
                 ]
             },
-            "setter": "setWasherSpinLevel",
             "enumCommands": []
         }
     },
@@ -125,7 +124,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.washerWaterTemperature.json b/json/custom.washerWaterTemperature.json
index 725dd6c6..2d432867 100755
--- a/json/custom.washerWaterTemperature.json
+++ b/json/custom.washerWaterTemperature.json
@@ -93,7 +93,6 @@
                     "value"
                 ]
             },
-            "setter": "setWasherWaterTemperature",
             "enumCommands": []
         }
     },
@@ -135,7 +134,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/custom.waterFilterPresentation.json b/json/custom.waterFilterPresentation.json
index 96ba2423..dfffd33d 100755
--- a/json/custom.waterFilterPresentation.json
+++ b/json/custom.waterFilterPresentation.json
@@ -2,7 +2,7 @@
     "dashboard": {
         "states": [
             {
-                "label": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_WP_NEED_REPLACEMENT}}"
+                "label": "Need to replace filter"
             }
         ],
         "actions": [],
diff --git a/json/deliveryRobotCallPresentation.json b/json/deliveryRobotCallPresentation.json
index 93a1051e..c118b149 100644
--- a/json/deliveryRobotCallPresentation.json
+++ b/json/deliveryRobotCallPresentation.json
@@ -6,27 +6,27 @@
                 "alternatives": [
                     {
                         "key": "available",
-                        "value": "{{i18n.attributes.robotState.i18n.value.available.label}}",
+                        "value": "Standing by for delivery",
                         "type": "active"
                     },
                     {
                         "key": "using",
-                        "value": "{{i18n.attributes.robotState.i18n.value.using.label}}",
+                        "value": "In use",
                         "type": "active"
                     },
                     {
                         "key": "error",
-                        "value": "{{i18n.attributes.robotState.i18n.value.error.label}}",
+                        "value": "Error",
                         "type": "active"
                     },
                     {
                         "key": "called",
-                        "value": "{{i18n.attributes.robotState.i18n.value.called.label}}",
+                        "value": "Called",
                         "type": "active"
                     },
                     {
                         "key": "callFailed",
-                        "value": "{{i18n.attributes.robotState.i18n.value.callFailed.label}}",
+                        "value": "Couldn't contact robot",
                         "type": "active"
                     }
                 ]
@@ -37,19 +37,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Delivery robot",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "call",
-                            "value": "{{i18n.commands.call.label}}",
+                            "value": "Call",
                             "type": "active"
                         },
                         {
                             "key": "cancel",
-                            "value": "{{i18n.commands.cancel.label}}",
+                            "value": "Cancelled",
                             "type": "active"
                         }
                     ],
@@ -61,27 +61,27 @@
                     "alternatives": [
                         {
                             "key": "available",
-                            "value": "{{i18n.attributes.robotState.i18n.value.available.label}}",
+                            "value": "Standing by for delivery",
                             "type": "active"
                         },
                         {
                             "key": "using",
-                            "value": "{{i18n.attributes.robotState.i18n.value.using.label}}",
+                            "value": "In use",
                             "type": "active"
                         },
                         {
                             "key": "error",
-                            "value": "{{i18n.attributes.robotState.i18n.value.error.label}}",
+                            "value": "Error",
                             "type": "active"
                         },
                         {
                             "key": "called",
-                            "value": "{{i18n.attributes.robotState.i18n.value.called.label}}",
+                            "value": "Called",
                             "type": "active"
                         },
                         {
                             "key": "callFailed",
-                            "value": "{{i18n.attributes.robotState.i18n.value.callFailed.label}}",
+                            "value": "Couldn't contact robot",
                             "type": "active"
                         }
                     ]
@@ -92,33 +92,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Delivery robot",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "available",
-                            "value": "{{i18n.attributes.robotState.i18n.value.available.label}}",
+                            "value": "Standing by for delivery",
                             "type": "active"
                         },
                         {
                             "key": "using",
-                            "value": "{{i18n.attributes.robotState.i18n.value.using.label}}",
+                            "value": "In use",
                             "type": "active"
                         },
                         {
                             "key": "error",
-                            "value": "{{i18n.attributes.robotState.i18n.value.error.label}}",
+                            "value": "Error",
                             "type": "active"
                         },
                         {
                             "key": "called",
-                            "value": "{{i18n.attributes.robotState.i18n.value.called.label}}",
+                            "value": "Called",
                             "type": "active"
                         },
                         {
                             "key": "callFailed",
-                            "value": "{{i18n.attributes.robotState.i18n.value.callFailed.label}}",
+                            "value": "Couldn't contact robot",
                             "type": "active"
                         }
                     ],
@@ -131,18 +131,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Delivery robot",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "call",
-                            "value": "{{i18n.commands.call.label}}",
+                            "value": "Call",
                             "type": "active"
                         },
                         {
                             "key": "cancel",
-                            "value": "{{i18n.commands.cancel.label}}",
+                            "value": "Cancelled",
                             "type": "active"
                         }
                     ],
diff --git a/json/dewPointPresentation.json b/json/dewPointPresentation.json
index d7f02229..256b9e59 100755
--- a/json/dewPointPresentation.json
+++ b/json/dewPointPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Dew point",
             "displayType": "state",
             "state": {
                 "label": "{{dewpoint.value}}",
@@ -21,7 +21,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Dew point",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "dewpoint.value",
diff --git a/json/dishwasherMode.i18n.en.json b/json/dishwasherMode.i18n.en.json
index 1b4b53cf..e6578bbf 100755
--- a/json/dishwasherMode.i18n.en.json
+++ b/json/dishwasherMode.i18n.en.json
@@ -62,12 +62,12 @@
                         "eco": {
                             "label": "Eco"
                         },
-                        "quick": {
-                            "label": "Quick"
-                        },
                         "auto": {
                             "label": "Auto"
                         },
+                        "quick": {
+                            "label": "Quick"
+                        },
                         "superClean": {
                             "label": "SuperClean"
                         },
@@ -83,12 +83,12 @@
                         "prewash": {
                             "label": "Prewash"
                         },
-                        "smart": {
-                            "label": "Smart"
-                        },
                         "rinse": {
                             "label": "Rinse"
                         },
+                        "smart": {
+                            "label": "Smart"
+                        },
                         "intense": {
                             "label": "Intense"
                         }
diff --git a/json/dishwasherMode.i18n.fr.json b/json/dishwasherMode.i18n.fr.json
index a72b9466..fa4aeac4 100755
--- a/json/dishwasherMode.i18n.fr.json
+++ b/json/dishwasherMode.i18n.fr.json
@@ -62,12 +62,12 @@
                         "eco": {
                             "label": "Éco"
                         },
-                        "quick": {
-                            "label": "Rapide"
-                        },
                         "auto": {
                             "label": "Automatique"
                         },
+                        "quick": {
+                            "label": "Rapide"
+                        },
                         "superClean": {
                             "label": "SuperClean"
                         },
@@ -83,12 +83,12 @@
                         "prewash": {
                             "label": "Prewash"
                         },
-                        "smart": {
-                            "label": "Smart"
-                        },
                         "rinse": {
                             "label": "Rinçage"
                         },
+                        "smart": {
+                            "label": "Smart"
+                        },
                         "intense": {
                             "label": "Intense"
                         }
diff --git a/json/dishwasherModePresentation.json b/json/dishwasherModePresentation.json
index d22222f0..59eb291f 100755
--- a/json/dishwasherModePresentation.json
+++ b/json/dishwasherModePresentation.json
@@ -6,32 +6,32 @@
                 "alternatives": [
                     {
                         "key": "auto",
-                        "value": "{{i18n.attributes.dishwasherMode.i18n.value.auto.label}}",
+                        "value": "Auto",
                         "type": "active"
                     },
                     {
                         "key": "quick",
-                        "value": "{{i18n.attributes.dishwasherMode.i18n.value.quick.label}}",
+                        "value": "Quick",
                         "type": "active"
                     },
                     {
                         "key": "rinse",
-                        "value": "{{i18n.attributes.dishwasherMode.i18n.value.rinse.label}}",
+                        "value": "Rinse",
                         "type": "active"
                     },
                     {
                         "key": "dry",
-                        "value": "{{i18n.attributes.dishwasherMode.i18n.value.dry.label}}",
+                        "value": "Dry",
                         "type": "active"
                     },
                     {
                         "key": "eco",
-                        "value": "{{i18n.attributes.dishwasherMode.i18n.value.eco.label}}",
+                        "value": "Eco",
                         "type": "active"
                     },
                     {
                         "key": "intense",
-                        "value": "{{i18n.attributes.dishwasherMode.i18n.value.intense.label}}",
+                        "value": "Intense",
                         "type": "active"
                     }
                 ]
@@ -42,7 +42,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -50,32 +50,32 @@
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "quick",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.quick.label}}",
+                            "value": "Quick",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.rinse.label}}",
+                            "value": "Rinse",
                             "type": "active"
                         },
                         {
                             "key": "dry",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.dry.label}}",
+                            "value": "Dry",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "intense",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.intense.label}}",
+                            "value": "Intense",
                             "type": "active"
                         }
                     ],
@@ -87,32 +87,32 @@
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "quick",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.quick.label}}",
+                            "value": "Quick",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.rinse.label}}",
+                            "value": "Rinse",
                             "type": "active"
                         },
                         {
                             "key": "dry",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.dry.label}}",
+                            "value": "Dry",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "intense",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.intense.label}}",
+                            "value": "Intense",
                             "type": "active"
                         }
                     ]
@@ -123,38 +123,38 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "quick",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.quick.label}}",
+                            "value": "Quick",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.rinse.label}}",
+                            "value": "Rinse",
                             "type": "active"
                         },
                         {
                             "key": "dry",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.dry.label}}",
+                            "value": "Dry",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "intense",
-                            "value": "{{i18n.attributes.dishwasherMode.i18n.value.intense.label}}",
+                            "value": "Intense",
                             "type": "active"
                         }
                     ],
@@ -166,38 +166,38 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "quick",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.quick.label}}",
+                            "value": "Quick",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.rinse.label}}",
+                            "value": "Rinse",
                             "type": "active"
                         },
                         {
                             "key": "dry",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.dry.label}}",
+                            "value": "Dry",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "intense",
-                            "value": "{{i18n.commands.setDishwasherMode.arguments.mode.i18n.intense.label}}",
+                            "value": "Intense",
                             "type": "active"
                         }
                     ],
diff --git a/json/dishwasherOperatingStatePresentation.json b/json/dishwasherOperatingStatePresentation.json
index 733d57e6..8f9a93e0 100755
--- a/json/dishwasherOperatingStatePresentation.json
+++ b/json/dishwasherOperatingStatePresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "airwash",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.airwash.label}}",
+                        "value": "Air Wash",
                         "type": "active"
                     },
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.cooling.label}}",
+                        "value": "Cooling down",
                         "type": "active"
                     },
                     {
                         "key": "drying",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.drying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "finish",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.finish.label}}",
+                        "value": "Finished",
                         "type": "active"
                     },
                     {
@@ -31,47 +31,47 @@
                     },
                     {
                         "key": "prewash",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.prewash.label}}",
+                        "value": "Pre-washing",
                         "type": "active"
                     },
                     {
                         "key": "rinse",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.rinse.label}}",
+                        "value": "Rinse",
                         "type": "active"
                     },
                     {
                         "key": "spin",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.spin.label}}",
+                        "value": "Spin",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     },
                     {
                         "key": "wash",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.wash.label}}",
+                        "value": "Wash",
                         "type": "active"
                     },
                     {
                         "key": "wrinklePrevent",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.wrinklePrevent.label}}",
+                        "value": "Wrinkle Prevent",
                         "type": "active"
                     },
                     {
                         "key": "unableToStartOrResume",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.unableToStartOrResume.label}}",
+                        "value": "Couldn't start",
                         "type": "active"
                     },
                     {
                         "key": "unableToCompleteOperation",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.unableToCompleteOperation.label}}",
+                        "value": "Couldn't complete",
                         "type": "active"
                     },
                     {
                         "key": "commandInvalidInState",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.commandInvalidInState.label}}",
+                        "value": "Couldn't do action",
                         "type": "active"
                     }
                 ]
@@ -81,17 +81,17 @@
                 "alternatives": [
                     {
                         "key": "pause",
-                        "value": "{{i18n.attributes.machineState.i18n.value.pause.label}}",
+                        "value": "Paused",
                         "type": "active"
                     },
                     {
                         "key": "run",
-                        "value": "{{i18n.attributes.machineState.i18n.value.run.label}}",
+                        "value": "Running",
                         "type": "active"
                     },
                     {
                         "key": "stop",
-                        "value": "{{i18n.attributes.machineState.i18n.value.stop.label}}",
+                        "value": "Ready",
                         "type": "inactive"
                     }
                 ]
@@ -140,29 +140,29 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Dishwasher",
             "displayType": "state",
             "state": {
                 "label": "{{dishwasherJobState.value}}",
                 "alternatives": [
                     {
                         "key": "airwash",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.airwash.label}}",
+                        "value": "Air Wash",
                         "type": "active"
                     },
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.cooling.label}}",
+                        "value": "Cooling down",
                         "type": "active"
                     },
                     {
                         "key": "drying",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.drying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "finish",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.finish.label}}",
+                        "value": "Finished",
                         "type": "active"
                     },
                     {
@@ -172,54 +172,54 @@
                     },
                     {
                         "key": "prewash",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.wash.label}}",
+                        "value": "Wash",
                         "type": "active"
                     },
                     {
                         "key": "rinse",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.rinse.label}}",
+                        "value": "Rinse",
                         "type": "active"
                     },
                     {
                         "key": "spin",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.spin.label}}",
+                        "value": "Spin",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     },
                     {
                         "key": "wash",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.wash.label}}",
+                        "value": "Wash",
                         "type": "active"
                     },
                     {
                         "key": "wrinklePrevent",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.wrinklePrevent.label}}",
+                        "value": "Wrinkle Prevent",
                         "type": "active"
                     },
                     {
                         "key": "unableToStartOrResume",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.unableToStartOrResume.label}}",
+                        "value": "Couldn't start",
                         "type": "active"
                     },
                     {
                         "key": "unableToCompleteOperation",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.unableToCompleteOperation.label}}",
+                        "value": "Couldn't complete",
                         "type": "active"
                     },
                     {
                         "key": "commandInvalidInState",
-                        "value": "{{i18n.attributes.dishwasherJobState.i18n.value.commandInvalidInState.label}}",
+                        "value": "Couldn't do action",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.machineState.label}}",
+            "label": "Device status",
             "displayType": "list",
             "list": {
                 "command": {
@@ -227,17 +227,17 @@
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.run.label}}",
+                            "value": "Start",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.stop.label}}",
+                            "value": "Cancel",
                             "type": "inactive"
                         }
                     ],
@@ -250,17 +250,17 @@
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.machineState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.attributes.machineState.i18n.value.run.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.machineState.i18n.value.stop.label}}",
+                            "value": "Ready",
                             "type": "inactive"
                         }
                     ]
@@ -268,33 +268,40 @@
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Dishwasher",
             "displayType": "state",
             "state": {
                 "label": "{{completionTime.value}}"
             }
+        },
+        {
+            "label": "progress",
+            "displayType": "state",
+            "state": {
+                "label": "{{progress.value}}"
+            }
         }
     ],
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.machineState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.machineState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.attributes.machineState.i18n.value.run.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.machineState.i18n.value.stop.label}}",
+                            "value": "Ready",
                             "type": "inactive"
                         }
                     ],
@@ -304,28 +311,28 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.dishwasherJobState.label}}",
+                "label": "Dishwasher",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "airwash",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.airwash.label}}",
+                            "value": "Air Wash",
                             "type": "active"
                         },
                         {
                             "key": "cooling",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.cooling.label}}",
+                            "value": "Cooling down",
                             "type": "active"
                         },
                         {
                             "key": "drying",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.drying.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "finish",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.finish.label}}",
+                            "value": "Finished",
                             "type": "active"
                         },
                         {
@@ -335,47 +342,47 @@
                         },
                         {
                             "key": "prewash",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.wash.label}}",
+                            "value": "Wash",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.rinse.label}}",
+                            "value": "Rinse",
                             "type": "active"
                         },
                         {
                             "key": "spin",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.spin.label}}",
+                            "value": "Spin",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         },
                         {
                             "key": "wash",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.wash.label}}",
+                            "value": "Wash",
                             "type": "active"
                         },
                         {
                             "key": "wrinklePrevent",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.wrinklePrevent.label}}",
+                            "value": "Wrinkle Prevent",
                             "type": "active"
                         },
                         {
                             "key": "unableToStartOrResume",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.unableToStartOrResume.label}}",
+                            "value": "Couldn't start",
                             "type": "active"
                         },
                         {
                             "key": "unableToCompleteOperation",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.unableToCompleteOperation.label}}",
+                            "value": "Couldn't complete",
                             "type": "active"
                         },
                         {
                             "key": "commandInvalidInState",
-                            "value": "{{i18n.attributes.dishwasherJobState.i18n.value.commandInvalidInState.label}}",
+                            "value": "Couldn't do action",
                             "type": "active"
                         }
                     ],
@@ -387,23 +394,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.machineState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.run.label}}",
+                            "value": "Start",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.stop.label}}",
+                            "value": "Cancel",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/doorControlPresentation.json b/json/doorControlPresentation.json
index dacdafb8..09e04aef 100755
--- a/json/doorControlPresentation.json
+++ b/json/doorControlPresentation.json
@@ -6,27 +6,27 @@
                 "alternatives": [
                     {
                         "key": "closed",
-                        "value": "{{i18n.attributes.door.i18n.value.closed.label}}",
+                        "value": "Closed",
                         "type": "inactive"
                     },
                     {
                         "key": "open",
-                        "value": "{{i18n.attributes.door.i18n.value.open.label}}",
+                        "value": "Open",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.door.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     },
                     {
                         "key": "opening",
-                        "value": "{{i18n.attributes.door.i18n.value.opening.label}}",
+                        "value": "Opening…",
                         "type": "active"
                     },
                     {
                         "key": "closing",
-                        "value": "{{i18n.attributes.door.i18n.value.closing.label}}",
+                        "value": "Closing…",
                         "type": "active"
                     }
                 ]
@@ -52,7 +52,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Door",
             "displayType": "toggleSwitch",
             "toggleSwitch": {
                 "command": {
@@ -67,27 +67,27 @@
                     "alternatives": [
                         {
                             "key": "closed",
-                            "value": "{{i18n.attributes.door.i18n.value.closed.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         },
                         {
                             "key": "open",
-                            "value": "{{i18n.attributes.door.i18n.value.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.door.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         },
                         {
                             "key": "opening",
-                            "value": "{{i18n.attributes.door.i18n.value.opening.label}}",
+                            "value": "Opening…",
                             "type": "active"
                         },
                         {
                             "key": "closing",
-                            "value": "{{i18n.attributes.door.i18n.value.closing.label}}",
+                            "value": "Closing…",
                             "type": "active"
                         }
                     ]
@@ -98,33 +98,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Door",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "closing",
-                            "value": "{{i18n.attributes.door.i18n.value.closing.label}}",
+                            "value": "Closing…",
                             "type": "active"
                         },
                         {
                             "key": "opening",
-                            "value": "{{i18n.attributes.door.i18n.value.opening.label}}",
+                            "value": "Opening…",
                             "type": "active"
                         },
                         {
                             "key": "closed",
-                            "value": "{{i18n.attributes.door.i18n.value.closed.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         },
                         {
                             "key": "open",
-                            "value": "{{i18n.attributes.door.i18n.value.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.door.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
@@ -135,18 +135,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Door",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "close",
-                            "value": "{{i18n.commands.close.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         },
                         {
                             "key": "open",
-                            "value": "{{i18n.commands.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         }
                     ]
diff --git a/json/doorState.i18n.en.json b/json/doorState.i18n.en.json
new file mode 100644
index 00000000..a060a20b
--- /dev/null
+++ b/json/doorState.i18n.en.json
@@ -0,0 +1,41 @@
+{
+    "tag": "en",
+    "label": "Door state",
+    "description": "The current door state.",
+    "attributes": {
+        "doorState": {
+            "label": "Door state",
+            "description": "The current door state.",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "ajar": {
+                        "label": "Ajar"
+                    },
+                    "closed": {
+                        "label": "Closed"
+                    },
+                    "unspecifiedError": {
+                        "label": "Error"
+                    },
+                    "jammed": {
+                        "label": "Jammed"
+                    },
+                    "forcedOpen": {
+                        "label": "Forced open attempt detected"
+                    },
+                    "open": {
+                        "label": "Open"
+                    }
+                }
+            }
+        },
+        "supportedDoorStates": {
+            "label": "Supported Door States",
+            "description": "The Door States supported by the door lock.",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {}
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/doorState.i18n.fr.json b/json/doorState.i18n.fr.json
new file mode 100644
index 00000000..b6ff0513
--- /dev/null
+++ b/json/doorState.i18n.fr.json
@@ -0,0 +1,41 @@
+{
+    "tag": "fr",
+    "label": "État de la porte",
+    "description": "The current door state.",
+    "attributes": {
+        "doorState": {
+            "label": "État de la porte",
+            "description": "The current door state.",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "ajar": {
+                        "label": "Entrouverte"
+                    },
+                    "closed": {
+                        "label": "Fermé"
+                    },
+                    "unspecifiedError": {
+                        "label": "Erreur"
+                    },
+                    "jammed": {
+                        "label": "Coincée"
+                    },
+                    "forcedOpen": {
+                        "label": "Tentative d'ouverture forcée détectée"
+                    },
+                    "open": {
+                        "label": "Ouvert"
+                    }
+                }
+            }
+        },
+        "supportedDoorStates": {
+            "label": "Supported Door States",
+            "description": "The Door States supported by the door lock.",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {}
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/doorState.json b/json/doorState.json
new file mode 100644
index 00000000..90d34dc5
--- /dev/null
+++ b/json/doorState.json
@@ -0,0 +1,61 @@
+{
+    "id": "doorState",
+    "version": 1,
+    "status": "proposed",
+    "name": "Door State",
+    "ephemeral": false,
+    "attributes": {
+        "doorState": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "DoorState",
+                        "type": "string",
+                        "enum": [
+                            "open",
+                            "closed",
+                            "jammed",
+                            "forcedOpen",
+                            "unspecifiedError",
+                            "ajar"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedDoorStates": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "DoorState",
+                            "type": "string",
+                            "enum": [
+                                "open",
+                                "closed",
+                                "jammed",
+                                "forcedOpen",
+                                "unspecifiedError",
+                                "ajar"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/doorStatePresentation.json b/json/doorStatePresentation.json
new file mode 100644
index 00000000..7f720a9f
--- /dev/null
+++ b/json/doorStatePresentation.json
@@ -0,0 +1,133 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{doorState.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "Open",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "closed",
+                        "type": "active"
+                    },
+                    {
+                        "key": "jammed",
+                        "value": "jammed",
+                        "type": "active"
+                    },
+                    {
+                        "key": "forcedOpen",
+                        "value": "forcedOpen",
+                        "type": "active"
+                    },
+                    {
+                        "key": "unspecifiedError",
+                        "value": "unspecifiedError",
+                        "type": "active"
+                    },
+                    {
+                        "key": "ajar",
+                        "value": "ajar",
+                        "type": "active"
+                    }
+                ]
+            }
+        ],
+        "actions": [],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "Door State",
+            "displayType": "state",
+            "state": {
+                "label": "{{doorState.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "open",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "closed",
+                        "type": "active"
+                    },
+                    {
+                        "key": "jammed",
+                        "value": "jammed",
+                        "type": "active"
+                    },
+                    {
+                        "key": "forcedOpen",
+                        "value": "forcedOpen",
+                        "type": "active"
+                    },
+                    {
+                        "key": "unspecifiedError",
+                        "value": "unspecifiedError",
+                        "type": "active"
+                    },
+                    {
+                        "key": "ajar",
+                        "value": "ajar",
+                        "type": "active"
+                    }
+                ]
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "Door State",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "open",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "closed",
+                            "type": "active"
+                        },
+                        {
+                            "key": "jammed",
+                            "value": "jammed",
+                            "type": "active"
+                        },
+                        {
+                            "key": "forcedOpen",
+                            "value": "forcedOpen",
+                            "type": "active"
+                        },
+                        {
+                            "key": "unspecifiedError",
+                            "value": "unspecifiedError",
+                            "type": "active"
+                        },
+                        {
+                            "key": "ajar",
+                            "value": "ajar",
+                            "type": "active"
+                        }
+                    ],
+                    "supportedValues": "supportedDoorStates.value",
+                    "value": "doorState.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": []
+    },
+    "id": "doorState",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/drivingStatusPresentation.json b/json/drivingStatusPresentation.json
index f64d1c07..306ef21c 100755
--- a/json/drivingStatusPresentation.json
+++ b/json/drivingStatusPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "notDriving",
-                        "value": "{{i18n.attributes.drivingStatus.i18n.value.notDriving.label}}",
+                        "value": "Not driving",
                         "type": "inactive"
                     },
                     {
                         "key": "driving",
-                        "value": "{{i18n.attributes.drivingStatus.i18n.value.driving.label}}",
+                        "value": "Driving",
                         "type": "active"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Driving status",
             "displayType": "state",
             "state": {
                 "label": "{{drivingStatus.value}}",
                 "alternatives": [
                     {
                         "key": "notDriving",
-                        "value": "{{i18n.attributes.drivingStatus.i18n.value.notDriving.label}}",
+                        "value": "Not driving",
                         "type": "inactive"
                     },
                     {
                         "key": "driving",
-                        "value": "{{i18n.attributes.drivingStatus.i18n.value.driving.label}}",
+                        "value": "Driving",
                         "type": "active"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Driving status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "notDriving",
-                            "value": "{{i18n.attributes.drivingStatus.i18n.value.notDriving.label}}",
+                            "value": "Not driving",
                             "type": "inactive"
                         },
                         {
                             "key": "driving",
-                            "value": "{{i18n.attributes.drivingStatus.i18n.value.driving.label}}",
+                            "value": "Driving",
                             "type": "active"
                         }
                     ],
diff --git a/json/dryerMode.i18n.en.json b/json/dryerMode.i18n.en.json
index 3943f266..a50fb903 100755
--- a/json/dryerMode.i18n.en.json
+++ b/json/dryerMode.i18n.en.json
@@ -32,11 +32,11 @@
                         "highHeat": {
                             "label": "High"
                         },
-                        "regular": {
-                            "label": "Medium"
-                        },
                         "lowHeat": {
                             "label": "Low"
+                        },
+                        "regular": {
+                            "label": "Medium"
                         }
                     },
                     "description": "The mode to which the dryer should be set to"
diff --git a/json/dryerMode.i18n.fr.json b/json/dryerMode.i18n.fr.json
index 1aefa6eb..604876c8 100755
--- a/json/dryerMode.i18n.fr.json
+++ b/json/dryerMode.i18n.fr.json
@@ -32,11 +32,11 @@
                         "highHeat": {
                             "label": "Intensif"
                         },
-                        "regular": {
-                            "label": "Moyen"
-                        },
                         "lowHeat": {
                             "label": "Économique"
+                        },
+                        "regular": {
+                            "label": "Moyen"
                         }
                     },
                     "description": "The mode to which the dryer should be set to"
diff --git a/json/dryerModePresentation.json b/json/dryerModePresentation.json
index 0d110af9..b44a0cff 100755
--- a/json/dryerModePresentation.json
+++ b/json/dryerModePresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "regular",
-                        "value": "{{i18n.attributes.dryerMode.i18n.value.regular.label}}",
+                        "value": "Medium",
                         "type": "active"
                     },
                     {
                         "key": "lowHeat",
-                        "value": "{{i18n.attributes.dryerMode.i18n.value.lowHeat.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "highHeat",
-                        "value": "{{i18n.attributes.dryerMode.i18n.value.highHeat.label}}",
+                        "value": "High",
                         "type": "active"
                     }
                 ]
@@ -27,7 +27,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -35,17 +35,17 @@
                     "alternatives": [
                         {
                             "key": "regular",
-                            "value": "{{i18n.commands.setDryerMode.arguments.mode.i18n.regular.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "lowHeat",
-                            "value": "{{i18n.commands.setDryerMode.arguments.mode.i18n.lowHeat.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "highHeat",
-                            "value": "{{i18n.commands.setDryerMode.arguments.mode.i18n.highHeat.label}}",
+                            "value": "High",
                             "type": "active"
                         }
                     ]
@@ -55,17 +55,17 @@
                     "alternatives": [
                         {
                             "key": "regular",
-                            "value": "{{i18n.attributes.dryerMode.i18n.value.regular.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "lowHeat",
-                            "value": "{{i18n.attributes.dryerMode.i18n.value.lowHeat.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "highHeat",
-                            "value": "{{i18n.attributes.dryerMode.i18n.value.highHeat.label}}",
+                            "value": "High",
                             "type": "active"
                         }
                     ]
@@ -76,23 +76,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "regular",
-                            "value": "{{i18n.attributes.dryerMode.i18n.value.regular.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "lowHeat",
-                            "value": "{{i18n.attributes.dryerMode.i18n.value.lowHeat.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "highHeat",
-                            "value": "{{i18n.attributes.dryerMode.i18n.value.highHeat.label}}",
+                            "value": "High",
                             "type": "active"
                         }
                     ],
@@ -103,23 +103,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "regular",
-                            "value": "{{i18n.commands.setDryerMode.arguments.mode.i18n.regular.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "lowHeat",
-                            "value": "{{i18n.commands.setDryerMode.arguments.mode.i18n.lowHeat.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "highHeat",
-                            "value": "{{i18n.commands.setDryerMode.arguments.mode.i18n.highHeat.label}}",
+                            "value": "High",
                             "type": "active"
                         }
                     ],
diff --git a/json/dryerOperatingStatePresentation.json b/json/dryerOperatingStatePresentation.json
index aad70c9c..47a24bd3 100755
--- a/json/dryerOperatingStatePresentation.json
+++ b/json/dryerOperatingStatePresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.cooling.label}}",
+                        "value": "Cooling down",
                         "type": "active"
                     },
                     {
                         "key": "delayWash",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.delayWash.label}}",
+                        "value": "Delay end",
                         "type": "active"
                     },
                     {
                         "key": "drying",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.drying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "finished",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.finished.label}}",
+                        "value": "Finished",
                         "type": "active"
                     },
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.none.label}}",
+                        "value": "None",
                         "type": "active"
                     },
                     {
                         "key": "weightSensing",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.weightSensing.label}}",
+                        "value": "Checking weight",
                         "type": "active"
                     },
                     {
                         "key": "wrinklePrevent",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.wrinklePrevent.label}}",
+                        "value": "Wrinkle Prevent",
                         "type": "active"
                     }
                 ]
@@ -46,17 +46,17 @@
                 "alternatives": [
                     {
                         "key": "pause",
-                        "value": "{{i18n.attributes.machineState.i18n.value.pause.label}}",
+                        "value": "Paused",
                         "type": "active"
                     },
                     {
                         "key": "run",
-                        "value": "{{i18n.attributes.machineState.i18n.value.run.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "stop",
-                        "value": "{{i18n.attributes.machineState.i18n.value.stop.label}}",
+                        "value": "Stopped",
                         "type": "active"
                     }
                 ]
@@ -105,51 +105,51 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Tumble dryer",
             "displayType": "state",
             "state": {
                 "label": "{{dryerJobState.value}}",
                 "alternatives": [
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.cooling.label}}",
+                        "value": "Cooling down",
                         "type": "active"
                     },
                     {
                         "key": "delayWash",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.delayWash.label}}",
+                        "value": "Delay end",
                         "type": "active"
                     },
                     {
                         "key": "drying",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.drying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "finished",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.finished.label}}",
+                        "value": "Finished",
                         "type": "active"
                     },
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.none.label}}",
+                        "value": "None",
                         "type": "active"
                     },
                     {
                         "key": "weightSensing",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.weightSensing.label}}",
+                        "value": "Checking weight",
                         "type": "active"
                     },
                     {
                         "key": "wrinklePrevent",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.wrinklePrevent.label}}",
+                        "value": "Wrinkle Prevent",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.machineState.label}}",
+            "label": "Device status",
             "displayType": "list",
             "list": {
                 "command": {
@@ -157,17 +157,17 @@
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.run.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.stop.label}}",
+                            "value": "Stopped",
                             "type": "active"
                         }
                     ],
@@ -180,17 +180,17 @@
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.machineState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.attributes.machineState.i18n.value.run.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.machineState.i18n.value.stop.label}}",
+                            "value": "Stopped",
                             "type": "active"
                         }
                     ]
@@ -198,7 +198,7 @@
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Tumble dryer",
             "displayType": "state",
             "state": {
                 "label": "{{completionTime.value}}"
@@ -208,23 +208,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.machineState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.machineState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.attributes.machineState.i18n.value.run.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.machineState.i18n.value.stop.label}}",
+                            "value": "Stopped",
                             "type": "active"
                         }
                     ],
@@ -234,43 +234,43 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.dryerJobState.label}}",
+                "label": "Tumble dryer",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "cooling",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.cooling.label}}",
+                            "value": "Cooling down",
                             "type": "active"
                         },
                         {
                             "key": "delayWash",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.delayWash.label}}",
+                            "value": "Delay end",
                             "type": "active"
                         },
                         {
                             "key": "drying",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.drying.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "finished",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.finished.label}}",
+                            "value": "Finished",
                             "type": "active"
                         },
                         {
                             "key": "none",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.none.label}}",
+                            "value": "None",
                             "type": "active"
                         },
                         {
                             "key": "weightSensing",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.weightSensing.label}}",
+                            "value": "Checking weight",
                             "type": "active"
                         },
                         {
                             "key": "wrinklePrevent",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.wrinklePrevent.label}}",
+                            "value": "Wrinkle Prevent",
                             "type": "active"
                         }
                     ],
@@ -282,23 +282,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.machineState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.run.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.stop.label}}",
+                            "value": "Stopped",
                             "type": "active"
                         }
                     ],
diff --git a/json/dustHealthConcernPresentation.json b/json/dustHealthConcernPresentation.json
index 3f6b7625..5159e1fd 100755
--- a/json/dustHealthConcernPresentation.json
+++ b/json/dustHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Dust",
             "displayType": "state",
             "state": {
                 "label": "{{dustHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.dustHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Dust",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.dustHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.dustHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.dustHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.dustHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.dustHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.dustHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.dustHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/dustSensorPresentation.json b/json/dustSensorPresentation.json
index 299fbbbe..c247913e 100755
--- a/json/dustSensorPresentation.json
+++ b/json/dustSensorPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.dustLevel.label}}",
+            "label": "PM 10",
             "displayType": "state",
             "state": {
                 "label": "{{dustLevel.value}}",
@@ -18,7 +18,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.fineDustLevel.label}}",
+            "label": "PM 2.5",
             "displayType": "state",
             "state": {
                 "label": "{{fineDustLevel.value}}",
@@ -29,7 +29,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.dustLevel.label}}",
+                "label": "PM 10",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "dustLevel.value",
@@ -38,7 +38,7 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.fineDustLevel.label}}",
+                "label": "PM 2.5",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "fineDustLevel.value",
diff --git a/json/elevatorCallPresentation.json b/json/elevatorCallPresentation.json
index 3b7f57cc..6cca0996 100755
--- a/json/elevatorCallPresentation.json
+++ b/json/elevatorCallPresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "called",
-                        "value": "{{i18n.attributes.callStatus.i18n.value.called.label}}",
+                        "value": "Called",
                         "type": "active"
                     },
                     {
                         "key": "standby",
-                        "value": "{{i18n.attributes.callStatus.i18n.value.standby.label}}",
+                        "value": "Not called",
                         "type": "inactive"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.callStatus.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "inactive"
                     }
                 ]
@@ -34,31 +34,31 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Lift status",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "call"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Lift status",
             "displayType": "state",
             "state": {
                 "label": "{{callStatus.value}}",
                 "alternatives": [
                     {
                         "key": "called",
-                        "value": "{{i18n.attributes.callStatus.i18n.value.called.label}}",
+                        "value": "Called",
                         "type": "active"
                     },
                     {
                         "key": "standby",
-                        "value": "{{i18n.attributes.callStatus.i18n.value.standby.label}}",
+                        "value": "Not called",
                         "type": "inactive"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.callStatus.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "inactive"
                     }
                 ]
@@ -68,23 +68,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Lift status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "called",
-                            "value": "{{i18n.attributes.callStatus.i18n.value.called.label}}",
+                            "value": "Called",
                             "type": "active"
                         },
                         {
                             "key": "standby",
-                            "value": "{{i18n.attributes.callStatus.i18n.value.standby.label}}",
+                            "value": "Not called",
                             "type": "inactive"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.callStatus.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "inactive"
                         }
                     ],
@@ -95,13 +95,13 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Lift status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "call",
-                            "value": "{{i18n.commands.call.label}}",
+                            "value": "Call",
                             "type": "active"
                         }
                     ]
diff --git a/json/endToEndEncryption.i18n.en.json b/json/endToEndEncryption.i18n.en.json
index 5c91d6d6..d61a7983 100644
--- a/json/endToEndEncryption.i18n.en.json
+++ b/json/endToEndEncryption.i18n.en.json
@@ -2,6 +2,11 @@
     "tag": "en",
     "label": "End to End Encryption",
     "attributes": {
+        "error": {
+            "label": "error",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
         "nonce": {
             "label": "nonce",
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
diff --git a/json/endToEndEncryption.i18n.fr.json b/json/endToEndEncryption.i18n.fr.json
index 5c91d6d6..d61a7983 100644
--- a/json/endToEndEncryption.i18n.fr.json
+++ b/json/endToEndEncryption.i18n.fr.json
@@ -2,6 +2,11 @@
     "tag": "en",
     "label": "End to End Encryption",
     "attributes": {
+        "error": {
+            "label": "error",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
         "nonce": {
             "label": "nonce",
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
diff --git a/json/endToEndEncryptionState.i18n.en.json b/json/endToEndEncryptionState.i18n.en.json
new file mode 100644
index 00000000..937fe25f
--- /dev/null
+++ b/json/endToEndEncryptionState.i18n.en.json
@@ -0,0 +1,26 @@
+{
+    "tag": "en",
+    "label": "End to End Encryption State",
+    "attributes": {
+        "enabled": {
+            "label": "enabled",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "setEnabled": {
+            "label": "setEnabled",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/endToEndEncryptionState.i18n.fr.json b/json/endToEndEncryptionState.i18n.fr.json
new file mode 100644
index 00000000..937fe25f
--- /dev/null
+++ b/json/endToEndEncryptionState.i18n.fr.json
@@ -0,0 +1,26 @@
+{
+    "tag": "en",
+    "label": "End to End Encryption State",
+    "attributes": {
+        "enabled": {
+            "label": "enabled",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "setEnabled": {
+            "label": "setEnabled",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/endToEndEncryptionState.json b/json/endToEndEncryptionState.json
new file mode 100644
index 00000000..cf5fb9f9
--- /dev/null
+++ b/json/endToEndEncryptionState.json
@@ -0,0 +1,50 @@
+{
+    "id": "endToEndEncryptionState",
+    "version": 1,
+    "status": "proposed",
+    "name": "End to End Encryption State",
+    "ephemeral": false,
+    "attributes": {
+        "enabled": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setEnabled",
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "setEnabled": {
+            "name": "setEnabled",
+            "arguments": [
+                {
+                    "name": "state",
+                    "optional": false,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/energyMeterPresentation.json b/json/energyMeterPresentation.json
index e5e0aa5c..a4ca368a 100755
--- a/json/energyMeterPresentation.json
+++ b/json/energyMeterPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Energy meter",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -23,7 +23,7 @@
             }
         },
         {
-            "label": "{{i18n.commands.resetEnergyMeter.label}}",
+            "label": "Energy meter reset",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "resetEnergyMeter"
@@ -33,7 +33,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Energy meter",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "energy.value",
@@ -44,13 +44,13 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Energy meter",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "resetEnergyMeter",
-                            "value": "{{i18n.commands.resetEnergyMeter.label}}",
+                            "value": "Energy meter reset",
                             "type": "active"
                         }
                     ]
diff --git a/json/equivalentCarbonDioxideMeasurementPresentation.json b/json/equivalentCarbonDioxideMeasurementPresentation.json
index 39d6054c..6e5464b8 100755
--- a/json/equivalentCarbonDioxideMeasurementPresentation.json
+++ b/json/equivalentCarbonDioxideMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "eCO₂",
             "displayType": "state",
             "state": {
                 "label": "{{equivalentCarbonDioxideMeasurement.value}}",
@@ -21,7 +21,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "eCO₂",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "equivalentCarbonDioxideMeasurement.value",
diff --git a/json/estimatedTimeOfArrivalPresentation.json b/json/estimatedTimeOfArrivalPresentation.json
index f3c864f9..f291c865 100755
--- a/json/estimatedTimeOfArrivalPresentation.json
+++ b/json/estimatedTimeOfArrivalPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "ETA",
             "displayType": "state",
             "state": {
                 "label": "{{eta.value}}"
diff --git a/json/evseChargingSession.json b/json/evseChargingSession.json
index df6ee4f0..2dc75943 100644
--- a/json/evseChargingSession.json
+++ b/json/evseChargingSession.json
@@ -20,7 +20,6 @@
                     "value"
                 ]
             },
-            "setter": "setTargetEndTime",
             "enumCommands": []
         },
         "maxCurrent": {
@@ -44,7 +43,6 @@
                     "value"
                 ]
             },
-            "setter": "setMaxCurrent",
             "enumCommands": []
         },
         "supportedChargingCommands": {
@@ -134,7 +132,6 @@
                     "value"
                 ]
             },
-            "setter": "setMinCurrent",
             "enumCommands": []
         },
         "chargingState": {
@@ -170,7 +167,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setTargetEndTime": {
             "name": "setChargingTime",
@@ -184,7 +182,8 @@
                         "pattern": "^(?:[1-9]\\d{3}-?(?:(?:0[1-9]|1[0-2])-?(?:0[1-9]|1\\d|2[0-8])|(?:0[13-9]|1[0-2])-?(?:29|30)|(?:0[13578]|1[02])-?31)|(?:[1-9]\\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)-?02-?29)T(?:[01]\\d|2[0-3]):?[0-5]\\d:?[0-5]\\d(?:\\.\\d{3})?(?:Z|[+-][01]\\d(?::?[0-5]\\d)?)$"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "enableCharging": {
             "name": "enableCharging",
@@ -214,11 +213,13 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "disableCharging": {
             "name": "disableCharging",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setMaxCurrent": {
             "name": "setMaxCurrent",
@@ -231,7 +232,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/evseChargingSessionPresentation.json b/json/evseChargingSessionPresentation.json
index b7884703..3b26afed 100644
--- a/json/evseChargingSessionPresentation.json
+++ b/json/evseChargingSessionPresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "charging",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.charging.label}}",
+                        "value": "Ready",
                         "type": "active"
                     },
                     {
                         "key": "stopped",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.stopped.label}}",
+                        "value": "Not ready",
                         "type": "inactive"
                     },
                     {
                         "key": "disabled",
-                        "value": "{{i18n.attributes.chargingState.i18n.value.disabled.label}}",
+                        "value": "Not available",
                         "type": "inactive"
                     }
                 ]
@@ -27,19 +27,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.chargingState.label}}",
+            "label": "EVSE charging readiness state",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "enableCharging",
-                            "value": "{{i18n.commands.enableCharging.label}}",
+                            "value": "Enable charging readiness",
                             "type": "active"
                         },
                         {
                             "key": "disableCharging",
-                            "value": "{{i18n.commands.disableCharging.label}}",
+                            "value": "Disable charging readiness",
                             "type": "active"
                         }
                     ],
@@ -51,17 +51,17 @@
                     "alternatives": [
                         {
                             "key": "charging",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.charging.label}}",
+                            "value": "Ready",
                             "type": "active"
                         },
                         {
                             "key": "stopped",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.stopped.label}}",
+                            "value": "Not ready",
                             "type": "inactive"
                         },
                         {
                             "key": "disabled",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.disabled.label}}",
+                            "value": "Not available",
                             "type": "inactive"
                         }
                     ]
@@ -69,7 +69,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.targetEndTime.label}}",
+            "label": "End time",
             "displayType": "textField",
             "textField": {
                 "command": "setTargetEndTime",
@@ -79,7 +79,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.maxCurrent.label}}",
+            "label": "Max current",
             "displayType": "numberField",
             "numberField": {
                 "value": "maxCurrent.value",
@@ -90,7 +90,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.minCurrent.label}}",
+            "label": "Min current",
             "displayType": "numberField",
             "numberField": {
                 "value": "minCurrent.value",
@@ -101,14 +101,14 @@
             }
         },
         {
-            "label": "{{i18n.attributes.energyDelivered.label}}",
+            "label": "Energy Delivered",
             "displayType": "state",
             "state": {
                 "label": "{{energyDelivered.value}}}{{energyDelivered.unit}}"
             }
         },
         {
-            "label": "{{i18n.attributes.sessionTime.label}}",
+            "label": "Connection time",
             "displayType": "state",
             "state": {
                 "label": "{{sessionTime.value}}{{sessionTime.unit}}"
@@ -118,23 +118,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.chargingState.label}}",
+                "label": "EVSE charging readiness state",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "charging",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.charging.label}}",
+                            "value": "Ready",
                             "type": "active"
                         },
                         {
                             "key": "stopped",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.stopped.label}}",
+                            "value": "Not ready",
                             "type": "inactive"
                         },
                         {
                             "key": "disabled",
-                            "value": "{{i18n.attributes.chargingState.i18n.value.disabled.label}}",
+                            "value": "Not available",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/evseState.i18n.en.json b/json/evseState.i18n.en.json
index f06623b6..abab2526 100644
--- a/json/evseState.i18n.en.json
+++ b/json/evseState.i18n.en.json
@@ -79,7 +79,7 @@
                         "label": "Clear"
                     },
                     "meterFailure": {
-                        "label": "Metre failure"
+                        "label": "Meter failure"
                     },
                     "wrongPowerSupply": {
                         "label": "Wrong power supply"
diff --git a/json/evseStatePresentation.json b/json/evseStatePresentation.json
index 57805103..dbbef86b 100644
--- a/json/evseStatePresentation.json
+++ b/json/evseStatePresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "notPluggedIn",
-                        "value": "{{i18n.attributes.state.i18n.value.notPluggedIn.label}}",
+                        "value": "Available",
                         "type": "active"
                     },
                     {
                         "key": "pluggedInNoDemand",
-                        "value": "{{i18n.attributes.state.i18n.value.pluggedInNoDemand.label}}",
+                        "value": "Suspended EV",
                         "type": "active"
                     },
                     {
                         "key": "pluggedInDemand",
-                        "value": "{{i18n.attributes.state.i18n.value.pluggedInDemand.label}}",
+                        "value": "Suspended EVSE",
                         "type": "active"
                     },
                     {
                         "key": "pluggedInCharging",
-                        "value": "{{i18n.attributes.state.i18n.value.pluggedInCharging.label}}",
+                        "value": "Charging",
                         "type": "active"
                     },
                     {
                         "key": "pluggedInDischarging",
-                        "value": "{{i18n.attributes.state.i18n.value.pluggedInDischarging.label}}",
+                        "value": "Discharging",
                         "type": "active"
                     },
                     {
                         "key": "sessionEnding",
-                        "value": "{{i18n.attributes.state.i18n.value.sessionEnding.label}}",
+                        "value": "Finished",
                         "type": "active"
                     },
                     {
                         "key": "fault",
-                        "value": "{{i18n.attributes.state.i18n.value.fault.label}}",
+                        "value": "Faulted",
                         "type": "active"
                     }
                 ]
@@ -47,172 +47,172 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.state.label}}",
+            "label": "Charging point state",
             "displayType": "state",
             "state": {
                 "label": "{{state.value}}",
                 "alternatives": [
                     {
                         "key": "notPluggedIn",
-                        "value": "{{i18n.attributes.state.i18n.value.notPluggedIn.label}}",
+                        "value": "Available",
                         "type": "active"
                     },
                     {
                         "key": "pluggedInNoDemand",
-                        "value": "{{i18n.attributes.state.i18n.value.pluggedInNoDemand.label}}",
+                        "value": "Suspended EV",
                         "type": "active"
                     },
                     {
                         "key": "pluggedInDemand",
-                        "value": "{{i18n.attributes.state.i18n.value.pluggedInDemand.label}}",
+                        "value": "Suspended EVSE",
                         "type": "active"
                     },
                     {
                         "key": "pluggedInCharging",
-                        "value": "{{i18n.attributes.state.i18n.value.pluggedInCharging.label}}",
+                        "value": "Charging",
                         "type": "active"
                     },
                     {
                         "key": "pluggedInDischarging",
-                        "value": "{{i18n.attributes.state.i18n.value.pluggedInDischarging.label}}",
+                        "value": "Discharging",
                         "type": "active"
                     },
                     {
                         "key": "sessionEnding",
-                        "value": "{{i18n.attributes.state.i18n.value.sessionEnding.label}}",
+                        "value": "Finished",
                         "type": "active"
                     },
                     {
                         "key": "fault",
-                        "value": "{{i18n.attributes.state.i18n.value.fault.label}}",
+                        "value": "Faulted",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.faultState.label}}",
+            "label": "Fault detector",
             "displayType": "state",
             "state": {
                 "label": "{{faultState.value}}",
                 "alternatives": [
                     {
                         "key": "noError",
-                        "value": "{{i18n.attributes.faultState.i18n.value.noError.label}}",
+                        "value": "Clear",
                         "type": "active"
                     },
                     {
                         "key": "meterFailure",
-                        "value": "{{i18n.attributes.faultState.i18n.value.meterFailure.label}}",
+                        "value": "Meter failure",
                         "type": "active"
                     },
                     {
                         "key": "overVoltage",
-                        "value": "{{i18n.attributes.faultState.i18n.value.overVoltage.label}}",
+                        "value": "Over voltage",
                         "type": "active"
                     },
                     {
                         "key": "underVoltage",
-                        "value": "{{i18n.attributes.faultState.i18n.value.underVoltage.label}}",
+                        "value": "Under voltage",
                         "type": "active"
                     },
                     {
                         "key": "overCurrent",
-                        "value": "{{i18n.attributes.faultState.i18n.value.overCurrent.label}}",
+                        "value": "Over current",
                         "type": "active"
                     },
                     {
                         "key": "contactWetFailure",
-                        "value": "{{i18n.attributes.faultState.i18n.value.contactWetFailure.label}}",
+                        "value": "Contact wet failure",
                         "type": "active"
                     },
                     {
                         "key": "contactDryFailure",
-                        "value": "{{i18n.attributes.faultState.i18n.value.contactDryFailure.label}}",
+                        "value": "Contact dry failure",
                         "type": "active"
                     },
                     {
                         "key": "groundFault",
-                        "value": "{{i18n.attributes.faultState.i18n.value.groundFault.label}}",
+                        "value": "Ground fault",
                         "type": "active"
                     },
                     {
                         "key": "powerLoss",
-                        "value": "{{i18n.attributes.faultState.i18n.value.powerLoss.label}}",
+                        "value": "Power loss",
                         "type": "active"
                     },
                     {
                         "key": "powerQuality",
-                        "value": "{{i18n.attributes.faultState.i18n.value.powerQuality.label}}",
+                        "value": "Power quality",
                         "type": "active"
                     },
                     {
                         "key": "pilotShortCircuit",
-                        "value": "{{i18n.attributes.faultState.i18n.value.pilotShortCircuit.label}}",
+                        "value": "Pilot short circuit",
                         "type": "active"
                     },
                     {
                         "key": "emergencyStop",
-                        "value": "{{i18n.attributes.faultState.i18n.value.emergencyStop.label}}",
+                        "value": "Emergency stop",
                         "type": "active"
                     },
                     {
                         "key": "eVDisconnected",
-                        "value": "{{i18n.attributes.faultState.i18n.value.eVDisconnected.label}}",
+                        "value": "EV disconnected",
                         "type": "active"
                     },
                     {
                         "key": "wrongPowerSupply",
-                        "value": "{{i18n.attributes.faultState.i18n.value.wrongPowerSupply.label}}",
+                        "value": "Wrong power supply",
                         "type": "active"
                     },
                     {
                         "key": "liveNeutralSwap",
-                        "value": "{{i18n.attributes.faultState.i18n.value.liveNeutralSwap.label}}",
+                        "value": "Live/neutral swap",
                         "type": "active"
                     },
                     {
                         "key": "overTemperature",
-                        "value": "{{i18n.attributes.faultState.i18n.value.overTemperature.label}}",
+                        "value": "Over temperature",
                         "type": "active"
                     },
                     {
                         "key": "other",
-                        "value": "{{i18n.attributes.faultState.i18n.value.other.label}}",
+                        "value": "Others",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.supplyState.label}}",
+            "label": "EV supply state",
             "displayType": "state",
             "state": {
                 "label": "{{supplyState.value}}",
                 "alternatives": [
                     {
                         "key": "disabled",
-                        "value": "{{i18n.attributes.supplyState.i18n.value.disabled.label}}",
+                        "value": "Disabled",
                         "type": "active"
                     },
                     {
                         "key": "chargingEnabled",
-                        "value": "{{i18n.attributes.supplyState.i18n.value.chargingEnabled.label}}",
+                        "value": "Charging enabled",
                         "type": "active"
                     },
                     {
                         "key": "dischargingEnabled",
-                        "value": "{{i18n.attributes.supplyState.i18n.value.dischargingEnabled.label}}",
+                        "value": "Discharging enabled",
                         "type": "active"
                     },
                     {
                         "key": "disabledError",
-                        "value": "{{i18n.attributes.supplyState.i18n.value.disabledError.label}}",
+                        "value": "Error",
                         "type": "active"
                     },
                     {
                         "key": "disabledDiagnostics",
-                        "value": "{{i18n.attributes.supplyState.i18n.value.disabledDiagnostics.label}}",
+                        "value": "Diagnostics error",
                         "type": "active"
                     }
                 ]
@@ -222,43 +222,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.state.label}}",
+                "label": "Charging point state",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "notPluggedIn",
-                            "value": "{{i18n.attributes.state.i18n.value.notPluggedIn.label}}",
+                            "value": "Available",
                             "type": "active"
                         },
                         {
                             "key": "pluggedInNoDemand",
-                            "value": "{{i18n.attributes.state.i18n.value.pluggedInNoDemand.label}}",
+                            "value": "Suspended EV",
                             "type": "active"
                         },
                         {
                             "key": "pluggedInDemand",
-                            "value": "{{i18n.attributes.state.i18n.value.pluggedInDemand.label}}",
+                            "value": "Suspended EVSE",
                             "type": "active"
                         },
                         {
                             "key": "pluggedInCharging",
-                            "value": "{{i18n.attributes.state.i18n.value.pluggedInCharging.label}}",
+                            "value": "Charging",
                             "type": "active"
                         },
                         {
                             "key": "pluggedInDischarging",
-                            "value": "{{i18n.attributes.state.i18n.value.pluggedInDischarging.label}}",
+                            "value": "Discharging",
                             "type": "active"
                         },
                         {
                             "key": "sessionEnding",
-                            "value": "{{i18n.attributes.state.i18n.value.sessionEnding.label}}",
+                            "value": "Finished",
                             "type": "active"
                         },
                         {
                             "key": "fault",
-                            "value": "{{i18n.attributes.state.i18n.value.fault.label}}",
+                            "value": "Faulted",
                             "type": "active"
                         }
                     ],
diff --git a/json/faceRecognitionPresentation.json b/json/faceRecognitionPresentation.json
index cab4aa7c..f1c09a9c 100644
--- a/json/faceRecognitionPresentation.json
+++ b/json/faceRecognitionPresentation.json
@@ -2,7 +2,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Face recognition",
                 "displayType": "dynamicList",
                 "dynamicList": {
                     "value": "faceRecognizedEvent.value.id",
@@ -17,7 +17,7 @@
                     "alternatives": [
                         {
                             "key": "notRegisteredUser",
-                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FACERECOGNITION_DEFAULT_UNKNOWN",
+                            "value": "Unknown faces",
                             "type": "active"
                         }
                     ],
diff --git a/json/fanDirection.i18n.en.json b/json/fanDirection.i18n.en.json
new file mode 100644
index 00000000..31b83518
--- /dev/null
+++ b/json/fanDirection.i18n.en.json
@@ -0,0 +1,30 @@
+{
+    "tag": "en",
+    "label": "Fan Direction",
+    "attributes": {
+        "fanDirection": {
+            "label": "fanDirection",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "summerMode": {
+                        "label": "summerMode"
+                    },
+                    "winterMode": {
+                        "label": "winterMode"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "summerMode": {
+            "label": "summerMode",
+            "arguments": {}
+        },
+        "winterMode": {
+            "label": "winterMode",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/fanDirection.i18n.fr.json b/json/fanDirection.i18n.fr.json
new file mode 100644
index 00000000..31b83518
--- /dev/null
+++ b/json/fanDirection.i18n.fr.json
@@ -0,0 +1,30 @@
+{
+    "tag": "en",
+    "label": "Fan Direction",
+    "attributes": {
+        "fanDirection": {
+            "label": "fanDirection",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "summerMode": {
+                        "label": "summerMode"
+                    },
+                    "winterMode": {
+                        "label": "winterMode"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "summerMode": {
+            "label": "summerMode",
+            "arguments": {}
+        },
+        "winterMode": {
+            "label": "winterMode",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/fanDirection.json b/json/fanDirection.json
new file mode 100644
index 00000000..7f867e85
--- /dev/null
+++ b/json/fanDirection.json
@@ -0,0 +1,48 @@
+{
+    "id": "fanDirection",
+    "version": 1,
+    "status": "proposed",
+    "name": "Fan Direction",
+    "ephemeral": false,
+    "attributes": {
+        "fanDirection": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "FanDirection",
+                        "type": "string",
+                        "enum": [
+                            "summerMode",
+                            "winterMode"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": [
+                {
+                    "command": "summerMode",
+                    "value": "summerMode"
+                },
+                {
+                    "command": "winterMode",
+                    "value": "winterMode"
+                }
+            ]
+        }
+    },
+    "commands": {
+        "summerMode": {
+            "name": "summerMode",
+            "arguments": [],
+            "sensitive": false
+        },
+        "winterMode": {
+            "name": "winterMode",
+            "arguments": [],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/fanDirectionPresentation.json b/json/fanDirectionPresentation.json
new file mode 100644
index 00000000..2aa51175
--- /dev/null
+++ b/json/fanDirectionPresentation.json
@@ -0,0 +1,108 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{fanDirection.value}}",
+                "alternatives": [
+                    {
+                        "key": "summerMode",
+                        "value": "summerMode",
+                        "type": "active"
+                    },
+                    {
+                        "key": "winterMode",
+                        "value": "winterMode",
+                        "type": "active"
+                    }
+                ]
+            }
+        ],
+        "actions": [],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "Fan Direction",
+            "displayType": "list",
+            "list": {
+                "command": {
+                    "alternatives": [
+                        {
+                            "key": "summerMode",
+                            "value": "summerMode",
+                            "type": "active"
+                        },
+                        {
+                            "key": "winterMode",
+                            "value": "winterMode",
+                            "type": "active"
+                        }
+                    ]
+                },
+                "state": {
+                    "value": "fanDirection.value",
+                    "valueType": "string",
+                    "alternatives": [
+                        {
+                            "key": "summerMode",
+                            "value": "summerMode",
+                            "type": "active"
+                        },
+                        {
+                            "key": "winterMode",
+                            "value": "winterMode",
+                            "type": "active"
+                        }
+                    ]
+                }
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "Fan Direction",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "summerMode",
+                            "value": "summerMode",
+                            "type": "active"
+                        },
+                        {
+                            "key": "winterMode",
+                            "value": "winterMode",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "fanDirection.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": [
+            {
+                "label": "Fan Direction",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "summerMode",
+                            "value": "summerMode",
+                            "type": "active"
+                        },
+                        {
+                            "key": "winterMode",
+                            "value": "winterMode",
+                            "type": "active"
+                        }
+                    ]
+                }
+            }
+        ]
+    },
+    "id": "fanDirection",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/fanMode.i18n.en.json b/json/fanMode.i18n.en.json
index 0379f54c..9210802d 100644
--- a/json/fanMode.i18n.en.json
+++ b/json/fanMode.i18n.en.json
@@ -5,7 +5,7 @@
     "attributes": {
         "fanMode": {
             "label": "Fan mode",
-            "description": "The current mode of the fan, an enum of off, low, medium, high, or auto",
+            "description": "The current mode of the fan, an enum of off, low, medium, high, auto or turbo",
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {
                 "value": {
@@ -18,6 +18,9 @@
                     "low": {
                         "label": "Low"
                     },
+                    "turbo": {
+                        "label": "Turbo"
+                    },
                     "medium": {
                         "label": "Medium"
                     },
@@ -47,9 +50,15 @@
                         "high": {
                             "label": "High"
                         },
+                        "turbo description": {
+                            "label": "The fan is on turbo mode"
+                        },
                         "low": {
                             "label": "Low"
                         },
+                        "turbo": {
+                            "label": "Turbo"
+                        },
                         "medium": {
                             "label": "Medium"
                         },
@@ -62,12 +71,12 @@
                         "medium description": {
                             "label": "The fan is on medium"
                         },
-                        "auto description": {
-                            "label": "The fan is on auto"
-                        },
                         "off": {
                             "label": "Off"
                         },
+                        "auto description": {
+                            "label": "The fan is on auto"
+                        },
                         "high description": {
                             "label": "The fan is on high"
                         }
diff --git a/json/fanMode.i18n.fr.json b/json/fanMode.i18n.fr.json
index 5a82cac0..c5f8060d 100644
--- a/json/fanMode.i18n.fr.json
+++ b/json/fanMode.i18n.fr.json
@@ -5,7 +5,7 @@
     "attributes": {
         "fanMode": {
             "label": "Mode de ventilation",
-            "description": "The current mode of the fan, an enum of off, low, medium, high, or auto",
+            "description": "The current mode of the fan, an enum of off, low, medium, high, auto or turbo",
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {
                 "value": {
@@ -18,6 +18,9 @@
                     "low": {
                         "label": "Faible"
                     },
+                    "turbo": {
+                        "label": "Turbo"
+                    },
                     "medium": {
                         "label": "Moyenne"
                     },
@@ -47,9 +50,15 @@
                         "high": {
                             "label": "Élevée"
                         },
+                        "turbo description": {
+                            "label": "The fan is on turbo mode"
+                        },
                         "low": {
                             "label": "Faible"
                         },
+                        "turbo": {
+                            "label": "Turbo"
+                        },
                         "medium": {
                             "label": "Moyenne"
                         },
@@ -62,12 +71,12 @@
                         "medium description": {
                             "label": "The fan is on medium"
                         },
-                        "auto description": {
-                            "label": "The fan is on auto"
-                        },
                         "off": {
                             "label": "Désactivé"
                         },
+                        "auto description": {
+                            "label": "The fan is on auto"
+                        },
                         "high description": {
                             "label": "The fan is on high"
                         }
diff --git a/json/fanModePresentation.json b/json/fanModePresentation.json
index c86bf023..bd9e1cd0 100644
--- a/json/fanModePresentation.json
+++ b/json/fanModePresentation.json
@@ -6,27 +6,32 @@
                 "alternatives": [
                     {
                         "key": "auto",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.auto.label}}",
+                        "value": "Auto",
                         "type": "active"
                     },
                     {
                         "key": "low",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.low.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "medium",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.medium.label}}",
+                        "value": "Medium",
                         "type": "active"
                     },
                     {
                         "key": "high",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.high.label}}",
+                        "value": "High",
+                        "type": "active"
+                    },
+                    {
+                        "key": "turbo",
+                        "value": "Turbo",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.fanMode.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -37,7 +42,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Fan mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -45,27 +50,32 @@
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.high.label}}",
+                            "value": "High",
+                            "type": "active"
+                        },
+                        {
+                            "key": "turbo",
+                            "value": "Turbo",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -78,27 +88,32 @@
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.high.label}}",
+                            "value": "High",
+                            "type": "active"
+                        },
+                        {
+                            "key": "turbo",
+                            "value": "Turbo",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
@@ -109,33 +124,38 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fan mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.high.label}}",
+                            "value": "High",
+                            "type": "active"
+                        },
+                        {
+                            "key": "turbo",
+                            "value": "Turbo",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.fanMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -148,33 +168,38 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fan mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.high.label}}",
+                            "value": "High",
+                            "type": "active"
+                        },
+                        {
+                            "key": "turbo",
+                            "value": "Turbo",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setFanMode.arguments.fanMode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/fanOscillationMode.i18n.en.json b/json/fanOscillationMode.i18n.en.json
index a01fd1f4..a7c24024 100755
--- a/json/fanOscillationMode.i18n.en.json
+++ b/json/fanOscillationMode.i18n.en.json
@@ -5,18 +5,19 @@
     "attributes": {
         "supportedFanOscillationModes": {
             "label": "supported oscillating fan modes",
-            "description": "Supported states for this oscillating fan to be in",
+            "description": "The complete list of fan oscillation modes that are fully supported by a given device\n",
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "availableFanOscillationModes": {
-            "label": "availableFanOscillationModes",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "available oscillating fan modes",
+            "description": "The currently available fan oscillation modes that a given device can support depending on its present state.\nThis feature is primarily utilized for real-time control as it reflects the current status of the device.\nIt is optional and may not be guaranteed to be provided by all devices.\nTo enable ‘availableFanOscillationModes’, you must specify it under the ‘supportedValues’ section of your device configuration.\n",
+            "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "fanOscillationMode": {
             "label": "Fan oscillation",
-            "description": "The current mode of oscillation; an enum of fixed, vertical, horizontal, direct, indirect, fixedCenter, fixedLeft, fixedRight, far,  all",
+            "description": "The current mode of oscillation; an enum of off, individual, fixed, vertical, horizontal, direct, indirect, fixedCenter, fixedLeft, fixedRight, far, all",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
                 "value": {
@@ -53,6 +54,9 @@
                     "swing": {
                         "label": "Swing"
                     },
+                    "rightZone": {
+                        "label": "Right zone"
+                    },
                     "far": {
                         "label": "Long"
                     },
@@ -67,6 +71,9 @@
                     },
                     "fixed": {
                         "label": "Fixed"
+                    },
+                    "leftZone": {
+                        "label": "Left zone"
                     }
                 }
             }
@@ -115,6 +122,9 @@
                         "swing": {
                             "label": "Swing"
                         },
+                        "rightZone": {
+                            "label": "Right zone"
+                        },
                         "far": {
                             "label": "Long"
                         },
@@ -129,6 +139,9 @@
                         },
                         "fixed": {
                             "label": "Fixed"
+                        },
+                        "leftZone": {
+                            "label": "Left zone"
                         }
                     },
                     "description": "fan oscillation mode"
diff --git a/json/fanOscillationMode.i18n.fr.json b/json/fanOscillationMode.i18n.fr.json
index 26cf6dc8..cd294fdf 100755
--- a/json/fanOscillationMode.i18n.fr.json
+++ b/json/fanOscillationMode.i18n.fr.json
@@ -5,18 +5,19 @@
     "attributes": {
         "supportedFanOscillationModes": {
             "label": "supported oscillating fan modes",
-            "description": "Supported states for this oscillating fan to be in",
+            "description": "The complete list of fan oscillation modes that are fully supported by a given device\n",
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "availableFanOscillationModes": {
-            "label": "availableFanOscillationModes",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "available oscillating fan modes",
+            "description": "The currently available fan oscillation modes that a given device can support depending on its present state.\nThis feature is primarily utilized for real-time control as it reflects the current status of the device.\nIt is optional and may not be guaranteed to be provided by all devices.\nTo enable ‘availableFanOscillationModes’, you must specify it under the ‘supportedValues’ section of your device configuration.\n",
+            "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "fanOscillationMode": {
             "label": "Oscillation du ventilateur",
-            "description": "The current mode of oscillation; an enum of fixed, vertical, horizontal, direct, indirect, fixedCenter, fixedLeft, fixedRight, far,  all",
+            "description": "The current mode of oscillation; an enum of off, individual, fixed, vertical, horizontal, direct, indirect, fixedCenter, fixedLeft, fixedRight, far, all",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
                 "value": {
@@ -53,6 +54,9 @@
                     "swing": {
                         "label": "Balayage"
                     },
+                    "rightZone": {
+                        "label": "Zone droite"
+                    },
                     "far": {
                         "label": "Longue"
                     },
@@ -67,6 +71,9 @@
                     },
                     "fixed": {
                         "label": "Fixe"
+                    },
+                    "leftZone": {
+                        "label": "Zone gauche"
                     }
                 }
             }
@@ -115,6 +122,9 @@
                         "swing": {
                             "label": "Balayage"
                         },
+                        "rightZone": {
+                            "label": "Zone droite"
+                        },
                         "far": {
                             "label": "Longue"
                         },
@@ -129,6 +139,9 @@
                         },
                         "fixed": {
                             "label": "Fixe"
+                        },
+                        "leftZone": {
+                            "label": "Zone gauche"
                         }
                     },
                     "description": "fan oscillation mode"
diff --git a/json/fanOscillationMode.json b/json/fanOscillationMode.json
index b53fcddf..9bb561f9 100755
--- a/json/fanOscillationMode.json
+++ b/json/fanOscillationMode.json
@@ -29,7 +29,9 @@
                                 "wide",
                                 "mid",
                                 "spot",
-                                "swing"
+                                "swing",
+                                "leftZone",
+                                "rightZone"
                             ]
                         },
                         "type": "array"
@@ -66,7 +68,9 @@
                                 "wide",
                                 "mid",
                                 "spot",
-                                "swing"
+                                "swing",
+                                "leftZone",
+                                "rightZone"
                             ]
                         },
                         "type": "array"
@@ -100,14 +104,15 @@
                             "wide",
                             "mid",
                             "spot",
-                            "swing"
+                            "swing",
+                            "leftZone",
+                            "rightZone"
                         ]
                     }
                 },
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setFanOscillationMode",
             "enumCommands": []
         }
     },
@@ -137,11 +142,14 @@
                             "wide",
                             "mid",
                             "spot",
-                            "swing"
+                            "swing",
+                            "leftZone",
+                            "rightZone"
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/fanOscillationModePresentation.json b/json/fanOscillationModePresentation.json
index 776edee9..91ce0e2f 100755
--- a/json/fanOscillationModePresentation.json
+++ b/json/fanOscillationModePresentation.json
@@ -6,82 +6,92 @@
                 "alternatives": [
                     {
                         "key": "fixed",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixed.label}}",
+                        "value": "Fixed",
                         "type": "active"
                     },
                     {
                         "key": "vertical",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.vertical.label}}",
+                        "value": "Vertical",
                         "type": "active"
                     },
                     {
                         "key": "horizontal",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.horizontal.label}}",
+                        "value": "Horizontal",
                         "type": "active"
                     },
                     {
                         "key": "all",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.all.label}}",
+                        "value": "All",
                         "type": "active"
                     },
                     {
                         "key": "indirect",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.indirect.label}}",
+                        "value": "Indirect",
                         "type": "active"
                     },
                     {
                         "key": "direct",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.direct.label}}",
+                        "value": "Direct",
                         "type": "active"
                     },
                     {
                         "key": "fixedCenter",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedCenter.label}}",
+                        "value": "Centre",
                         "type": "active"
                     },
                     {
                         "key": "fixedLeft",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedLeft.label}}",
+                        "value": "Left",
                         "type": "active"
                     },
                     {
                         "key": "fixedRight",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedRight.label}}",
+                        "value": "Right",
                         "type": "active"
                     },
                     {
                         "key": "far",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.far.label}}",
+                        "value": "Long",
                         "type": "active"
                     },
                     {
                         "key": "individual",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.individual.label}}",
+                        "value": "Individual",
                         "type": "active"
                     },
                     {
                         "key": "wide",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.wide.label}}",
+                        "value": "Wide",
                         "type": "active"
                     },
                     {
                         "key": "mid",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.mid.label}}",
+                        "value": "Mid",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "active"
                     },
                     {
                         "key": "swing",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.swing.label}}",
+                        "value": "Swing",
                         "type": "active"
                     },
                     {
                         "key": "spot",
-                        "value": "{{i18n.attributes.fanOscillationMode.i18n.value.spot.label}}",
+                        "value": "Spot",
+                        "type": "active"
+                    },
+                    {
+                        "key": "leftZone",
+                        "value": "Left zone",
+                        "type": "active"
+                    },
+                    {
+                        "key": "rightZone",
+                        "value": "Right zone",
                         "type": "active"
                     }
                 ]
@@ -90,7 +100,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fan oscillation",
                 "displayType": "list",
                 "list": {
                     "command": {
@@ -98,82 +108,92 @@
                         "alternatives": [
                             {
                                 "key": "fixed",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixed.label}}",
+                                "value": "Fixed",
                                 "type": "active"
                             },
                             {
                                 "key": "vertical",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.vertical.label}}",
+                                "value": "Vertical",
                                 "type": "active"
                             },
                             {
                                 "key": "horizontal",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.horizontal.label}}",
+                                "value": "Horizontal",
                                 "type": "active"
                             },
                             {
                                 "key": "all",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.all.label}}",
+                                "value": "All",
                                 "type": "active"
                             },
                             {
                                 "key": "indirect",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.indirect.label}}",
+                                "value": "Indirect",
                                 "type": "active"
                             },
                             {
                                 "key": "direct",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.direct.label}}",
+                                "value": "Direct",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedCenter",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedCenter.label}}",
+                                "value": "Centre",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedLeft",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedLeft.label}}",
+                                "value": "Left",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedRight",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedRight.label}}",
+                                "value": "Right",
                                 "type": "active"
                             },
                             {
                                 "key": "far",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.far.label}}",
+                                "value": "Long",
                                 "type": "active"
                             },
                             {
                                 "key": "individual",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.individual.label}}",
+                                "value": "Individual",
                                 "type": "active"
                             },
                             {
                                 "key": "wide",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.wide.label}}",
+                                "value": "Wide",
                                 "type": "active"
                             },
                             {
                                 "key": "mid",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.mid.label}}",
+                                "value": "Mid",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.off.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "swing",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.swing.label}}",
+                                "value": "Swing",
                                 "type": "active"
                             },
                             {
                                 "key": "spot",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.spot.label}}",
+                                "value": "Spot",
+                                "type": "active"
+                            },
+                            {
+                                "key": "leftZone",
+                                "value": "Left zone",
+                                "type": "active"
+                            },
+                            {
+                                "key": "rightZone",
+                                "value": "Right zone",
                                 "type": "active"
                             }
                         ],
@@ -186,82 +206,92 @@
                         "alternatives": [
                             {
                                 "key": "fixed",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixed.label}}",
+                                "value": "Fixed",
                                 "type": "active"
                             },
                             {
                                 "key": "vertical",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.vertical.label}}",
+                                "value": "Vertical",
                                 "type": "active"
                             },
                             {
                                 "key": "horizontal",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.horizontal.label}}",
+                                "value": "Horizontal",
                                 "type": "active"
                             },
                             {
                                 "key": "all",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.all.label}}",
+                                "value": "All",
                                 "type": "active"
                             },
                             {
                                 "key": "indirect",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.indirect.label}}",
+                                "value": "Indirect",
                                 "type": "active"
                             },
                             {
                                 "key": "direct",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.direct.label}}",
+                                "value": "Direct",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedCenter",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedCenter.label}}",
+                                "value": "Centre",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedLeft",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedLeft.label}}",
+                                "value": "Left",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedRight",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedRight.label}}",
+                                "value": "Right",
                                 "type": "active"
                             },
                             {
                                 "key": "far",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.far.label}}",
+                                "value": "Long",
                                 "type": "active"
                             },
                             {
                                 "key": "individual",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.individual.label}}",
+                                "value": "Individual",
                                 "type": "active"
                             },
                             {
                                 "key": "wide",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.wide.label}}",
+                                "value": "Wide",
                                 "type": "active"
                             },
                             {
                                 "key": "mid",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.mid.label}}",
+                                "value": "Mid",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.off.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "swing",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.swing.label}}",
+                                "value": "Swing",
                                 "type": "active"
                             },
                             {
                                 "key": "spot",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.spot.label}}",
+                                "value": "Spot",
+                                "type": "active"
+                            },
+                            {
+                                "key": "leftZone",
+                                "value": "Left zone",
+                                "type": "active"
+                            },
+                            {
+                                "key": "rightZone",
+                                "value": "Right zone",
                                 "type": "active"
                             }
                         ]
@@ -276,7 +306,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Fan oscillation",
                 "displayType": "list",
                 "list": {
                     "command": {
@@ -284,82 +314,92 @@
                         "alternatives": [
                             {
                                 "key": "fixed",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixed.label}}",
+                                "value": "Fixed",
                                 "type": "active"
                             },
                             {
                                 "key": "vertical",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.vertical.label}}",
+                                "value": "Vertical",
                                 "type": "active"
                             },
                             {
                                 "key": "horizontal",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.horizontal.label}}",
+                                "value": "Horizontal",
                                 "type": "active"
                             },
                             {
                                 "key": "all",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.all.label}}",
+                                "value": "All",
                                 "type": "active"
                             },
                             {
                                 "key": "indirect",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.indirect.label}}",
+                                "value": "Indirect",
                                 "type": "active"
                             },
                             {
                                 "key": "direct",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.direct.label}}",
+                                "value": "Direct",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedCenter",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedCenter.label}}",
+                                "value": "Centre",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedLeft",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedLeft.label}}",
+                                "value": "Left",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedRight",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedRight.label}}",
+                                "value": "Right",
                                 "type": "active"
                             },
                             {
                                 "key": "far",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.far.label}}",
+                                "value": "Long",
                                 "type": "active"
                             },
                             {
                                 "key": "individual",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.individual.label}}",
+                                "value": "Individual",
                                 "type": "active"
                             },
                             {
                                 "key": "wide",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.wide.label}}",
+                                "value": "Wide",
                                 "type": "active"
                             },
                             {
                                 "key": "mid",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.mid.label}}",
+                                "value": "Mid",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.off.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "swing",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.swing.label}}",
+                                "value": "Swing",
                                 "type": "active"
                             },
                             {
                                 "key": "spot",
-                                "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.spot.label}}",
+                                "value": "Spot",
+                                "type": "active"
+                            },
+                            {
+                                "key": "leftZone",
+                                "value": "Left zone",
+                                "type": "active"
+                            },
+                            {
+                                "key": "rightZone",
+                                "value": "Right zone",
                                 "type": "active"
                             }
                         ],
@@ -372,82 +412,92 @@
                         "alternatives": [
                             {
                                 "key": "fixed",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixed.label}}",
+                                "value": "Fixed",
                                 "type": "active"
                             },
                             {
                                 "key": "vertical",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.vertical.label}}",
+                                "value": "Vertical",
                                 "type": "active"
                             },
                             {
                                 "key": "horizontal",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.horizontal.label}}",
+                                "value": "Horizontal",
                                 "type": "active"
                             },
                             {
                                 "key": "all",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.all.label}}",
+                                "value": "All",
                                 "type": "active"
                             },
                             {
                                 "key": "indirect",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.indirect.label}}",
+                                "value": "Indirect",
                                 "type": "active"
                             },
                             {
                                 "key": "direct",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.direct.label}}",
+                                "value": "Direct",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedCenter",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedCenter.label}}",
+                                "value": "Centre",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedLeft",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedLeft.label}}",
+                                "value": "Left",
                                 "type": "active"
                             },
                             {
                                 "key": "fixedRight",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedRight.label}}",
+                                "value": "Right",
                                 "type": "active"
                             },
                             {
                                 "key": "far",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.far.label}}",
+                                "value": "Long",
                                 "type": "active"
                             },
                             {
                                 "key": "individual",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.individual.label}}",
+                                "value": "Individual",
                                 "type": "active"
                             },
                             {
                                 "key": "wide",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.wide.label}}",
+                                "value": "Wide",
                                 "type": "active"
                             },
                             {
                                 "key": "mid",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.mid.label}}",
+                                "value": "Mid",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.off.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "swing",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.swing.label}}",
+                                "value": "Swing",
                                 "type": "active"
                             },
                             {
                                 "key": "spot",
-                                "value": "{{i18n.attributes.fanOscillationMode.i18n.value.spot.label}}",
+                                "value": "Spot",
+                                "type": "active"
+                            },
+                            {
+                                "key": "leftZone",
+                                "value": "Left zone",
+                                "type": "active"
+                            },
+                            {
+                                "key": "rightZone",
+                                "value": "Right zone",
                                 "type": "active"
                             }
                         ]
@@ -465,7 +515,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Fan oscillation",
             "displayType": "list",
             "list": {
                 "command": {
@@ -473,82 +523,92 @@
                     "alternatives": [
                         {
                             "key": "fixed",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixed.label}}",
+                            "value": "Fixed",
                             "type": "active"
                         },
                         {
                             "key": "vertical",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.vertical.label}}",
+                            "value": "Vertical",
                             "type": "active"
                         },
                         {
                             "key": "horizontal",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.horizontal.label}}",
+                            "value": "Horizontal",
                             "type": "active"
                         },
                         {
                             "key": "all",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.all.label}}",
+                            "value": "All",
                             "type": "active"
                         },
                         {
                             "key": "indirect",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.indirect.label}}",
+                            "value": "Indirect",
                             "type": "active"
                         },
                         {
                             "key": "direct",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.direct.label}}",
+                            "value": "Direct",
                             "type": "active"
                         },
                         {
                             "key": "fixedCenter",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedCenter.label}}",
+                            "value": "Centre",
                             "type": "active"
                         },
                         {
                             "key": "fixedLeft",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedLeft.label}}",
+                            "value": "Left",
                             "type": "active"
                         },
                         {
                             "key": "fixedRight",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedRight.label}}",
+                            "value": "Right",
                             "type": "active"
                         },
                         {
                             "key": "far",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.far.label}}",
+                            "value": "Long",
                             "type": "active"
                         },
                         {
                             "key": "individual",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.individual.label}}",
+                            "value": "Individual",
                             "type": "active"
                         },
                         {
                             "key": "wide",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.wide.label}}",
+                            "value": "Wide",
                             "type": "active"
                         },
                         {
                             "key": "mid",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.mid.label}}",
+                            "value": "Mid",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "swing",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.swing.label}}",
+                            "value": "Swing",
                             "type": "active"
                         },
                         {
                             "key": "spot",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.spot.label}}",
+                            "value": "Spot",
+                            "type": "active"
+                        },
+                        {
+                            "key": "leftZone",
+                            "value": "Left zone",
+                            "type": "active"
+                        },
+                        {
+                            "key": "rightZone",
+                            "value": "Right zone",
                             "type": "active"
                         }
                     ],
@@ -561,82 +621,92 @@
                     "alternatives": [
                         {
                             "key": "fixed",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixed.label}}",
+                            "value": "Fixed",
                             "type": "active"
                         },
                         {
                             "key": "vertical",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.vertical.label}}",
+                            "value": "Vertical",
                             "type": "active"
                         },
                         {
                             "key": "horizontal",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.horizontal.label}}",
+                            "value": "Horizontal",
                             "type": "active"
                         },
                         {
                             "key": "all",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.all.label}}",
+                            "value": "All",
                             "type": "active"
                         },
                         {
                             "key": "indirect",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.indirect.label}}",
+                            "value": "Indirect",
                             "type": "active"
                         },
                         {
                             "key": "direct",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.direct.label}}",
+                            "value": "Direct",
                             "type": "active"
                         },
                         {
                             "key": "fixedCenter",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedCenter.label}}",
+                            "value": "Centre",
                             "type": "active"
                         },
                         {
                             "key": "fixedLeft",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedLeft.label}}",
+                            "value": "Left",
                             "type": "active"
                         },
                         {
                             "key": "fixedRight",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedRight.label}}",
+                            "value": "Right",
                             "type": "active"
                         },
                         {
                             "key": "far",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.far.label}}",
+                            "value": "Long",
                             "type": "active"
                         },
                         {
                             "key": "individual",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.individual.label}}",
+                            "value": "Individual",
                             "type": "active"
                         },
                         {
                             "key": "wide",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.wide.label}}",
+                            "value": "Wide",
                             "type": "active"
                         },
                         {
                             "key": "mid",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.mid.label}}",
+                            "value": "Mid",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "swing",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.swing.label}}",
+                            "value": "Swing",
                             "type": "active"
                         },
                         {
                             "key": "spot",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.spot.label}}",
+                            "value": "Spot",
+                            "type": "active"
+                        },
+                        {
+                            "key": "leftZone",
+                            "value": "Left zone",
+                            "type": "active"
+                        },
+                        {
+                            "key": "rightZone",
+                            "value": "Right zone",
                             "type": "active"
                         }
                     ]
@@ -647,88 +717,98 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fan oscillation",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "fixed",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixed.label}}",
+                            "value": "Fixed",
                             "type": "active"
                         },
                         {
                             "key": "vertical",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.vertical.label}}",
+                            "value": "Vertical",
                             "type": "active"
                         },
                         {
                             "key": "horizontal",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.horizontal.label}}",
+                            "value": "Horizontal",
                             "type": "active"
                         },
                         {
                             "key": "all",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.all.label}}",
+                            "value": "All",
                             "type": "active"
                         },
                         {
                             "key": "indirect",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.indirect.label}}",
+                            "value": "Indirect",
                             "type": "active"
                         },
                         {
                             "key": "direct",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.direct.label}}",
+                            "value": "Direct",
                             "type": "active"
                         },
                         {
                             "key": "fixedCenter",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedCenter.label}}",
+                            "value": "Centre",
                             "type": "active"
                         },
                         {
                             "key": "fixedLeft",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedLeft.label}}",
+                            "value": "Left",
                             "type": "active"
                         },
                         {
                             "key": "fixedRight",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.fixedRight.label}}",
+                            "value": "Right",
                             "type": "active"
                         },
                         {
                             "key": "far",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.far.label}}",
+                            "value": "Long",
                             "type": "active"
                         },
                         {
                             "key": "individual",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.individual.label}}",
+                            "value": "Individual",
                             "type": "active"
                         },
                         {
                             "key": "wide",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.wide.label}}",
+                            "value": "Wide",
                             "type": "active"
                         },
                         {
                             "key": "mid",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.mid.label}}",
+                            "value": "Mid",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "swing",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.swing.label}}",
+                            "value": "Swing",
                             "type": "active"
                         },
                         {
                             "key": "spot",
-                            "value": "{{i18n.attributes.fanOscillationMode.i18n.value.spot.label}}",
+                            "value": "Spot",
+                            "type": "active"
+                        },
+                        {
+                            "key": "leftZone",
+                            "value": "Left zone",
+                            "type": "active"
+                        },
+                        {
+                            "key": "rightZone",
+                            "value": "Right zone",
                             "type": "active"
                         }
                     ],
@@ -741,88 +821,98 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fan oscillation",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "fixed",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixed.label}}",
+                            "value": "Fixed",
                             "type": "active"
                         },
                         {
                             "key": "vertical",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.vertical.label}}",
+                            "value": "Vertical",
                             "type": "active"
                         },
                         {
                             "key": "horizontal",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.horizontal.label}}",
+                            "value": "Horizontal",
                             "type": "active"
                         },
                         {
                             "key": "all",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.all.label}}",
+                            "value": "All",
                             "type": "active"
                         },
                         {
                             "key": "indirect",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.indirect.label}}",
+                            "value": "Indirect",
                             "type": "active"
                         },
                         {
                             "key": "direct",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.direct.label}}",
+                            "value": "Direct",
                             "type": "active"
                         },
                         {
                             "key": "fixedCenter",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedCenter.label}}",
+                            "value": "Centre",
                             "type": "active"
                         },
                         {
                             "key": "fixedLeft",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedLeft.label}}",
+                            "value": "Left",
                             "type": "active"
                         },
                         {
                             "key": "fixedRight",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.fixedRight.label}}",
+                            "value": "Right",
                             "type": "active"
                         },
                         {
                             "key": "far",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.far.label}}",
+                            "value": "Long",
                             "type": "active"
                         },
                         {
                             "key": "individual",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.individual.label}}",
+                            "value": "Individual",
                             "type": "active"
                         },
                         {
                             "key": "wide",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.wide.label}}",
+                            "value": "Wide",
                             "type": "active"
                         },
                         {
                             "key": "mid",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.mid.label}}",
+                            "value": "Mid",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "swing",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.swing.label}}",
+                            "value": "Swing",
                             "type": "active"
                         },
                         {
                             "key": "spot",
-                            "value": "{{i18n.commands.setFanOscillationMode.arguments.fanOscillationMode.i18n.spot.label}}",
+                            "value": "Spot",
+                            "type": "active"
+                        },
+                        {
+                            "key": "leftZone",
+                            "value": "Left zone",
+                            "type": "active"
+                        },
+                        {
+                            "key": "rightZone",
+                            "value": "Right zone",
                             "type": "active"
                         }
                     ],
diff --git a/json/fanSpeedPercentPresentation.json b/json/fanSpeedPercentPresentation.json
index 4d3131a4..aef3d965 100755
--- a/json/fanSpeedPercentPresentation.json
+++ b/json/fanSpeedPercentPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Fan speed",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -28,7 +28,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fan speed",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -43,7 +43,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fan speed",
                 "displayType": "slider",
                 "slider": {
                     "range": [
diff --git a/json/fanSpeedPresentation.json b/json/fanSpeedPresentation.json
index 88b8491f..d69aea7c 100755
--- a/json/fanSpeedPresentation.json
+++ b/json/fanSpeedPresentation.json
@@ -6,27 +6,27 @@
                 "alternatives": [
                     {
                         "key": "0",
-                        "value": "{{i18n.attributes.fanSpeed.i18n.value.0.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     },
                     {
                         "key": "1",
-                        "value": "{{i18n.attributes.fanSpeed.i18n.value.1.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "2",
-                        "value": "{{i18n.attributes.fanSpeed.i18n.value.2.label}}",
+                        "value": "Medium",
                         "type": "active"
                     },
                     {
                         "key": "3",
-                        "value": "{{i18n.attributes.fanSpeed.i18n.value.3.label}}",
+                        "value": "High",
                         "type": "active"
                     },
                     {
                         "key": "4",
-                        "value": "{{i18n.attributes.fanSpeed.i18n.value.4.label}}",
+                        "value": "Max",
                         "type": "active"
                     }
                 ]
@@ -37,7 +37,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Fan speed",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -47,27 +47,27 @@
                 "alternatives": [
                     {
                         "key": "0",
-                        "value": "{{i18n.attributes.fanSpeed.i18n.value.0.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     },
                     {
                         "key": "1",
-                        "value": "{{i18n.attributes.fanSpeed.i18n.value.1.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "2",
-                        "value": "{{i18n.attributes.fanSpeed.i18n.value.2.label}}",
+                        "value": "Medium",
                         "type": "active"
                     },
                     {
                         "key": "3",
-                        "value": "{{i18n.attributes.fanSpeed.i18n.value.3.label}}",
+                        "value": "High",
                         "type": "active"
                     },
                     {
                         "key": "4",
-                        "value": "{{i18n.attributes.fanSpeed.i18n.value.4.label}}",
+                        "value": "Max",
                         "type": "active"
                     }
                 ],
@@ -81,33 +81,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fan speed",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "0",
-                            "value": "{{i18n.attributes.fanSpeed.i18n.value.0.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "1",
-                            "value": "{{i18n.attributes.fanSpeed.i18n.value.1.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "2",
-                            "value": "{{i18n.attributes.fanSpeed.i18n.value.2.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "3",
-                            "value": "{{i18n.attributes.fanSpeed.i18n.value.3.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "4",
-                            "value": "{{i18n.attributes.fanSpeed.i18n.value.4.label}}",
+                            "value": "Max",
                             "type": "active"
                         }
                     ],
@@ -119,33 +119,33 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fan speed",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "0",
-                            "value": "{{i18n.commands.setFanSpeed.arguments.speed.i18n.0.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "1",
-                            "value": "{{i18n.commands.setFanSpeed.arguments.speed.i18n.1.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "2",
-                            "value": "{{i18n.commands.setFanSpeed.arguments.speed.i18n.2.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "3",
-                            "value": "{{i18n.commands.setFanSpeed.arguments.speed.i18n.3.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "4",
-                            "value": "{{i18n.commands.setFanSpeed.arguments.speed.i18n.4.label}}",
+                            "value": "Max",
                             "type": "active"
                         }
                     ],
diff --git a/json/feederOperatingStatePresentation.json b/json/feederOperatingStatePresentation.json
index e3772e9d..779c208c 100755
--- a/json/feederOperatingStatePresentation.json
+++ b/json/feederOperatingStatePresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "feeding",
-                        "value": "{{i18n.attributes.feederOperatingState.i18n.value.feeding.label}}",
+                        "value": "Feeding",
                         "type": "active"
                     },
                     {
                         "key": "idle",
-                        "value": "{{i18n.attributes.feederOperatingState.i18n.value.idle.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "error",
-                        "value": "{{i18n.attributes.feederOperatingState.i18n.value.error.label}}",
+                        "value": "Something's wrong",
                         "type": "inactive"
                     }
                 ]
@@ -34,14 +34,14 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Pet feeder",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "startFeeding",
-                            "value": "{{i18n.commands.startFeeding.label}}",
+                            "value": "Feeding",
                             "type": "active"
                         }
                     ]
@@ -52,17 +52,17 @@
                     "alternatives": [
                         {
                             "key": "feeding",
-                            "value": "{{i18n.attributes.feederOperatingState.i18n.value.feeding.label}}",
+                            "value": "Feeding",
                             "type": "active"
                         },
                         {
                             "key": "idle",
-                            "value": "{{i18n.attributes.feederOperatingState.i18n.value.idle.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "error",
-                            "value": "{{i18n.attributes.feederOperatingState.i18n.value.error.label}}",
+                            "value": "Something's wrong",
                             "type": "inactive"
                         }
                     ]
@@ -73,23 +73,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Pet feeder",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "feeding",
-                            "value": "{{i18n.attributes.feederOperatingState.i18n.value.feeding.label}}",
+                            "value": "Feeding",
                             "type": "active"
                         },
                         {
                             "key": "idle",
-                            "value": "{{i18n.attributes.feederOperatingState.i18n.value.idle.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "error",
-                            "value": "{{i18n.attributes.feederOperatingState.i18n.value.error.label}}",
+                            "value": "Something's wrong",
                             "type": "inactive"
                         }
                     ],
@@ -101,13 +101,13 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Pet feeder",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "startFeeding",
-                            "value": "{{i18n.commands.startFeeding.label}}",
+                            "value": "Feeding",
                             "type": "active"
                         }
                     ]
diff --git a/json/feederPortionPresentation.json b/json/feederPortionPresentation.json
index b9ece984..fcbc5feb 100755
--- a/json/feederPortionPresentation.json
+++ b/json/feederPortionPresentation.json
@@ -6,7 +6,7 @@
                 "alternatives": [
                     {
                         "key": "servings",
-                        "value": "{{i18n.attributes.feedPortion.i18n.unit.servings.label}}",
+                        "value": "serving(s)",
                         "type": "active"
                     }
                 ]
@@ -17,7 +17,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Feeder portion",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -29,7 +29,7 @@
                 "alternatives": [
                     {
                         "key": "servings",
-                        "value": "{{i18n.attributes.feedPortion.i18n.unit.servings.label}}",
+                        "value": "serving(s)",
                         "type": "active"
                     }
                 ],
@@ -44,7 +44,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Feeder portion",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -55,7 +55,7 @@
                     "alternatives": [
                         {
                             "key": "servings",
-                            "value": "{{i18n.attributes.feedPortion.i18n.unit.servings.label}}",
+                            "value": "serving(s)",
                             "type": "active"
                         }
                     ],
diff --git a/json/filterStatePresentation.json b/json/filterStatePresentation.json
index 5077a66b..704a7e4d 100755
--- a/json/filterStatePresentation.json
+++ b/json/filterStatePresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Filter",
             "displayType": "state",
             "state": {
                 "label": "{{filterLifeRemaining.value}}",
@@ -18,14 +18,14 @@
             }
         },
         {
-            "label": "{{i18n.commands.resetFilter.label}}",
+            "label": "Reset filter",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "resetFilter",
-                            "value": "{{i18n.commands.resetFilter.label}}",
+                            "value": "Reset filter",
                             "type": "active"
                         }
                     ],
@@ -37,7 +37,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Filter",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "filterLifeRemaining.value",
diff --git a/json/filterStatusPresentation.json b/json/filterStatusPresentation.json
index 38982855..49b57968 100755
--- a/json/filterStatusPresentation.json
+++ b/json/filterStatusPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.filterStatus.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "active"
                     },
                     {
                         "key": "replace",
-                        "value": "{{i18n.attributes.filterStatus.i18n.value.replace.label}}",
+                        "value": "Replacement needed",
                         "type": "active"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Filter state",
             "displayType": "state",
             "state": {
                 "label": "{{filterStatus.value}}",
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.filterStatus.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "active"
                     },
                     {
                         "key": "replace",
-                        "value": "{{i18n.attributes.filterStatus.i18n.value.replace.label}}",
+                        "value": "Replacement needed",
                         "type": "active"
                     }
                 ]
diff --git a/json/fineDustHealthConcernPresentation.json b/json/fineDustHealthConcernPresentation.json
index 9a6fc182..a43296d8 100755
--- a/json/fineDustHealthConcernPresentation.json
+++ b/json/fineDustHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Fine dust",
             "displayType": "state",
             "state": {
                 "label": "{{fineDustHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fine dust",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.fineDustHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/fineDustSensorPresentation.json b/json/fineDustSensorPresentation.json
index 62a54570..9e5db696 100755
--- a/json/fineDustSensorPresentation.json
+++ b/json/fineDustSensorPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "PM 2.5",
             "displayType": "state",
             "state": {
                 "label": "{{fineDustLevel.value}}",
@@ -21,7 +21,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "PM 2.5",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "fineDustLevel.value",
diff --git a/json/firmwareUpdate.i18n.en.json b/json/firmwareUpdate.i18n.en.json
index 6e53622d..09f2d6d3 100755
--- a/json/firmwareUpdate.i18n.en.json
+++ b/json/firmwareUpdate.i18n.en.json
@@ -11,7 +11,7 @@
         },
         "imageTransferProgress": {
             "label": "imageTransferProgress",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
         },
         "availableVersion": {
diff --git a/json/firmwareUpdate.i18n.fr.json b/json/firmwareUpdate.i18n.fr.json
index 6e53622d..09f2d6d3 100644
--- a/json/firmwareUpdate.i18n.fr.json
+++ b/json/firmwareUpdate.i18n.fr.json
@@ -11,7 +11,7 @@
         },
         "imageTransferProgress": {
             "label": "imageTransferProgress",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
         },
         "availableVersion": {
diff --git a/json/flowMeasurementPresentation.json b/json/flowMeasurementPresentation.json
index 62f9dd8b..7e883981 100644
--- a/json/flowMeasurementPresentation.json
+++ b/json/flowMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Flow measurement",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -27,7 +27,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Flow measurement",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "flow.value",
diff --git a/json/foodWasteDryingGrinder.i18n.en.json b/json/foodWasteDryingGrinder.i18n.en.json
new file mode 100644
index 00000000..2e500ceb
--- /dev/null
+++ b/json/foodWasteDryingGrinder.i18n.en.json
@@ -0,0 +1,110 @@
+{
+    "tag": "en",
+    "label": "Food Waste Drying Grinder",
+    "attributes": {
+        "mode": {
+            "label": "mode",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "standard": {
+                        "label": "standard"
+                    },
+                    "eco": {
+                        "label": "eco"
+                    },
+                    "auto": {
+                        "label": "auto"
+                    },
+                    "power": {
+                        "label": "power"
+                    },
+                    "storage": {
+                        "label": "storage"
+                    },
+                    "clean": {
+                        "label": "clean"
+                    }
+                }
+            }
+        },
+        "supportedStates": {
+            "label": "supportedStates",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "state": {
+            "label": "state",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "running": {
+                        "label": "running"
+                    },
+                    "cleaning": {
+                        "label": "cleaning"
+                    },
+                    "waiting": {
+                        "label": "waiting"
+                    },
+                    "drying": {
+                        "label": "drying"
+                    },
+                    "grinding": {
+                        "label": "grinding"
+                    },
+                    "cooling": {
+                        "label": "cooling"
+                    },
+                    "completed": {
+                        "label": "completed"
+                    },
+                    "error": {
+                        "label": "error"
+                    }
+                }
+            }
+        },
+        "supportedModes": {
+            "label": "supportedModes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "event": {
+            "label": "event",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "cleaningComplete": {
+                        "label": "cleaningComplete"
+                    },
+                    "error": {
+                        "label": "error"
+                    },
+                    "operationComplete": {
+                        "label": "operationComplete"
+                    }
+                }
+            }
+        },
+        "supportedEvents": {
+            "label": "supportedEvents",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "stop": {
+            "label": "stop",
+            "arguments": {}
+        },
+        "start": {
+            "label": "start",
+            "arguments": {}
+        },
+        "setMode": {
+            "label": "setMode",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/foodWasteDryingGrinder.i18n.fr.json b/json/foodWasteDryingGrinder.i18n.fr.json
new file mode 100644
index 00000000..2e500ceb
--- /dev/null
+++ b/json/foodWasteDryingGrinder.i18n.fr.json
@@ -0,0 +1,110 @@
+{
+    "tag": "en",
+    "label": "Food Waste Drying Grinder",
+    "attributes": {
+        "mode": {
+            "label": "mode",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "standard": {
+                        "label": "standard"
+                    },
+                    "eco": {
+                        "label": "eco"
+                    },
+                    "auto": {
+                        "label": "auto"
+                    },
+                    "power": {
+                        "label": "power"
+                    },
+                    "storage": {
+                        "label": "storage"
+                    },
+                    "clean": {
+                        "label": "clean"
+                    }
+                }
+            }
+        },
+        "supportedStates": {
+            "label": "supportedStates",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "state": {
+            "label": "state",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "running": {
+                        "label": "running"
+                    },
+                    "cleaning": {
+                        "label": "cleaning"
+                    },
+                    "waiting": {
+                        "label": "waiting"
+                    },
+                    "drying": {
+                        "label": "drying"
+                    },
+                    "grinding": {
+                        "label": "grinding"
+                    },
+                    "cooling": {
+                        "label": "cooling"
+                    },
+                    "completed": {
+                        "label": "completed"
+                    },
+                    "error": {
+                        "label": "error"
+                    }
+                }
+            }
+        },
+        "supportedModes": {
+            "label": "supportedModes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "event": {
+            "label": "event",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "cleaningComplete": {
+                        "label": "cleaningComplete"
+                    },
+                    "error": {
+                        "label": "error"
+                    },
+                    "operationComplete": {
+                        "label": "operationComplete"
+                    }
+                }
+            }
+        },
+        "supportedEvents": {
+            "label": "supportedEvents",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "stop": {
+            "label": "stop",
+            "arguments": {}
+        },
+        "start": {
+            "label": "start",
+            "arguments": {}
+        },
+        "setMode": {
+            "label": "setMode",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/foodWasteDryingGrinder.json b/json/foodWasteDryingGrinder.json
new file mode 100644
index 00000000..6725db93
--- /dev/null
+++ b/json/foodWasteDryingGrinder.json
@@ -0,0 +1,195 @@
+{
+    "id": "foodWasteDryingGrinder",
+    "version": 1,
+    "status": "proposed",
+    "name": "Food Waste Drying Grinder",
+    "ephemeral": false,
+    "attributes": {
+        "mode": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "FoodWasteDryingGrinderMode",
+                        "type": "string",
+                        "enum": [
+                            "auto",
+                            "standard",
+                            "power",
+                            "eco",
+                            "storage",
+                            "clean"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setMode",
+            "enumCommands": []
+        },
+        "supportedStates": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "FoodWasteDryingGrinderState",
+                            "type": "string",
+                            "enum": [
+                                "waiting",
+                                "running",
+                                "drying",
+                                "grinding",
+                                "cooling",
+                                "cleaning",
+                                "completed",
+                                "error"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "state": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "FoodWasteDryingGrinderState",
+                        "type": "string",
+                        "enum": [
+                            "waiting",
+                            "running",
+                            "drying",
+                            "grinding",
+                            "cooling",
+                            "cleaning",
+                            "completed",
+                            "error"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedModes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "FoodWasteDryingGrinderMode",
+                            "type": "string",
+                            "enum": [
+                                "auto",
+                                "standard",
+                                "power",
+                                "eco",
+                                "storage",
+                                "clean"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "event": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "FoodWasteDryingGrinderEvent",
+                        "type": "string",
+                        "enum": [
+                            "error",
+                            "operationComplete",
+                            "cleaningComplete"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedEvents": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "FoodWasteDryingGrinderEvent",
+                            "type": "string",
+                            "enum": [
+                                "error",
+                                "operationComplete",
+                                "cleaningComplete"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "stop": {
+            "name": "stop",
+            "arguments": [],
+            "sensitive": false
+        },
+        "start": {
+            "name": "start",
+            "arguments": [],
+            "sensitive": false
+        },
+        "setMode": {
+            "name": "setMode",
+            "arguments": [
+                {
+                    "name": "mode",
+                    "optional": false,
+                    "schema": {
+                        "title": "FoodWasteDryingGrinderMode",
+                        "type": "string",
+                        "enum": [
+                            "auto",
+                            "standard",
+                            "power",
+                            "eco",
+                            "storage",
+                            "clean"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/foodWasteDryingGrinderPresentation.json b/json/foodWasteDryingGrinderPresentation.json
new file mode 100644
index 00000000..686f2824
--- /dev/null
+++ b/json/foodWasteDryingGrinderPresentation.json
@@ -0,0 +1,446 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{state.value}}",
+                "alternatives": [
+                    {
+                        "key": "waiting",
+                        "value": "waiting",
+                        "type": "inactive"
+                    },
+                    {
+                        "key": "running",
+                        "value": "running",
+                        "type": "active"
+                    },
+                    {
+                        "key": "drying",
+                        "value": "drying",
+                        "type": "active"
+                    },
+                    {
+                        "key": "grinding",
+                        "value": "grinding",
+                        "type": "active"
+                    },
+                    {
+                        "key": "cooling",
+                        "value": "cooling",
+                        "type": "active"
+                    },
+                    {
+                        "key": "cleaning",
+                        "value": "cleaning",
+                        "type": "active"
+                    },
+                    {
+                        "key": "completed",
+                        "value": "completed",
+                        "type": "inactive"
+                    },
+                    {
+                        "key": "error",
+                        "value": "error",
+                        "type": "inactive"
+                    }
+                ]
+            }
+        ],
+        "actions": [
+            {
+                "displayType": "playStop",
+                "playStop": {
+                    "command": {
+                        "play": "start",
+                        "stop": "stop"
+                    },
+                    "state": {
+                        "value": "state.value",
+                        "play": "running",
+                        "stop": "waiting",
+                        "alternatives": [
+                            {
+                                "key": "waiting",
+                                "value": "waiting",
+                                "type": "inactive"
+                            },
+                            {
+                                "key": "running",
+                                "value": "running",
+                                "type": "active"
+                            },
+                            {
+                                "key": "drying",
+                                "value": "drying",
+                                "type": "active"
+                            },
+                            {
+                                "key": "grinding",
+                                "value": "grinding",
+                                "type": "active"
+                            },
+                            {
+                                "key": "cooling",
+                                "value": "cooling",
+                                "type": "active"
+                            },
+                            {
+                                "key": "cleaning",
+                                "value": "cleaning",
+                                "type": "active"
+                            },
+                            {
+                                "key": "completed",
+                                "value": "completed",
+                                "type": "inactive"
+                            },
+                            {
+                                "key": "error",
+                                "value": "error",
+                                "type": "active"
+                            }
+                        ],
+                        "valueType": "string"
+                    }
+                }
+            }
+        ],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "state",
+            "displayType": "list",
+            "list": {
+                "command": {
+                    "alternatives": [
+                        {
+                            "key": "start",
+                            "value": "start",
+                            "type": "active"
+                        },
+                        {
+                            "key": "stop",
+                            "value": "stop",
+                            "type": "inactive"
+                        }
+                    ]
+                },
+                "state": {
+                    "value": "state.value",
+                    "valueType": "string",
+                    "alternatives": [
+                        {
+                            "key": "waiting",
+                            "value": "waiting",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "running",
+                            "value": "running",
+                            "type": "active"
+                        },
+                        {
+                            "key": "drying",
+                            "value": "drying",
+                            "type": "active"
+                        },
+                        {
+                            "key": "grinding",
+                            "value": "grinding",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cooling",
+                            "value": "cooling",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cleaning",
+                            "value": "cleaning",
+                            "type": "active"
+                        },
+                        {
+                            "key": "completed",
+                            "value": "completed",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "error",
+                            "value": "error",
+                            "type": "active"
+                        }
+                    ]
+                }
+            }
+        },
+        {
+            "label": "mode",
+            "displayType": "list",
+            "list": {
+                "command": {
+                    "name": "setMode",
+                    "alternatives": [
+                        {
+                            "key": "auto",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_AUTO",
+                            "type": "active"
+                        },
+                        {
+                            "key": "standard",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_STANDARD",
+                            "type": "active"
+                        },
+                        {
+                            "key": "clean",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_CLEAN",
+                            "type": "active"
+                        },
+                        {
+                            "key": "power",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_POWER",
+                            "type": "active"
+                        },
+                        {
+                            "key": "eco",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_ECO",
+                            "type": "active"
+                        },
+                        {
+                            "key": "storage",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_STORAGE",
+                            "type": "active"
+                        }
+                    ],
+                    "argumentType": "string",
+                    "supportedValues": "supportedModes.value"
+                },
+                "state": {
+                    "value": "mode.value",
+                    "valueType": "string",
+                    "alternatives": [
+                        {
+                            "key": "auto",
+                            "value": "auto",
+                            "type": "active"
+                        },
+                        {
+                            "key": "standard",
+                            "value": "standard",
+                            "type": "active"
+                        },
+                        {
+                            "key": "clean",
+                            "value": "clean",
+                            "type": "active"
+                        },
+                        {
+                            "key": "power",
+                            "value": "power",
+                            "type": "active"
+                        },
+                        {
+                            "key": "eco",
+                            "value": "eco",
+                            "type": "active"
+                        },
+                        {
+                            "key": "storage",
+                            "value": "storage",
+                            "type": "active"
+                        }
+                    ]
+                }
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "state",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "waiting",
+                            "value": "waiting",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "running",
+                            "value": "running",
+                            "type": "active"
+                        },
+                        {
+                            "key": "drying",
+                            "value": "drying",
+                            "type": "active"
+                        },
+                        {
+                            "key": "grinding",
+                            "value": "grinding",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cooling",
+                            "value": "cooling",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cleaning",
+                            "value": "cleaning",
+                            "type": "active"
+                        },
+                        {
+                            "key": "completed",
+                            "value": "completed",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "error",
+                            "value": "error",
+                            "type": "active"
+                        }
+                    ],
+                    "supportedValues": "supportedStates.value",
+                    "value": "state.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "mode",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "auto",
+                            "value": "auto",
+                            "type": "active"
+                        },
+                        {
+                            "key": "standard",
+                            "value": "standard",
+                            "type": "active"
+                        },
+                        {
+                            "key": "clean",
+                            "value": "clean",
+                            "type": "active"
+                        },
+                        {
+                            "key": "power",
+                            "value": "power",
+                            "type": "active"
+                        },
+                        {
+                            "key": "eco",
+                            "value": "eco",
+                            "type": "active"
+                        },
+                        {
+                            "key": "storage",
+                            "value": "storage",
+                            "type": "active"
+                        }
+                    ],
+                    "supportedValues": "supportedModes.value",
+                    "value": "mode.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "event",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "error",
+                            "value": "error",
+                            "type": "active"
+                        },
+                        {
+                            "key": "operationComplete",
+                            "value": "operationComplete",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cleaningComplete",
+                            "value": "cleaningComplete",
+                            "type": "active"
+                        }
+                    ],
+                    "supportedValues": "supportedEvents.value",
+                    "value": "event.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": [
+            {
+                "label": "Food Waste Drying Grinder",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "start",
+                            "value": "start",
+                            "type": "active"
+                        },
+                        {
+                            "key": "stop",
+                            "value": "stop",
+                            "type": "active"
+                        }
+                    ]
+                }
+            },
+            {
+                "label": "setMode",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "auto",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_AUTO",
+                            "type": "active"
+                        },
+                        {
+                            "key": "standard",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_STANDARD",
+                            "type": "active"
+                        },
+                        {
+                            "key": "clean",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_CLEAN",
+                            "type": "active"
+                        },
+                        {
+                            "key": "power",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_POWER",
+                            "type": "active"
+                        },
+                        {
+                            "key": "eco",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_ECO",
+                            "type": "active"
+                        },
+                        {
+                            "key": "storage",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.FOODWASTEDRYINGGRINDER_DEFAULT_COMMANDS_SETMODE_MODE_STORAGE",
+                            "type": "active"
+                        }
+                    ],
+                    "supportedValues": "supportedModes.value",
+                    "command": "setMode",
+                    "argumentType": "string"
+                }
+            }
+        ]
+    },
+    "id": "foodWasteDryingGrinder",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/formaldehydeHealthConcernPresentation.json b/json/formaldehydeHealthConcernPresentation.json
index daf047e6..d2a024f4 100755
--- a/json/formaldehydeHealthConcernPresentation.json
+++ b/json/formaldehydeHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Formaldehyde level",
             "displayType": "state",
             "state": {
                 "label": "{{formaldehydeHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Formaldehyde level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.formaldehydeHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/formaldehydeMeasurementPresentation.json b/json/formaldehydeMeasurementPresentation.json
index 4908b01f..439b4803 100755
--- a/json/formaldehydeMeasurementPresentation.json
+++ b/json/formaldehydeMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Formaldehyde",
             "displayType": "state",
             "state": {
                 "label": "{{formaldehydeLevel.value}}",
@@ -21,7 +21,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Formaldehyde",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "formaldehydeLevel.value",
diff --git a/json/garageDoorControlPresentation.json b/json/garageDoorControlPresentation.json
index 99b29854..ded09d04 100755
--- a/json/garageDoorControlPresentation.json
+++ b/json/garageDoorControlPresentation.json
@@ -6,27 +6,27 @@
                 "alternatives": [
                     {
                         "key": "closed",
-                        "value": "{{i18n.attributes.door.i18n.value.closed.label}}",
+                        "value": "Closed",
                         "type": "inactive"
                     },
                     {
                         "key": "open",
-                        "value": "{{i18n.attributes.door.i18n.value.open.label}}",
+                        "value": "Open",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.door.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     },
                     {
                         "key": "opening",
-                        "value": "{{i18n.attributes.door.i18n.value.opening.label}}",
+                        "value": "Opening…",
                         "type": "active"
                     },
                     {
                         "key": "closing",
-                        "value": "{{i18n.attributes.door.i18n.value.closing.label}}",
+                        "value": "Closing…",
                         "type": "active"
                     }
                 ]
@@ -52,7 +52,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Garage door",
             "displayType": "toggleSwitch",
             "toggleSwitch": {
                 "command": {
@@ -67,27 +67,27 @@
                     "alternatives": [
                         {
                             "key": "closed",
-                            "value": "{{i18n.attributes.door.i18n.value.closed.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         },
                         {
                             "key": "open",
-                            "value": "{{i18n.attributes.door.i18n.value.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.door.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         },
                         {
                             "key": "opening",
-                            "value": "{{i18n.attributes.door.i18n.value.opening.label}}",
+                            "value": "Opening…",
                             "type": "active"
                         },
                         {
                             "key": "closing",
-                            "value": "{{i18n.attributes.door.i18n.value.closing.label}}",
+                            "value": "Closing…",
                             "type": "active"
                         }
                     ]
@@ -98,33 +98,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Garage door",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "closing",
-                            "value": "{{i18n.attributes.door.i18n.value.closing.label}}",
+                            "value": "Closing…",
                             "type": "active"
                         },
                         {
                             "key": "opening",
-                            "value": "{{i18n.attributes.door.i18n.value.opening.label}}",
+                            "value": "Opening…",
                             "type": "active"
                         },
                         {
                             "key": "closed",
-                            "value": "{{i18n.attributes.door.i18n.value.closed.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         },
                         {
                             "key": "open",
-                            "value": "{{i18n.attributes.door.i18n.value.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.door.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
@@ -135,18 +135,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Garage door",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "close",
-                            "value": "{{i18n.commands.close.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         },
                         {
                             "key": "open",
-                            "value": "{{i18n.commands.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         }
                     ]
diff --git a/json/gasDetectorPresentation.json b/json/gasDetectorPresentation.json
index a24ce3f5..6e3365b9 100755
--- a/json/gasDetectorPresentation.json
+++ b/json/gasDetectorPresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.gas.i18n.value.clear.label}}",
+                        "value": "Clear",
                         "type": "inactive"
                     },
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.gas.i18n.value.detected.label}}",
+                        "value": "Gas detected",
                         "type": "active"
                     },
                     {
                         "key": "tested",
-                        "value": "{{i18n.attributes.gas.i18n.value.tested.label}}",
+                        "value": "Device tested",
                         "type": "active"
                     }
                 ]
@@ -27,24 +27,24 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Gas detector",
             "displayType": "state",
             "state": {
                 "label": "{{gas.value}}",
                 "alternatives": [
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.gas.i18n.value.clear.label}}",
+                        "value": "Clear",
                         "type": "inactive"
                     },
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.gas.i18n.value.detected.label}}",
+                        "value": "Gas detected",
                         "type": "active"
                     },
                     {
                         "key": "tested",
-                        "value": "{{i18n.attributes.gas.i18n.value.tested.label}}",
+                        "value": "Device tested",
                         "type": "active"
                     }
                 ]
@@ -54,18 +54,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Gas detector",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "clear",
-                            "value": "{{i18n.attributes.gas.i18n.value.clear.label}}",
+                            "value": "Clear",
                             "type": "inactive"
                         },
                         {
                             "key": "detected",
-                            "value": "{{i18n.attributes.gas.i18n.value.detected.label}}",
+                            "value": "Gas detected",
                             "type": "active"
                         }
                     ],
diff --git a/json/gasMeterPresentation.json b/json/gasMeterPresentation.json
index 8332826c..e43b2d44 100755
--- a/json/gasMeterPresentation.json
+++ b/json/gasMeterPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Gas meter",
             "displayType": "state",
             "state": {
                 "label": "{{gasMeterVolume.value}}",
@@ -18,7 +18,7 @@
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Gas meter",
             "displayType": "state",
             "state": {
                 "label": "{{gasMeter.value}}",
@@ -26,42 +26,42 @@
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Gas meter",
             "displayType": "state",
             "state": {
                 "label": "{{gasMeterCalorific.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Gas meter",
             "displayType": "state",
             "state": {
                 "label": "{{gasMeterConversion.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Gas meter",
             "displayType": "state",
             "state": {
                 "label": "{{gasMeterPrecision.value.volume}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Gas meter",
             "displayType": "state",
             "state": {
                 "label": "{{gasMeterPrecision.value.calorific}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Gas meter",
             "displayType": "state",
             "state": {
                 "label": "{{gasMeterPrecision.value.conversion}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Gas meter",
             "displayType": "state",
             "state": {
                 "label": "{{gasMeterTime.value}}"
@@ -71,7 +71,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Gas meter",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "gasMeterVolume.value",
@@ -80,7 +80,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Gas meter",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "gasMeter.value",
@@ -89,7 +89,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Gas meter",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "gasMeterCalorific.value",
@@ -97,7 +97,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Gas meter",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "gasMeterConversion.value",
@@ -105,7 +105,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Gas meter",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "gasMeterPrecision.value.volume",
@@ -113,7 +113,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Gas meter",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "gasMeterPrecision.value.calorific",
@@ -121,7 +121,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Gas meter",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "gasMeterPrecision.value.conversion",
@@ -129,7 +129,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Gas meter",
                 "displayType": "textField",
                 "textField": {
                     "value": "gasMeterTime.value"
diff --git a/json/geolocationPresentation.json b/json/geolocationPresentation.json
index ced68292..31358170 100755
--- a/json/geolocationPresentation.json
+++ b/json/geolocationPresentation.json
@@ -1,56 +1,56 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.attributes.latitude.label}}",
+            "label": "Latitude",
             "displayType": "state",
             "state": {
                 "label": "{{latitude.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.longitude.label}}",
+            "label": "Longitude",
             "displayType": "state",
             "state": {
                 "label": "{{longitude.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Geolocation",
             "displayType": "state",
             "state": {
                 "label": "{{method.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Geolocation",
             "displayType": "state",
             "state": {
                 "label": "{{heading.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Geolocation",
             "displayType": "state",
             "state": {
                 "label": "{{accuracy.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Geolocation",
             "displayType": "state",
             "state": {
                 "label": "{{altitudeAccuracy.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Geolocation",
             "displayType": "state",
             "state": {
                 "label": "{{speed.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Geolocation",
             "displayType": "state",
             "state": {
                 "label": "{{lastUpdateTime.value}}"
diff --git a/json/gridStatePresentation.json b/json/gridStatePresentation.json
index ef4bf12b..9c98481c 100644
--- a/json/gridStatePresentation.json
+++ b/json/gridStatePresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "OnGrid",
-                        "value": "{{i18n.attributes.grid.i18n.value.OnGrid.label}}",
+                        "value": "On-gird",
                         "type": "active"
                     },
                     {
                         "key": "OffGrid",
-                        "value": "{{i18n.attributes.grid.i18n.value.OffGrid.label}}",
+                        "value": "Off-grid",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Grid state",
             "displayType": "state",
             "state": {
                 "label": "{{grid.value}}",
                 "alternatives": [
                     {
                         "key": "OnGrid",
-                        "value": "{{i18n.attributes.grid.i18n.value.OnGrid.label}}",
+                        "value": "On-gird",
                         "type": "active"
                     },
                     {
                         "key": "OffGrid",
-                        "value": "{{i18n.attributes.grid.i18n.value.OffGrid.label}}",
+                        "value": "Off-grid",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Grid state",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "OnGrid",
-                            "value": "{{i18n.attributes.grid.i18n.value.OnGrid.label}}",
+                            "value": "On-gird",
                             "type": "active"
                         },
                         {
                             "key": "OffGrid",
-                            "value": "{{i18n.attributes.grid.i18n.value.OffGrid.label}}",
+                            "value": "Off-grid",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/hardwareFaultPresentation.json b/json/hardwareFaultPresentation.json
index 40507bae..2f704071 100755
--- a/json/hardwareFaultPresentation.json
+++ b/json/hardwareFaultPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.hardwareFault.i18n.value.clear.label}}",
+                        "value": "Clear",
                         "type": "inactive"
                     },
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.hardwareFault.i18n.value.detected.label}}",
+                        "value": "Detected",
                         "type": "active"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Hardware problem",
             "displayType": "state",
             "state": {
                 "label": "{{hardwareFault.value}}",
                 "alternatives": [
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.hardwareFault.i18n.value.clear.label}}",
+                        "value": "Clear",
                         "type": "inactive"
                     },
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.hardwareFault.i18n.value.detected.label}}",
+                        "value": "Detected",
                         "type": "active"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Hardware problem",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "clear",
-                            "value": "{{i18n.attributes.hardwareFault.i18n.value.clear.label}}",
+                            "value": "Clear",
                             "type": "inactive"
                         },
                         {
                             "key": "detected",
-                            "value": "{{i18n.attributes.hardwareFault.i18n.value.detected.label}}",
+                            "value": "Detected",
                             "type": "active"
                         }
                     ],
diff --git a/json/hca.washerMode.json b/json/hca.washerMode.json
index d33c6094..627ec130 100755
--- a/json/hca.washerMode.json
+++ b/json/hca.washerMode.json
@@ -27,7 +27,6 @@
                     "value"
                 ]
             },
-            "setter": "setMode",
             "enumCommands": []
         },
         "supportedModes": {
@@ -76,7 +75,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/hca.washerModePresentation.json b/json/hca.washerModePresentation.json
index dfba5ad8..66c2d07d 100755
--- a/json/hca.washerModePresentation.json
+++ b/json/hca.washerModePresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.mode.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "active"
                     },
                     {
                         "key": "mix",
-                        "value": "{{i18n.attributes.mode.i18n.value.mix.label}}",
+                        "value": "Heavy duty",
                         "type": "active"
                     },
                     {
                         "key": "quickWash",
-                        "value": "{{i18n.attributes.mode.i18n.value.quickWash.label}}",
+                        "value": "Quick wash",
                         "type": "active"
                     },
                     {
                         "key": "rinseOnly",
-                        "value": "{{i18n.attributes.mode.i18n.value.rinseOnly.label}}",
+                        "value": "Rinse only",
                         "type": "active"
                     },
                     {
                         "key": "spinOnly",
-                        "value": "{{i18n.attributes.mode.i18n.value.spinOnly.label}}",
+                        "value": "Spin only",
                         "type": "active"
                     },
                     {
                         "key": "eco",
-                        "value": "{{i18n.attributes.mode.i18n.value.eco.label}}",
+                        "value": "Eco",
                         "type": "active"
                     },
                     {
                         "key": "others",
-                        "value": "{{i18n.attributes.mode.i18n.value.others.label}}",
+                        "value": "Others",
                         "type": "active"
                     }
                 ]
@@ -47,7 +47,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -55,32 +55,32 @@
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "mix",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.mix.label}}",
+                            "value": "Heavy duty",
                             "type": "active"
                         },
                         {
                             "key": "quickWash",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.quickWash.label}}",
+                            "value": "Quick wash",
                             "type": "active"
                         },
                         {
                             "key": "rinseOnly",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.rinseOnly.label}}",
+                            "value": "Rinse only",
                             "type": "active"
                         },
                         {
                             "key": "spinOnly",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.spinOnly.label}}",
+                            "value": "Spin only",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         }
                     ],
@@ -93,37 +93,37 @@
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.mode.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "mix",
-                            "value": "{{i18n.attributes.mode.i18n.value.mix.label}}",
+                            "value": "Heavy duty",
                             "type": "active"
                         },
                         {
                             "key": "quickWash",
-                            "value": "{{i18n.attributes.mode.i18n.value.quickWash.label}}",
+                            "value": "Quick wash",
                             "type": "active"
                         },
                         {
                             "key": "rinseOnly",
-                            "value": "{{i18n.attributes.mode.i18n.value.rinseOnly.label}}",
+                            "value": "Rinse only",
                             "type": "active"
                         },
                         {
                             "key": "spinOnly",
-                            "value": "{{i18n.attributes.mode.i18n.value.spinOnly.label}}",
+                            "value": "Spin only",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.attributes.mode.i18n.value.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "others",
-                            "value": "{{i18n.attributes.mode.i18n.value.others.label}}",
+                            "value": "Others",
                             "type": "active"
                         }
                     ]
@@ -134,43 +134,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.mode.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.mode.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "mix",
-                            "value": "{{i18n.attributes.mode.i18n.value.mix.label}}",
+                            "value": "Heavy duty",
                             "type": "active"
                         },
                         {
                             "key": "quickWash",
-                            "value": "{{i18n.attributes.mode.i18n.value.quickWash.label}}",
+                            "value": "Quick wash",
                             "type": "active"
                         },
                         {
                             "key": "rinseOnly",
-                            "value": "{{i18n.attributes.mode.i18n.value.rinseOnly.label}}",
+                            "value": "Rinse only",
                             "type": "active"
                         },
                         {
                             "key": "spinOnly",
-                            "value": "{{i18n.attributes.mode.i18n.value.spinOnly.label}}",
+                            "value": "Spin only",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.attributes.mode.i18n.value.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "others",
-                            "value": "{{i18n.attributes.mode.i18n.value.others.label}}",
+                            "value": "Others",
                             "type": "active"
                         }
                     ],
@@ -183,38 +183,38 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.commands.setMode.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "mix",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.mix.label}}",
+                            "value": "Heavy duty",
                             "type": "active"
                         },
                         {
                             "key": "quickWash",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.quickWash.label}}",
+                            "value": "Quick wash",
                             "type": "active"
                         },
                         {
                             "key": "rinseOnly",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.rinseOnly.label}}",
+                            "value": "Rinse only",
                             "type": "active"
                         },
                         {
                             "key": "spinOnly",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.spinOnly.label}}",
+                            "value": "Spin only",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         }
                     ],
diff --git a/json/hdr.i18n.en.json b/json/hdr.i18n.en.json
new file mode 100644
index 00000000..d1b4526a
--- /dev/null
+++ b/json/hdr.i18n.en.json
@@ -0,0 +1,26 @@
+{
+    "tag": "en",
+    "label": "Hdr",
+    "attributes": {
+        "hdr": {
+            "label": "hdr",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "setHdr": {
+            "label": "setHdr",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/hdr.i18n.fr.json b/json/hdr.i18n.fr.json
new file mode 100644
index 00000000..d1b4526a
--- /dev/null
+++ b/json/hdr.i18n.fr.json
@@ -0,0 +1,26 @@
+{
+    "tag": "en",
+    "label": "Hdr",
+    "attributes": {
+        "hdr": {
+            "label": "hdr",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "setHdr": {
+            "label": "setHdr",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/hdr.json b/json/hdr.json
new file mode 100644
index 00000000..104ce817
--- /dev/null
+++ b/json/hdr.json
@@ -0,0 +1,50 @@
+{
+    "id": "hdr",
+    "version": 1,
+    "status": "proposed",
+    "name": "Hdr",
+    "ephemeral": false,
+    "attributes": {
+        "hdr": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setHdr",
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "setHdr": {
+            "name": "setHdr",
+            "arguments": [
+                {
+                    "name": "state",
+                    "optional": false,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/humidifierMode.i18n.en.json b/json/humidifierMode.i18n.en.json
index 628597e0..3fb59c7c 100755
--- a/json/humidifierMode.i18n.en.json
+++ b/json/humidifierMode.i18n.en.json
@@ -32,12 +32,12 @@
             "arguments": {
                 "humidifierMode": {
                     "i18n": {
-                        "high": {
-                            "label": "High"
-                        },
                         "auto": {
                             "label": "Auto"
                         },
+                        "high": {
+                            "label": "High"
+                        },
                         "low": {
                             "label": "Low"
                         },
diff --git a/json/humidifierMode.i18n.fr.json b/json/humidifierMode.i18n.fr.json
index e18bd8db..7bfd91d9 100755
--- a/json/humidifierMode.i18n.fr.json
+++ b/json/humidifierMode.i18n.fr.json
@@ -32,12 +32,12 @@
             "arguments": {
                 "humidifierMode": {
                     "i18n": {
-                        "high": {
-                            "label": "Élevé"
-                        },
                         "auto": {
                             "label": "Automatique"
                         },
+                        "high": {
+                            "label": "Élevé"
+                        },
                         "low": {
                             "label": "Faible"
                         },
diff --git a/json/humidifierMode.json b/json/humidifierMode.json
index 20f4dc2f..b9403327 100755
--- a/json/humidifierMode.json
+++ b/json/humidifierMode.json
@@ -23,7 +23,6 @@
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setHumidifierMode",
             "enumCommands": []
         }
     },
@@ -45,7 +44,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/humidifierModePresentation.json b/json/humidifierModePresentation.json
index df4998cc..fb186196 100755
--- a/json/humidifierModePresentation.json
+++ b/json/humidifierModePresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "auto",
-                        "value": "{{i18n.attributes.humidifierMode.i18n.value.auto.label}}",
+                        "value": "Auto",
                         "type": "active"
                     },
                     {
                         "key": "low",
-                        "value": "{{i18n.attributes.humidifierMode.i18n.value.low.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "medium",
-                        "value": "{{i18n.attributes.humidifierMode.i18n.value.medium.label}}",
+                        "value": "Medium",
                         "type": "active"
                     },
                     {
                         "key": "high",
-                        "value": "{{i18n.attributes.humidifierMode.i18n.value.high.label}}",
+                        "value": "High",
                         "type": "active"
                     }
                 ]
@@ -32,7 +32,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Humidifier mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -40,22 +40,22 @@
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setHumidifierMode.arguments.humidifierMode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.commands.setHumidifierMode.arguments.humidifierMode.i18n.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.commands.setHumidifierMode.arguments.humidifierMode.i18n.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.commands.setHumidifierMode.arguments.humidifierMode.i18n.high.label}}",
+                            "value": "High",
                             "type": "active"
                         }
                     ]
@@ -65,22 +65,22 @@
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.humidifierMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.attributes.humidifierMode.i18n.value.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.attributes.humidifierMode.i18n.value.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.attributes.humidifierMode.i18n.value.high.label}}",
+                            "value": "High",
                             "type": "active"
                         }
                     ]
@@ -91,28 +91,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Humidifier mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.humidifierMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.attributes.humidifierMode.i18n.value.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.attributes.humidifierMode.i18n.value.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.attributes.humidifierMode.i18n.value.high.label}}",
+                            "value": "High",
                             "type": "active"
                         }
                     ],
@@ -123,28 +123,28 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Humidifier mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setHumidifierMode.arguments.humidifierMode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.commands.setHumidifierMode.arguments.humidifierMode.i18n.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "medium",
-                            "value": "{{i18n.commands.setHumidifierMode.arguments.humidifierMode.i18n.medium.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.commands.setHumidifierMode.arguments.humidifierMode.i18n.high.label}}",
+                            "value": "High",
                             "type": "active"
                         }
                     ],
diff --git a/json/illuminanceMeasurementPresentation.json b/json/illuminanceMeasurementPresentation.json
index 07018baf..a30efe37 100755
--- a/json/illuminanceMeasurementPresentation.json
+++ b/json/illuminanceMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Illuminance",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Illuminance",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "illuminance.value",
diff --git a/json/imageCapturePresentation.json b/json/imageCapturePresentation.json
index 3f5a8398..5caaf231 100755
--- a/json/imageCapturePresentation.json
+++ b/json/imageCapturePresentation.json
@@ -10,14 +10,14 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Image capture",
             "displayType": "state",
             "state": {
                 "label": "{{image.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Image capture",
             "displayType": "state",
             "state": {
                 "label": "{{captureTime.value}}"
@@ -28,13 +28,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Image capture",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "take",
-                            "value": "{{i18n.label}}",
+                            "value": "Image capture",
                             "type": "active"
                         }
                     ]
diff --git a/json/imageControl.i18n.en.json b/json/imageControl.i18n.en.json
new file mode 100644
index 00000000..88d5b354
--- /dev/null
+++ b/json/imageControl.i18n.en.json
@@ -0,0 +1,58 @@
+{
+    "tag": "en",
+    "label": "Image Control",
+    "attributes": {
+        "imageRotation": {
+            "label": "imageRotation",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "imageFlipVertical": {
+            "label": "imageFlipVertical",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "imageFlipHorizontal": {
+            "label": "imageFlipHorizontal",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setImageFlipVertical": {
+            "label": "setImageFlipVertical",
+            "arguments": {}
+        },
+        "setImageRotation": {
+            "label": "setImageRotation",
+            "arguments": {}
+        },
+        "setImageFlipHorizontal": {
+            "label": "setImageFlipHorizontal",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/imageControl.i18n.fr.json b/json/imageControl.i18n.fr.json
new file mode 100644
index 00000000..88d5b354
--- /dev/null
+++ b/json/imageControl.i18n.fr.json
@@ -0,0 +1,58 @@
+{
+    "tag": "en",
+    "label": "Image Control",
+    "attributes": {
+        "imageRotation": {
+            "label": "imageRotation",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "imageFlipVertical": {
+            "label": "imageFlipVertical",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "imageFlipHorizontal": {
+            "label": "imageFlipHorizontal",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setImageFlipVertical": {
+            "label": "setImageFlipVertical",
+            "arguments": {}
+        },
+        "setImageRotation": {
+            "label": "setImageRotation",
+            "arguments": {}
+        },
+        "setImageFlipHorizontal": {
+            "label": "setImageFlipHorizontal",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/imageControl.json b/json/imageControl.json
new file mode 100644
index 00000000..6ad72388
--- /dev/null
+++ b/json/imageControl.json
@@ -0,0 +1,152 @@
+{
+    "id": "imageControl",
+    "version": 1,
+    "status": "proposed",
+    "name": "Image Control",
+    "ephemeral": false,
+    "attributes": {
+        "imageRotation": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 0,
+                        "maximum": 359
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "°"
+                        ],
+                        "default": "°"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setImageRotation",
+            "enumCommands": []
+        },
+        "imageFlipVertical": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setImageFlipVertical",
+            "enumCommands": []
+        },
+        "imageFlipHorizontal": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setImageFlipHorizontal",
+            "enumCommands": []
+        },
+        "supportedAttributes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "imageFlipHorizontal",
+                                "imageFlipVertical",
+                                "imageRotation"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "setImageFlipVertical": {
+            "name": "setImageFlipVertical",
+            "arguments": [
+                {
+                    "name": "state",
+                    "optional": false,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "setImageRotation": {
+            "name": "setImageRotation",
+            "arguments": [
+                {
+                    "name": "rotation",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": 0,
+                        "maximum": 359
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "setImageFlipHorizontal": {
+            "name": "setImageFlipHorizontal",
+            "arguments": [
+                {
+                    "name": "state",
+                    "optional": false,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/infraredLevelPresentation.json b/json/infraredLevelPresentation.json
index 6cc49acf..83f72263 100755
--- a/json/infraredLevelPresentation.json
+++ b/json/infraredLevelPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Infrared level",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -28,7 +28,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Infrared level",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "infraredLevel.value",
@@ -43,7 +43,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Infrared level",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setInfraredLevel",
diff --git a/json/keypadInput.i18n.en.json b/json/keypadInput.i18n.en.json
index 21398c09..82e9076a 100755
--- a/json/keypadInput.i18n.en.json
+++ b/json/keypadInput.i18n.en.json
@@ -29,20 +29,20 @@
                         "MENU": {
                             "label": "Menu"
                         },
-                        "UP": {
-                            "label": "Up"
-                        },
                         "SETTINGS": {
                             "label": "Settings"
                         },
-                        "SELECT": {
-                            "label": "Select"
+                        "UP": {
+                            "label": "Up"
                         },
                         "EXIT": {
                             "label": "Exit"
                         },
                         "HOME": {
                             "label": "Home"
+                        },
+                        "SELECT": {
+                            "label": "Select"
                         }
                     }
                 }
diff --git a/json/keypadInput.i18n.fr.json b/json/keypadInput.i18n.fr.json
index 1c49d6a3..f7246c1b 100755
--- a/json/keypadInput.i18n.fr.json
+++ b/json/keypadInput.i18n.fr.json
@@ -29,20 +29,20 @@
                         "MENU": {
                             "label": "Menu"
                         },
-                        "UP": {
-                            "label": "Haut"
-                        },
                         "SETTINGS": {
                             "label": "Paramètres"
                         },
-                        "SELECT": {
-                            "label": "Sélectionner"
+                        "UP": {
+                            "label": "Haut"
                         },
                         "EXIT": {
                             "label": "Quitter"
                         },
                         "HOME": {
                             "label": "Maison"
+                        },
+                        "SELECT": {
+                            "label": "Sélectionner"
                         }
                     }
                 }
diff --git a/json/keypadInputPresentation.json b/json/keypadInputPresentation.json
index 0d2a09f7..c5613fbe 100755
--- a/json/keypadInputPresentation.json
+++ b/json/keypadInputPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Keypad",
             "displayType": "list",
             "list": {
                 "command": {
@@ -9,52 +9,52 @@
                     "alternatives": [
                         {
                             "key": "UP",
-                            "value": "{{i18n.commands.sendKey.arguments.keyCode.i18n.UP.label}}",
+                            "value": "Up",
                             "type": "active"
                         },
                         {
                             "key": "DOWN",
-                            "value": "{{i18n.commands.sendKey.arguments.keyCode.i18n.DOWN.label}}",
+                            "value": "Down",
                             "type": "active"
                         },
                         {
                             "key": "LEFT",
-                            "value": "{{i18n.commands.sendKey.arguments.keyCode.i18n.LEFT.label}}",
+                            "value": "Left",
                             "type": "active"
                         },
                         {
                             "key": "RIGHT",
-                            "value": "{{i18n.commands.sendKey.arguments.keyCode.i18n.RIGHT.label}}",
+                            "value": "Right",
                             "type": "active"
                         },
                         {
                             "key": "SELECT",
-                            "value": "{{i18n.commands.sendKey.arguments.keyCode.i18n.SELECT.label}}",
+                            "value": "Select",
                             "type": "active"
                         },
                         {
                             "key": "BACK",
-                            "value": "{{i18n.commands.sendKey.arguments.keyCode.i18n.BACK.label}}",
+                            "value": "Back",
                             "type": "active"
                         },
                         {
                             "key": "EXIT",
-                            "value": "{{i18n.commands.sendKey.arguments.keyCode.i18n.EXIT.label}}",
+                            "value": "Exit",
                             "type": "active"
                         },
                         {
                             "key": "MENU",
-                            "value": "{{i18n.commands.sendKey.arguments.keyCode.i18n.MENU.label}}",
+                            "value": "Menu",
                             "type": "active"
                         },
                         {
                             "key": "SETTINGS",
-                            "value": "{{i18n.commands.sendKey.arguments.keyCode.i18n.SETTINGS.label}}",
+                            "value": "Settings",
                             "type": "active"
                         },
                         {
                             "key": "HOME",
-                            "value": "{{i18n.commands.sendKey.arguments.keyCode.i18n.HOME.label}}",
+                            "value": "Home",
                             "type": "active"
                         },
                         {
diff --git a/json/knob.i18n.en.json b/json/knob.i18n.en.json
new file mode 100644
index 00000000..f7323f66
--- /dev/null
+++ b/json/knob.i18n.en.json
@@ -0,0 +1,22 @@
+{
+    "tag": "en",
+    "label": "Knob",
+    "attributes": {
+        "rotateAmount": {
+            "label": "rotateAmount",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "heldRotateAmount": {
+            "label": "heldRotateAmount",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/knob.i18n.fr.json b/json/knob.i18n.fr.json
new file mode 100644
index 00000000..f7323f66
--- /dev/null
+++ b/json/knob.i18n.fr.json
@@ -0,0 +1,22 @@
+{
+    "tag": "en",
+    "label": "Knob",
+    "attributes": {
+        "rotateAmount": {
+            "label": "rotateAmount",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "heldRotateAmount": {
+            "label": "heldRotateAmount",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/knob.json b/json/knob.json
new file mode 100644
index 00000000..38ba3bff
--- /dev/null
+++ b/json/knob.json
@@ -0,0 +1,80 @@
+{
+    "id": "knob",
+    "version": 1,
+    "status": "proposed",
+    "name": "Knob",
+    "ephemeral": false,
+    "attributes": {
+        "rotateAmount": {
+            "schema": {
+                "title": "RelativeStep",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": -100,
+                        "maximum": 100
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "%"
+                        ],
+                        "default": "%"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedAttributes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "rotateAmount",
+                                "heldRotateAmount"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
+        "heldRotateAmount": {
+            "schema": {
+                "title": "RelativeStep",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": -100,
+                        "maximum": 100
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "%"
+                        ],
+                        "default": "%"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/languageSettingPresentation.json b/json/languageSettingPresentation.json
index 6adade60..a4c23d4a 100755
--- a/json/languageSettingPresentation.json
+++ b/json/languageSettingPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Language",
             "displayType": "textField",
             "textField": {
                 "command": "setLanguage",
diff --git a/json/laundryWasherRinseModePresentation.json b/json/laundryWasherRinseModePresentation.json
index 34b99aa5..4652e73e 100755
--- a/json/laundryWasherRinseModePresentation.json
+++ b/json/laundryWasherRinseModePresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.rinseMode.i18n.value.none.label}}",
+                        "value": "None",
                         "type": "inactive"
                     },
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.rinseMode.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "active"
                     },
                     {
                         "key": "extra",
-                        "value": "{{i18n.attributes.rinseMode.i18n.value.extra.label}}",
+                        "value": "Extra",
                         "type": "active"
                     },
                     {
                         "key": "max",
-                        "value": "{{i18n.attributes.rinseMode.i18n.value.max.label}}",
+                        "value": "Max",
                         "type": "active"
                     }
                 ]
@@ -32,7 +32,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Rinse mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -40,22 +40,22 @@
                     "alternatives": [
                         {
                             "key": "none",
-                            "value": "{{i18n.commands.setRinseMode.arguments.rinseMode.i18n.none.label}}",
+                            "value": "None",
                             "type": "inactive"
                         },
                         {
                             "key": "normal",
-                            "value": "{{i18n.commands.setRinseMode.arguments.rinseMode.i18n.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "extra",
-                            "value": "{{i18n.commands.setRinseMode.arguments.rinseMode.i18n.extra.label}}",
+                            "value": "Extra",
                             "type": "active"
                         },
                         {
                             "key": "max",
-                            "value": "{{i18n.commands.setRinseMode.arguments.rinseMode.i18n.max.label}}",
+                            "value": "Max",
                             "type": "active"
                         }
                     ],
@@ -68,22 +68,22 @@
                     "alternatives": [
                         {
                             "key": "none",
-                            "value": "{{i18n.attributes.rinseMode.i18n.value.none.label}}",
+                            "value": "None",
                             "type": "inactive"
                         },
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.rinseMode.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "extra",
-                            "value": "{{i18n.attributes.rinseMode.i18n.value.extra.label}}",
+                            "value": "Extra",
                             "type": "active"
                         },
                         {
                             "key": "max",
-                            "value": "{{i18n.attributes.rinseMode.i18n.value.max.label}}",
+                            "value": "Max",
                             "type": "active"
                         }
                     ]
@@ -94,28 +94,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Rinse mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "none",
-                            "value": "{{i18n.attributes.rinseMode.i18n.value.none.label}}",
+                            "value": "None",
                             "type": "inactive"
                         },
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.rinseMode.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "extra",
-                            "value": "{{i18n.attributes.rinseMode.i18n.value.extra.label}}",
+                            "value": "Extra",
                             "type": "active"
                         },
                         {
                             "key": "max",
-                            "value": "{{i18n.attributes.rinseMode.i18n.value.max.label}}",
+                            "value": "Max",
                             "type": "active"
                         }
                     ],
@@ -128,28 +128,28 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Rinse mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "none",
-                            "value": "{{i18n.commands.setRinseMode.arguments.rinseMode.i18n.none.label}}",
+                            "value": "None",
                             "type": "inactive"
                         },
                         {
                             "key": "normal",
-                            "value": "{{i18n.commands.setRinseMode.arguments.rinseMode.i18n.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "extra",
-                            "value": "{{i18n.commands.setRinseMode.arguments.rinseMode.i18n.extra.label}}",
+                            "value": "Extra",
                             "type": "active"
                         },
                         {
                             "key": "max",
-                            "value": "{{i18n.commands.setRinseMode.arguments.rinseMode.i18n.max.label}}",
+                            "value": "Max",
                             "type": "active"
                         }
                     ],
diff --git a/json/laundryWasherSpinSpeedPresentation.json b/json/laundryWasherSpinSpeedPresentation.json
index e07f00ce..ef6c5ec9 100755
--- a/json/laundryWasherSpinSpeedPresentation.json
+++ b/json/laundryWasherSpinSpeedPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Spin speed",
             "displayType": "list",
             "list": {
                 "command": {
@@ -62,7 +62,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Spin speed",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
@@ -91,7 +91,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Spin speed",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
diff --git a/json/levelPresentation.json b/json/levelPresentation.json
index 115f0253..7c8475e1 100644
--- a/json/levelPresentation.json
+++ b/json/levelPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Level",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -30,7 +30,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Level",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -47,7 +47,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Level",
                 "displayType": "slider",
                 "slider": {
                     "range": [
diff --git a/json/lightControllerMode.json b/json/lightControllerMode.json
index 4338d0ff..5a3df4fc 100755
--- a/json/lightControllerMode.json
+++ b/json/lightControllerMode.json
@@ -25,7 +25,6 @@
                     "value"
                 ]
             },
-            "setter": "setLightControllerMode",
             "enumCommands": []
         },
         "supportedLightControllerModes": {
@@ -70,7 +69,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/lightControllerModePresentation.json b/json/lightControllerModePresentation.json
index 1b3f8f3d..5ec05d9a 100644
--- a/json/lightControllerModePresentation.json
+++ b/json/lightControllerModePresentation.json
@@ -6,27 +6,27 @@
                 "alternatives": [
                     {
                         "key": "rgbw",
-                        "value": "{{i18n.attributes.lightControllerMode.i18n.value.rgbw.label}}",
+                        "value": "RGBW",
                         "type": "active",
-                        "description": "{{i18n.attributes.lightControllerMode.i18n.value.rgbw.description}}"
+                        "description": "Red, green, blue, and white"
                     },
                     {
                         "key": "rgb",
-                        "value": "{{i18n.attributes.lightControllerMode.i18n.value.rgb.label}}",
+                        "value": "RGB",
                         "type": "active",
-                        "description": "{{i18n.attributes.lightControllerMode.i18n.value.rgb.description}}"
+                        "description": "Red, green, and blue"
                     },
                     {
                         "key": "colorTemperature",
-                        "value": "{{i18n.attributes.lightControllerMode.i18n.value.colorTemperature.label}}",
+                        "value": "Colour temp",
                         "type": "active",
-                        "description": "{{i18n.attributes.lightControllerMode.i18n.value.colorTemperature.description}}"
+                        "description": "Warm and cool"
                     },
                     {
                         "key": "dimmer",
-                        "value": "{{i18n.attributes.lightControllerMode.i18n.value.dimmer.label}}",
+                        "value": "Dimmer",
                         "type": "active",
-                        "description": "{{i18n.attributes.lightControllerMode.i18n.value.dimmer.description}}"
+                        "description": "Dimmer pins"
                     }
                 ]
             }
@@ -36,7 +36,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Light controller mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -44,27 +44,27 @@
                     "alternatives": [
                         {
                             "key": "rgbw",
-                            "value": "{{i18n.commands.setLightControllerMode.arguments.mode.i18n.rgbw.label}}",
+                            "value": "RGBW",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.rgbw.description}}"
+                            "description": "Red, green, blue, and white"
                         },
                         {
                             "key": "rgb",
-                            "value": "{{i18n.commands.setLightControllerMode.arguments.mode.i18n.rgb.label}}",
+                            "value": "RGB",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.rgb.description}}"
+                            "description": "Red, green, and blue"
                         },
                         {
                             "key": "colorTemperature",
-                            "value": "{{i18n.commands.setLightControllerMode.arguments.mode.i18n.colorTemperature.label}}",
+                            "value": "Colour temp",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.colorTemperature.description}}"
+                            "description": "Warm and cool"
                         },
                         {
                             "key": "dimmer",
-                            "value": "{{i18n.commands.setLightControllerMode.arguments.mode.i18n.dimmer.label}}",
+                            "value": "Dimmer",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.dimmer.description}}"
+                            "description": "Dimmer pins"
                         }
                     ],
                     "argumentType": "string",
@@ -76,27 +76,27 @@
                     "alternatives": [
                         {
                             "key": "rgbw",
-                            "value": "{{i18n.attributes.lightControllerMode.i18n.value.rgbw.label}}",
+                            "value": "RGBW",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.rgbw.description}}"
+                            "description": "Red, green, blue, and white"
                         },
                         {
                             "key": "rgb",
-                            "value": "{{i18n.attributes.lightControllerMode.i18n.value.rgb.label}}",
+                            "value": "RGB",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.rgb.description}}"
+                            "description": "Red, green, and blue"
                         },
                         {
                             "key": "colorTemperature",
-                            "value": "{{i18n.attributes.lightControllerMode.i18n.value.colorTemperature.label}}",
+                            "value": "Colour temp",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.colorTemperature.description}}"
+                            "description": "Warm and cool"
                         },
                         {
                             "key": "dimmer",
-                            "value": "{{i18n.attributes.lightControllerMode.i18n.value.dimmer.label}}",
+                            "value": "Dimmer",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.dimmer.description}}"
+                            "description": "Dimmer pins"
                         }
                     ]
                 }
@@ -106,33 +106,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Light controller mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "rgbw",
-                            "value": "{{i18n.attributes.lightControllerMode.i18n.value.rgbw.label}}",
+                            "value": "RGBW",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.rgbw.description}}"
+                            "description": "Red, green, blue, and white"
                         },
                         {
                             "key": "rgb",
-                            "value": "{{i18n.attributes.lightControllerMode.i18n.value.rgb.label}}",
+                            "value": "RGB",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.rgb.description}}"
+                            "description": "Red, green, and blue"
                         },
                         {
                             "key": "colorTemperature",
-                            "value": "{{i18n.attributes.lightControllerMode.i18n.value.colorTemperature.label}}",
+                            "value": "Colour temp",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.colorTemperature.description}}"
+                            "description": "Warm and cool"
                         },
                         {
                             "key": "dimmer",
-                            "value": "{{i18n.attributes.lightControllerMode.i18n.value.dimmer.label}}",
+                            "value": "Dimmer",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.dimmer.description}}"
+                            "description": "Dimmer pins"
                         }
                     ],
                     "supportedValues": "supportedLightControllerModes.value",
@@ -144,33 +144,33 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Light controller mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "rgbw",
-                            "value": "{{i18n.commands.setLightControllerMode.arguments.mode.i18n.rgbw.label}}",
+                            "value": "RGBW",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.rgbw.description}}"
+                            "description": "Red, green, blue, and white"
                         },
                         {
                             "key": "rgb",
-                            "value": "{{i18n.commands.setLightControllerMode.arguments.mode.i18n.rgb.label}}",
+                            "value": "RGB",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.rgb.description}}"
+                            "description": "Red, green, and blue"
                         },
                         {
                             "key": "colorTemperature",
-                            "value": "{{i18n.commands.setLightControllerMode.arguments.mode.i18n.colorTemperature.label}}",
+                            "value": "Colour temp",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.colorTemperature.description}}"
+                            "description": "Warm and cool"
                         },
                         {
                             "key": "dimmer",
-                            "value": "{{i18n.commands.setLightControllerMode.arguments.mode.i18n.dimmer.label}}",
+                            "value": "Dimmer",
                             "type": "active",
-                            "description": "{{i18n.attributes.lightControllerMode.i18n.value.dimmer.description}}"
+                            "description": "Dimmer pins"
                         }
                     ],
                     "supportedValues": "supportedLightControllerModes.value",
diff --git a/json/localMediaStorage.i18n.en.json b/json/localMediaStorage.i18n.en.json
new file mode 100644
index 00000000..6b5f8dc7
--- /dev/null
+++ b/json/localMediaStorage.i18n.en.json
@@ -0,0 +1,49 @@
+{
+    "tag": "en",
+    "label": "Local Media Storage",
+    "attributes": {
+        "localSnapshotRecording": {
+            "label": "localSnapshotRecording",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "localVideoRecording": {
+            "label": "localVideoRecording",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setLocalVideoRecording": {
+            "label": "setLocalVideoRecording",
+            "arguments": {}
+        },
+        "setLocalSnapshotRecording": {
+            "label": "setLocalSnapshotRecording",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/localMediaStorage.i18n.fr.json b/json/localMediaStorage.i18n.fr.json
new file mode 100644
index 00000000..6b5f8dc7
--- /dev/null
+++ b/json/localMediaStorage.i18n.fr.json
@@ -0,0 +1,49 @@
+{
+    "tag": "en",
+    "label": "Local Media Storage",
+    "attributes": {
+        "localSnapshotRecording": {
+            "label": "localSnapshotRecording",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "localVideoRecording": {
+            "label": "localVideoRecording",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setLocalVideoRecording": {
+            "label": "setLocalVideoRecording",
+            "arguments": {}
+        },
+        "setLocalSnapshotRecording": {
+            "label": "setLocalSnapshotRecording",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/localMediaStorage.json b/json/localMediaStorage.json
new file mode 100644
index 00000000..8cd13059
--- /dev/null
+++ b/json/localMediaStorage.json
@@ -0,0 +1,111 @@
+{
+    "id": "localMediaStorage",
+    "version": 1,
+    "status": "proposed",
+    "name": "Local Media Storage",
+    "ephemeral": false,
+    "attributes": {
+        "localSnapshotRecording": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setLocalSnapshotRecording",
+            "enumCommands": []
+        },
+        "localVideoRecording": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setLocalVideoRecording",
+            "enumCommands": []
+        },
+        "supportedAttributes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "localVideoRecording",
+                                "localSnapshotRecording"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "setLocalVideoRecording": {
+            "name": "setLocalVideoRecording",
+            "arguments": [
+                {
+                    "name": "state",
+                    "optional": false,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "setLocalSnapshotRecording": {
+            "name": "setLocalSnapshotRecording",
+            "arguments": [
+                {
+                    "name": "state",
+                    "optional": false,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/lockAlarm.i18n.en.json b/json/lockAlarm.i18n.en.json
index bf67d3ab..4d02054a 100755
--- a/json/lockAlarm.i18n.en.json
+++ b/json/lockAlarm.i18n.en.json
@@ -4,8 +4,9 @@
     "description": "The current status of the lock alarm",
     "attributes": {
         "supportedAlarmValues": {
-            "label": "supportedAlarmValues",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "supported alarm values",
+            "description": "List of supported alarm attribute values",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "alarm": {
@@ -20,6 +21,9 @@
                     "highTemperature": {
                         "label": "High temperature detected."
                     },
+                    "failedOpeningAttempt": {
+                        "label": "Couldn't unlock."
+                    },
                     "damaged": {
                         "label": "Door lock damaged."
                     },
diff --git a/json/lockAlarm.i18n.fr.json b/json/lockAlarm.i18n.fr.json
index 48881546..508fc6d6 100644
--- a/json/lockAlarm.i18n.fr.json
+++ b/json/lockAlarm.i18n.fr.json
@@ -4,8 +4,9 @@
     "description": "The current status of the lock alarm",
     "attributes": {
         "supportedAlarmValues": {
-            "label": "supportedAlarmValues",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "supported alarm values",
+            "description": "List of supported alarm attribute values",
+            "displayTemplate": "{{device.label}} {{attribute}} is {{value}}",
             "i18n": {}
         },
         "alarm": {
@@ -20,6 +21,9 @@
                     "highTemperature": {
                         "label": "Température élevée détectée."
                     },
+                    "failedOpeningAttempt": {
+                        "label": "Impossible de déverrouiller."
+                    },
                     "damaged": {
                         "label": "Serrure de porte endommagée."
                     },
diff --git a/json/lockAlarmPresentation.json b/json/lockAlarmPresentation.json
index 8529603a..ae720a3b 100644
--- a/json/lockAlarmPresentation.json
+++ b/json/lockAlarmPresentation.json
@@ -2,53 +2,58 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Lock alert",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "clear",
-                            "value": "{{i18n.attributes.alarm.i18n.value.clear.label}}",
+                            "value": "Lock alert cleared",
                             "type": "active"
                         },
                         {
                             "key": "lockFactoryReset",
-                            "value": "{{i18n.attributes.alarm.i18n.value.lockFactoryReset.label}}",
+                            "value": "Door lock has been reset.",
                             "type": "active"
                         },
                         {
                             "key": "damaged",
-                            "value": "{{i18n.attributes.alarm.i18n.value.damaged.label}}",
+                            "value": "Door lock damaged.",
                             "type": "active"
                         },
                         {
                             "key": "forcedOpeningAttempt",
-                            "value": "{{i18n.attributes.alarm.i18n.value.forcedOpeningAttempt.label}}",
+                            "value": "Forced open attempt detected.",
                             "type": "active"
                         },
                         {
                             "key": "unableToLockTheDoor",
-                            "value": "{{i18n.attributes.alarm.i18n.value.unableToLockTheDoor.label}}",
+                            "value": "Couldn't lock door.",
                             "type": "active"
                         },
                         {
                             "key": "notClosedForALongTime",
-                            "value": "{{i18n.attributes.alarm.i18n.value.notClosedForALongTime.label}}",
+                            "value": "The door has been unlocked for a long time.",
                             "type": "active"
                         },
                         {
                             "key": "highTemperature",
-                            "value": "{{i18n.attributes.alarm.i18n.value.highTemperature.label}}",
+                            "value": "High temperature detected.",
                             "type": "active"
                         },
                         {
                             "key": "attemptsExceeded",
-                            "value": "{{i18n.attributes.alarm.i18n.value.attemptsExceeded.label}}",
+                            "value": "Too many unlock attempts have been made.",
                             "type": "active"
                         },
                         {
                             "key": "physicalImpact",
-                            "value": "{{i18n.attributes.alarm.i18n.value.physicalImpact.label}}",
+                            "value": "Physical impact detected.",
+                            "type": "active"
+                        },
+                        {
+                            "key": "failedOpeningAttempt",
+                            "value": "Couldn't unlock.",
                             "type": "active"
                         }
                     ],
diff --git a/json/lockAliro.i18n.en.json b/json/lockAliro.i18n.en.json
new file mode 100644
index 00000000..07c46752
--- /dev/null
+++ b/json/lockAliro.i18n.en.json
@@ -0,0 +1,87 @@
+{
+    "tag": "en",
+    "label": "Lock Aliro",
+    "attributes": {
+        "commandResult": {
+            "label": "commandResult",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "groupResolvingKey": {
+            "label": "groupResolvingKey",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "expeditedTransactionProtocolVersions": {
+            "label": "expeditedTransactionProtocolVersions",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "credentials": {
+            "label": "credentials",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "readerGroupIdentifier": {
+            "label": "readerGroupIdentifier",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "bleAdvertisingVersion": {
+            "label": "bleAdvertisingVersion",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "cardId": {
+            "label": "cardId",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "bleUWBProtocolVersions": {
+            "label": "bleUWBProtocolVersions",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "maxCredentialIssuerKeys": {
+            "label": "maxCredentialIssuerKeys",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "maxEndpointKeys": {
+            "label": "maxEndpointKeys",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "readerVerificationKey": {
+            "label": "readerVerificationKey",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setEndpointKey": {
+            "label": "setEndpointKey",
+            "arguments": {}
+        },
+        "setCardId": {
+            "label": "setCardId",
+            "arguments": {}
+        },
+        "setReaderConfig": {
+            "label": "setReaderConfig",
+            "arguments": {}
+        },
+        "setIssuerKey": {
+            "label": "setIssuerKey",
+            "arguments": {}
+        },
+        "clearIssuerKey": {
+            "label": "clearIssuerKey",
+            "arguments": {}
+        },
+        "clearEndpointKey": {
+            "label": "clearEndpointKey",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/lockAliro.i18n.fr.json b/json/lockAliro.i18n.fr.json
new file mode 100644
index 00000000..07c46752
--- /dev/null
+++ b/json/lockAliro.i18n.fr.json
@@ -0,0 +1,87 @@
+{
+    "tag": "en",
+    "label": "Lock Aliro",
+    "attributes": {
+        "commandResult": {
+            "label": "commandResult",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "groupResolvingKey": {
+            "label": "groupResolvingKey",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "expeditedTransactionProtocolVersions": {
+            "label": "expeditedTransactionProtocolVersions",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "credentials": {
+            "label": "credentials",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "readerGroupIdentifier": {
+            "label": "readerGroupIdentifier",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "bleAdvertisingVersion": {
+            "label": "bleAdvertisingVersion",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "cardId": {
+            "label": "cardId",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "bleUWBProtocolVersions": {
+            "label": "bleUWBProtocolVersions",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "maxCredentialIssuerKeys": {
+            "label": "maxCredentialIssuerKeys",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "maxEndpointKeys": {
+            "label": "maxEndpointKeys",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "readerVerificationKey": {
+            "label": "readerVerificationKey",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setEndpointKey": {
+            "label": "setEndpointKey",
+            "arguments": {}
+        },
+        "setCardId": {
+            "label": "setCardId",
+            "arguments": {}
+        },
+        "setReaderConfig": {
+            "label": "setReaderConfig",
+            "arguments": {}
+        },
+        "setIssuerKey": {
+            "label": "setIssuerKey",
+            "arguments": {}
+        },
+        "clearIssuerKey": {
+            "label": "clearIssuerKey",
+            "arguments": {}
+        },
+        "clearEndpointKey": {
+            "label": "clearEndpointKey",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/lockAliro.json b/json/lockAliro.json
new file mode 100644
index 00000000..ccf16070
--- /dev/null
+++ b/json/lockAliro.json
@@ -0,0 +1,356 @@
+{
+    "id": "lockAliro",
+    "version": 1,
+    "status": "proposed",
+    "name": "Lock Aliro",
+    "ephemeral": false,
+    "attributes": {
+        "commandResult": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "commandName": {
+                                "type": "string",
+                                "enum": [
+                                    "setReaderConfig",
+                                    "setCardId",
+                                    "setCredential",
+                                    "clearCredential"
+                                ]
+                            },
+                            "userIndex": {
+                                "type": "integer",
+                                "minimum": 1
+                            },
+                            "keyId": {
+                                "type": "string",
+                                "minimum": 1
+                            },
+                            "statusCode": {
+                                "type": "string",
+                                "enum": [
+                                    "success",
+                                    "failure",
+                                    "occupied",
+                                    "duplicate",
+                                    "invalidCommand",
+                                    "resourceExhausted",
+                                    "busy"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "commandName",
+                            "statusCode"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
+        "groupResolvingKey": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "setter": "setReaderConfig",
+            "enumCommands": []
+        },
+        "expeditedTransactionProtocolVersions": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
+        "credentials": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "userIndex": {
+                                    "type": "integer",
+                                    "minimum": 1
+                                },
+                                "keyId": {
+                                    "type": "string",
+                                    "minimum": 1
+                                },
+                                "issuerKeyIndex": {
+                                    "type": "integer",
+                                    "minimum": 1
+                                },
+                                "endpointKeyIndex": {
+                                    "type": "integer",
+                                    "minimum": 1
+                                }
+                            },
+                            "required": [
+                                "userIndex",
+                                "keyId",
+                                "issuerKeyIndex",
+                                "endpointKeyIndex"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
+        "readerGroupIdentifier": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setReaderConfig",
+            "enumCommands": []
+        },
+        "bleAdvertisingVersion": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
+        "cardId": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setCardId",
+            "enumCommands": []
+        },
+        "bleUWBProtocolVersions": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
+        "maxCredentialIssuerKeys": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 0
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "maxEndpointKeys": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 0
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "readerVerificationKey": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setReaderConfig",
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "setCredential": {
+            "name": "setCredential",
+            "arguments": [
+                {
+                    "name": "userIndex",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": 0
+                    }
+                },
+                {
+                    "name": "keyId",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "maxLength": 255
+                    }
+                },
+                {
+                    "name": "issuerKey",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "maxLength": 130
+                    }
+                },
+                {
+                    "name": "nonEvictableEndpointKey",
+                    "optional": true,
+                    "schema": {
+                        "type": "string",
+                        "maxLength": 130
+                    }
+                },
+                {
+                    "name": "evictableEndpointKey",
+                    "optional": true,
+                    "schema": {
+                        "type": "string",
+                        "maxLength": 130
+                    }
+                }
+            ]
+        },
+        "setCardId": {
+            "name": "setCardId",
+            "arguments": [
+                {
+                    "name": "cardId",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "maxLength": 255
+                    }
+                }
+            ]
+        },
+        "setReaderConfig": {
+            "name": "setReaderConfig",
+            "arguments": [
+                {
+                    "name": "signingKey",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "maxLength": 64
+                    }
+                },
+                {
+                    "name": "verificationKey",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "maxLength": 130
+                    }
+                },
+                {
+                    "name": "groupId",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "maxLength": 32
+                    }
+                },
+                {
+                    "name": "groupResolvingKey",
+                    "optional": true,
+                    "schema": {
+                        "type": "string",
+                        "maxLength": 32
+                    }
+                }
+            ]
+        },
+        "clearCredential": {
+            "name": "clearCredential",
+            "arguments": [
+                {
+                    "name": "userIndex",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": 1
+                    }
+                },
+                {
+                    "name": "keyId",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "maxLength": 255
+                    }
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/lockCodes.i18n.en.json b/json/lockCodes.i18n.en.json
index e02161e7..a2a9d1c6 100755
--- a/json/lockCodes.i18n.en.json
+++ b/json/lockCodes.i18n.en.json
@@ -60,6 +60,11 @@
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {}
         },
+        "migrated": {
+            "label": "migrated",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
         "codeReport": {
             "label": "code report",
             "description": "A report on the code",
@@ -171,6 +176,10 @@
                     "description": "Code slot number for the code"
                 }
             }
+        },
+        "migrate": {
+            "label": "migrate",
+            "arguments": {}
         }
     }
 }
\ No newline at end of file
diff --git a/json/lockCodes.i18n.fr.json b/json/lockCodes.i18n.fr.json
index e5c2ceba..2f8b789a 100755
--- a/json/lockCodes.i18n.fr.json
+++ b/json/lockCodes.i18n.fr.json
@@ -60,6 +60,11 @@
             "displayTemplate": "{{attribute}} de {{device.label}} était : {{value}}",
             "i18n": {}
         },
+        "migrated": {
+            "label": "migrated",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
         "codeReport": {
             "label": "Rapport de code",
             "description": "A report on the code",
@@ -171,6 +176,10 @@
                     "description": "Code slot number for the code"
                 }
             }
+        },
+        "migrate": {
+            "label": "migrate",
+            "arguments": {}
         }
     }
 }
\ No newline at end of file
diff --git a/json/lockCodes.json b/json/lockCodes.json
index 44e06dde..31fc9a64 100755
--- a/json/lockCodes.json
+++ b/json/lockCodes.json
@@ -158,6 +158,21 @@
             },
             "enumCommands": []
         },
+        "migrated": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "boolean"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
         "codeReport": {
             "schema": {
                 "type": "object",
@@ -217,19 +232,23 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "reloadAllCodes": {
             "name": "reloadAllCodes",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "unlock": {
             "name": "unlock",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "unlockWithTimeout": {
             "name": "unlockWithTimeout",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setCode": {
             "name": "setCode",
@@ -261,7 +280,8 @@
                         "maxLength": 255
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "updateCodes": {
             "name": "updateCodes",
@@ -274,11 +294,13 @@
                         "type": "object"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "lock": {
             "name": "lock",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "requestCode": {
             "name": "requestCode",
@@ -292,7 +314,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "deleteCode": {
             "name": "deleteCode",
@@ -306,7 +329,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "nameSlot": {
             "name": "nameSlot",
@@ -329,7 +353,13 @@
                         "maxLength": 255
                     }
                 }
-            ]
+            ],
+            "sensitive": false
+        },
+        "migrate": {
+            "name": "migrate",
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/lockPresentation.json b/json/lockPresentation.json
index 465adc55..e3c954ff 100755
--- a/json/lockPresentation.json
+++ b/json/lockPresentation.json
@@ -6,32 +6,32 @@
                 "alternatives": [
                     {
                         "key": "locked",
-                        "value": "{{i18n.attributes.lock.i18n.value.locked.label}}",
+                        "value": "Locked",
                         "type": "inactive"
                     },
                     {
                         "key": "unlocked",
-                        "value": "{{i18n.attributes.lock.i18n.value.unlocked.label}}",
+                        "value": "Unlocked",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.lock.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "inactive"
                     },
                     {
                         "key": "unlocked with timeout",
-                        "value": "{{i18n.attributes.lock.i18n.value.unlocked with timeout.label}}",
+                        "value": "Temporarily unlocked",
                         "type": "active"
                     },
                     {
                         "key": "not fully locked",
-                        "value": "{{i18n.attributes.lock.i18n.value.not fully locked.label}}",
+                        "value": "Not fully locked",
                         "type": "active"
                     },
                     {
                         "key": "unlatched",
-                        "value": "{{i18n.attributes.lock.i18n.value.unlatched.label}}",
+                        "value": "Unlatched",
                         "type": "active"
                     }
                 ]
@@ -64,7 +64,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Lock state",
             "displayType": "toggleSwitch",
             "toggleSwitch": {
                 "command": {
@@ -80,32 +80,32 @@
                     "alternatives": [
                         {
                             "key": "locked",
-                            "value": "{{i18n.attributes.lock.i18n.value.locked.label}}",
+                            "value": "Locked",
                             "type": "inactive"
                         },
                         {
                             "key": "unlocked",
-                            "value": "{{i18n.attributes.lock.i18n.value.unlocked.label}}",
+                            "value": "Unlocked",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.lock.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "inactive"
                         },
                         {
                             "key": "unlocked with timeout",
-                            "value": "{{i18n.attributes.lock.i18n.value.unlocked with timeout.label}}",
+                            "value": "Temporarily unlocked",
                             "type": "active"
                         },
                         {
                             "key": "not fully locked",
-                            "value": "{{i18n.attributes.lock.i18n.value.not fully locked.label}}",
+                            "value": "Not fully locked",
                             "type": "active"
                         },
                         {
                             "key": "unlatched",
-                            "value": "{{i18n.attributes.lock.i18n.value.unlatched.label}}",
+                            "value": "Unlatched",
                             "type": "active"
                         }
                     ]
@@ -116,33 +116,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Lock state",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "locked",
-                            "value": "{{i18n.attributes.lock.i18n.value.locked.label}}",
+                            "value": "Locked",
                             "type": "inactive"
                         },
                         {
                             "key": "unlocked",
-                            "value": "{{i18n.attributes.lock.i18n.value.unlocked.label}}",
+                            "value": "Unlocked",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.lock.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "inactive"
                         },
                         {
                             "key": "unlocked with timeout",
-                            "value": "{{i18n.attributes.lock.i18n.value.unlocked with timeout.label}}",
+                            "value": "Temporarily unlocked",
                             "type": "active"
                         },
                         {
                             "key": "not fully locked",
-                            "value": "{{i18n.attributes.lock.i18n.value.not fully locked.label}}",
+                            "value": "Not fully locked",
                             "type": "active"
                         }
                     ],
@@ -155,18 +155,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Lock state",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "lock",
-                            "value": "{{i18n.commands.lock.label}}",
+                            "value": "Lock",
                             "type": "inactive"
                         },
                         {
                             "key": "unlock",
-                            "value": "{{i18n.commands.unlock.label}}",
+                            "value": "Unlock",
                             "type": "active"
                         }
                     ],
diff --git a/json/massageIntensityChangePresentation.json b/json/massageIntensityChangePresentation.json
index 5ac64aa7..1d782706 100644
--- a/json/massageIntensityChangePresentation.json
+++ b/json/massageIntensityChangePresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Massage",
             "displayType": "list",
             "list": {
                 "command": {
@@ -9,17 +9,17 @@
                     "alternatives": [
                         {
                             "key": "head",
-                            "value": "{{i18n.commands.nextIntensity.arguments.position.i18n.head.label}}",
+                            "value": "Head intensity",
                             "type": "active"
                         },
                         {
                             "key": "foot",
-                            "value": "{{i18n.commands.nextIntensity.arguments.position.i18n.foot.label}}",
+                            "value": "Foot intensity",
                             "type": "active"
                         },
                         {
                             "key": "whole",
-                            "value": "{{i18n.commands.nextIntensity.arguments.position.i18n.whole.label}}",
+                            "value": "Intensity",
                             "type": "active"
                         }
                     ],
diff --git a/json/massageIntensityControlPresentation.json b/json/massageIntensityControlPresentation.json
index 0328d749..13931485 100644
--- a/json/massageIntensityControlPresentation.json
+++ b/json/massageIntensityControlPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.attributes.intensityHead.label}}",
+            "label": "Head intensity",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -16,7 +16,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.intensityFoot.label}}",
+            "label": "Foot intensity",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -31,7 +31,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.intensityWhole.label}}",
+            "label": "Intensity",
             "displayType": "slider",
             "slider": {
                 "range": [
diff --git a/json/massageOperatingPresentation.json b/json/massageOperatingPresentation.json
index 1ff87edf..2ec738db 100644
--- a/json/massageOperatingPresentation.json
+++ b/json/massageOperatingPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.massageState.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.massageState.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -38,7 +38,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Massage",
             "displayType": "standbyPowerSwitch",
             "standbyPowerSwitch": {
                 "command": {
@@ -54,12 +54,12 @@
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.massageState.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.massageState.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
@@ -70,18 +70,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Massage",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.massageState.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.massageState.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -94,18 +94,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Massage",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "start",
-                            "value": "{{i18n.commands.start.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.stop.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
diff --git a/json/massageOperatingStatePresentation.json b/json/massageOperatingStatePresentation.json
index a50aedbe..0fd0ee4f 100644
--- a/json/massageOperatingStatePresentation.json
+++ b/json/massageOperatingStatePresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.massageState.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.massageState.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Massage",
             "displayType": "state",
             "state": {
                 "label": "{{massageState.value}}",
                 "alternatives": [
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.massageState.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.massageState.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Massage",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.massageState.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.massageState.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/massageTimeChangePresentation.json b/json/massageTimeChangePresentation.json
index d34819a7..e9a54294 100644
--- a/json/massageTimeChangePresentation.json
+++ b/json/massageTimeChangePresentation.json
@@ -13,7 +13,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.commands.nextTime.label}}",
+            "label": "Time",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "nextTime"
diff --git a/json/massageTimeControlPresentation.json b/json/massageTimeControlPresentation.json
index e497be70..e79d3a93 100644
--- a/json/massageTimeControlPresentation.json
+++ b/json/massageTimeControlPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.commands.setTime.label}}",
+            "label": "Time",
             "displayType": "list",
             "list": {
                 "command": {
@@ -9,37 +9,37 @@
                     "alternatives": [
                         {
                             "key": "0",
-                            "value": "{{i18n.commands.setTime.arguments.massageTime.i18n.0.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "10",
-                            "value": "{{i18n.commands.setTime.arguments.massageTime.i18n.10.label}}",
+                            "value": "10 minutes",
                             "type": "active"
                         },
                         {
                             "key": "20",
-                            "value": "{{i18n.commands.setTime.arguments.massageTime.i18n.20.label}}",
+                            "value": "20 minutes",
                             "type": "active"
                         },
                         {
                             "key": "30",
-                            "value": "{{i18n.commands.setTime.arguments.massageTime.i18n.30.label}}",
+                            "value": "30 minutes",
                             "type": "active"
                         },
                         {
                             "key": "40",
-                            "value": "{{i18n.commands.setTime.arguments.massageTime.i18n.40.label}}",
+                            "value": "40 minutes",
                             "type": "active"
                         },
                         {
                             "key": "50",
-                            "value": "{{i18n.commands.setTime.arguments.massageTime.i18n.50.label}}",
+                            "value": "50 minutes",
                             "type": "active"
                         },
                         {
                             "key": "60",
-                            "value": "{{i18n.commands.setTime.arguments.massageTime.i18n.60.label}}",
+                            "value": "1 hour",
                             "type": "active"
                         }
                     ],
@@ -49,7 +49,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.completionTime.label}}",
+            "label": "Time",
             "displayType": "state",
             "state": {
                 "label": "{{completionTime.value}}"
diff --git a/json/mechanicalPanTiltZoom.i18n.en.json b/json/mechanicalPanTiltZoom.i18n.en.json
new file mode 100644
index 00000000..a7d06ec9
--- /dev/null
+++ b/json/mechanicalPanTiltZoom.i18n.en.json
@@ -0,0 +1,89 @@
+{
+    "tag": "en",
+    "label": "Mechanical Pan Tilt Zoom",
+    "attributes": {
+        "maxPresets": {
+            "label": "maxPresets",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "tiltRange": {
+            "label": "tiltRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "presets": {
+            "label": "presets",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "panRange": {
+            "label": "panRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "zoom": {
+            "label": "zoom",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "tilt": {
+            "label": "tilt",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "pan": {
+            "label": "pan",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "zoomRange": {
+            "label": "zoomRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "panRelative": {
+            "label": "panRelative",
+            "arguments": {}
+        },
+        "tiltRelative": {
+            "label": "tiltRelative",
+            "arguments": {}
+        },
+        "zoomRelative": {
+            "label": "zoomRelative",
+            "arguments": {}
+        },
+        "setPanTiltZoom": {
+            "label": "setPanTiltZoom",
+            "arguments": {}
+        },
+        "setZoom": {
+            "label": "setZoom",
+            "arguments": {}
+        },
+        "setPan": {
+            "label": "setPan",
+            "arguments": {}
+        },
+        "savePreset": {
+            "label": "savePreset",
+            "arguments": {}
+        },
+        "moveToPreset": {
+            "label": "moveToPreset",
+            "arguments": {}
+        },
+        "setTilt": {
+            "label": "setTilt",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/mechanicalPanTiltZoom.i18n.fr.json b/json/mechanicalPanTiltZoom.i18n.fr.json
new file mode 100644
index 00000000..a7d06ec9
--- /dev/null
+++ b/json/mechanicalPanTiltZoom.i18n.fr.json
@@ -0,0 +1,89 @@
+{
+    "tag": "en",
+    "label": "Mechanical Pan Tilt Zoom",
+    "attributes": {
+        "maxPresets": {
+            "label": "maxPresets",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "tiltRange": {
+            "label": "tiltRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "presets": {
+            "label": "presets",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "panRange": {
+            "label": "panRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "zoom": {
+            "label": "zoom",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "tilt": {
+            "label": "tilt",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "pan": {
+            "label": "pan",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "zoomRange": {
+            "label": "zoomRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "panRelative": {
+            "label": "panRelative",
+            "arguments": {}
+        },
+        "tiltRelative": {
+            "label": "tiltRelative",
+            "arguments": {}
+        },
+        "zoomRelative": {
+            "label": "zoomRelative",
+            "arguments": {}
+        },
+        "setPanTiltZoom": {
+            "label": "setPanTiltZoom",
+            "arguments": {}
+        },
+        "setZoom": {
+            "label": "setZoom",
+            "arguments": {}
+        },
+        "setPan": {
+            "label": "setPan",
+            "arguments": {}
+        },
+        "savePreset": {
+            "label": "savePreset",
+            "arguments": {}
+        },
+        "moveToPreset": {
+            "label": "moveToPreset",
+            "arguments": {}
+        },
+        "setTilt": {
+            "label": "setTilt",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/mechanicalPanTiltZoom.json b/json/mechanicalPanTiltZoom.json
new file mode 100644
index 00000000..269bce94
--- /dev/null
+++ b/json/mechanicalPanTiltZoom.json
@@ -0,0 +1,430 @@
+{
+    "id": "mechanicalPanTiltZoom",
+    "version": 1,
+    "status": "proposed",
+    "name": "Mechanical Pan Tilt Zoom",
+    "ephemeral": false,
+    "attributes": {
+        "maxPresets": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "tiltRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": -180,
+                                "maximum": 179
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": -179,
+                                "maximum": 180
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "°"
+                        ],
+                        "default": "°"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "presets": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "label": {
+                                    "type": "string"
+                                },
+                                "pan": {
+                                    "type": "integer",
+                                    "minimum": -180,
+                                    "maximum": 180
+                                },
+                                "tilt": {
+                                    "type": "integer",
+                                    "minimum": -180,
+                                    "maximum": 180
+                                },
+                                "zoom": {
+                                    "type": "integer",
+                                    "minimum": 1,
+                                    "maximum": 100
+                                }
+                            }
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "panRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": -180,
+                                "maximum": 179
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": -179,
+                                "maximum": 180
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "°"
+                        ],
+                        "default": "°"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "zoom": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 1,
+                        "maximum": 100
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setZoom",
+            "enumCommands": []
+        },
+        "tilt": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": -180,
+                        "maximum": 180
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "°"
+                        ],
+                        "default": "°"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setTilt",
+            "enumCommands": []
+        },
+        "pan": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": -180,
+                        "maximum": 180
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "°"
+                        ],
+                        "default": "°"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setPan",
+            "enumCommands": []
+        },
+        "supportedAttributes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "pan",
+                                "panRange",
+                                "tilt",
+                                "tiltRange",
+                                "zoom",
+                                "zoomRange",
+                                "presets",
+                                "maxPresets"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "zoomRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": 1,
+                                "maximum": 99
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": 2,
+                                "maximum": 100
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "panRelative": {
+            "name": "panRelative",
+            "arguments": [
+                {
+                    "name": "delta",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": -360,
+                        "maximum": 360
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "tiltRelative": {
+            "name": "tiltRelative",
+            "arguments": [
+                {
+                    "name": "delta",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": -360,
+                        "maximum": 360
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "zoomRelative": {
+            "name": "zoomRelative",
+            "arguments": [
+                {
+                    "name": "delta",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": -99,
+                        "maximum": 99
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "setPanTiltZoom": {
+            "name": "setPanTiltZoom",
+            "arguments": [
+                {
+                    "name": "pan",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": -180,
+                        "maximum": 180
+                    }
+                },
+                {
+                    "name": "tilt",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": -180,
+                        "maximum": 180
+                    }
+                },
+                {
+                    "name": "zoom",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": 1,
+                        "maximum": 100
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "setZoom": {
+            "name": "setZoom",
+            "arguments": [
+                {
+                    "name": "zoom",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": 1,
+                        "maximum": 100
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "setPan": {
+            "name": "setPan",
+            "arguments": [
+                {
+                    "name": "pan",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": -180,
+                        "maximum": 180
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "savePreset": {
+            "name": "savePreset",
+            "arguments": [
+                {
+                    "name": "id",
+                    "optional": true,
+                    "schema": {
+                        "type": "integer"
+                    }
+                },
+                {
+                    "name": "label",
+                    "optional": false,
+                    "schema": {
+                        "type": "string"
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "moveToPreset": {
+            "name": "moveToPreset",
+            "arguments": [
+                {
+                    "name": "id",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer"
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "setTilt": {
+            "name": "setTilt",
+            "arguments": [
+                {
+                    "name": "tilt",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": -180,
+                        "maximum": 180
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/mediaGroupPresentation.json b/json/mediaGroupPresentation.json
index 7a8d1773..13470d11 100755
--- a/json/mediaGroupPresentation.json
+++ b/json/mediaGroupPresentation.json
@@ -1,45 +1,45 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Speaker group",
             "displayType": "state",
             "state": {
                 "label": "{{groupRole.value}}",
                 "alternatives": [
                     {
                         "key": "primary",
-                        "value": "{{i18n.attributes.groupRole.i18n.value.primary.label}}",
+                        "value": "Main speaker",
                         "type": "active"
                     },
                     {
                         "key": "auxilary",
-                        "value": "{{i18n.attributes.groupRole.i18n.value.auxilary.label}}",
+                        "value": "Secondary speaker",
                         "type": "active"
                     },
                     {
                         "key": "ungrouped",
-                        "value": "{{i18n.attributes.groupRole.i18n.value.ungrouped.label}}",
+                        "value": "Ungrouped",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Speaker group",
             "displayType": "state",
             "state": {
                 "label": "{{groupPrimaryDeviceId.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Speaker group",
             "displayType": "state",
             "state": {
                 "label": "{{groupId.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.groupVolume.label}}",
+            "label": "Group volume",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -54,7 +54,7 @@
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Speaker group",
             "displayType": "list",
             "list": {
                 "command": {
@@ -74,7 +74,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.groupMute.label}}",
+            "label": "Mute group",
             "displayType": "toggleSwitch",
             "toggleSwitch": {
                 "command": {
@@ -90,12 +90,12 @@
                     "alternatives": [
                         {
                             "key": "muted",
-                            "value": "{{i18n.attributes.groupMute.i18n.value.muted.label}}",
+                            "value": "Muted",
                             "type": "inactive"
                         },
                         {
                             "key": "unmuted",
-                            "value": "{{i18n.attributes.groupMute.i18n.value.unmuted.label}}",
+                            "value": "Unmuted",
                             "type": "active"
                         }
                     ]
@@ -106,7 +106,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.groupVolume.label}}",
+                "label": "Group volume",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -119,18 +119,18 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.groupMute.label}}",
+                "label": "Mute group",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "muted",
-                            "value": "{{i18n.attributes.groupMute.i18n.value.muted.label}}",
+                            "value": "Muted",
                             "type": "inactive"
                         },
                         {
                             "key": "unmuted",
-                            "value": "{{i18n.attributes.groupMute.i18n.value.unmuted.label}}",
+                            "value": "Unmuted",
                             "type": "active"
                         }
                     ],
@@ -142,7 +142,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.groupVolume.label}}",
+                "label": "Group volume",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -155,18 +155,18 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.groupMute.label}}",
+                "label": "Mute group",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "muteGroup",
-                            "value": "{{i18n.commands.muteGroup.label}}",
+                            "value": "Muted",
                             "type": "inactive"
                         },
                         {
                             "key": "unmuteGroup",
-                            "value": "{{i18n.commands.unmuteGroup.label}}",
+                            "value": "Unmuted",
                             "type": "active"
                         }
                     ]
diff --git a/json/mediaInputSourcePresentation.json b/json/mediaInputSourcePresentation.json
index 633556c5..0c3f24cb 100755
--- a/json/mediaInputSourcePresentation.json
+++ b/json/mediaInputSourcePresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "AM",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.AM.label}}",
+                        "value": "AM",
                         "type": "active"
                     },
                     {
                         "key": "CD",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.CD.label}}",
+                        "value": "CD",
                         "type": "active"
                     },
                     {
                         "key": "FM",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.FM.label}}",
+                        "value": "FM",
                         "type": "active"
                     },
                     {
@@ -56,77 +56,77 @@
                     },
                     {
                         "key": "digitalTv",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.digitalTv.label}}",
+                        "value": "Digital TV",
                         "type": "active"
                     },
                     {
                         "key": "USB",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.USB.label}}",
+                        "value": "USB",
                         "type": "active"
                     },
                     {
                         "key": "YouTube",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.YouTube.label}}",
+                        "value": "YouTube",
                         "type": "active"
                     },
                     {
                         "key": "aux",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.aux.label}}",
+                        "value": "Aux",
                         "type": "active"
                     },
                     {
                         "key": "bluetooth",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.bluetooth.label}}",
+                        "value": "Bluetooth",
                         "type": "active"
                     },
                     {
                         "key": "digital",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.digital.label}}",
+                        "value": "Digital",
                         "type": "active"
                     },
                     {
                         "key": "melon",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.melon.label}}",
+                        "value": "Melon",
                         "type": "active"
                     },
                     {
                         "key": "wifi",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.wifi.label}}",
+                        "value": "Wi-Fi",
                         "type": "active"
                     },
                     {
                         "key": "network",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.network.label}}",
+                        "value": "Network",
                         "type": "active"
                     },
                     {
                         "key": "optical",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.optical.label}}",
+                        "value": "Optical",
                         "type": "active"
                     },
                     {
                         "key": "coaxial",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.coaxial.label}}",
+                        "value": "Coaxial",
                         "type": "active"
                     },
                     {
                         "key": "analog1",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.analog1.label}}",
+                        "value": "Analogue 1",
                         "type": "active"
                     },
                     {
                         "key": "analog2",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.analog2.label}}",
+                        "value": "Analogue 2",
                         "type": "active"
                     },
                     {
                         "key": "analog3",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.analog3.label}}",
+                        "value": "Analogue 3",
                         "type": "active"
                     },
                     {
                         "key": "phono",
-                        "value": "{{i18n.attributes.inputSource.i18n.value.phono.label}}",
+                        "value": "Phono",
                         "type": "active"
                     }
                 ]
@@ -137,7 +137,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.inputSource.label}}",
+            "label": "Media input source",
             "displayType": "list",
             "list": {
                 "command": {
@@ -145,17 +145,17 @@
                     "alternatives": [
                         {
                             "key": "AM",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.AM.label}}",
+                            "value": "AM",
                             "type": "active"
                         },
                         {
                             "key": "CD",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.CD.label}}",
+                            "value": "CD",
                             "type": "active"
                         },
                         {
                             "key": "FM",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.FM.label}}",
+                            "value": "FM",
                             "type": "active"
                         },
                         {
@@ -195,77 +195,77 @@
                         },
                         {
                             "key": "digitalTv",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.digitalTv.label}}",
+                            "value": "Digital TV",
                             "type": "active"
                         },
                         {
                             "key": "USB",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.USB.label}}",
+                            "value": "USB",
                             "type": "active"
                         },
                         {
                             "key": "YouTube",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.YouTube.label}}",
+                            "value": "YouTube",
                             "type": "active"
                         },
                         {
                             "key": "aux",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.aux.label}}",
+                            "value": "Aux",
                             "type": "active"
                         },
                         {
                             "key": "bluetooth",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.bluetooth.label}}",
+                            "value": "Bluetooth",
                             "type": "active"
                         },
                         {
                             "key": "digital",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.digital.label}}",
+                            "value": "Digital",
                             "type": "active"
                         },
                         {
                             "key": "melon",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.melon.label}}",
+                            "value": "Melon",
                             "type": "active"
                         },
                         {
                             "key": "wifi",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.wifi.label}}",
+                            "value": "Wi-Fi",
                             "type": "active"
                         },
                         {
                             "key": "network",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.network.label}}",
+                            "value": "Network",
                             "type": "active"
                         },
                         {
                             "key": "optical",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.optical.label}}",
+                            "value": "Optical",
                             "type": "active"
                         },
                         {
                             "key": "coaxial",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.coaxial.label}}",
+                            "value": "Coaxial",
                             "type": "active"
                         },
                         {
                             "key": "analog1",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog1.label}}",
+                            "value": "Analogue 1",
                             "type": "active"
                         },
                         {
                             "key": "analog2",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog2.label}}",
+                            "value": "Analogue 2",
                             "type": "active"
                         },
                         {
                             "key": "analog3",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog3.label}}",
+                            "value": "Analogue 3",
                             "type": "active"
                         },
                         {
                             "key": "phono",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.phono.label}}",
+                            "value": "Phono",
                             "type": "active"
                         }
                     ],
@@ -278,17 +278,17 @@
                     "alternatives": [
                         {
                             "key": "AM",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.AM.label}}",
+                            "value": "AM",
                             "type": "active"
                         },
                         {
                             "key": "CD",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.CD.label}}",
+                            "value": "CD",
                             "type": "active"
                         },
                         {
                             "key": "FM",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.FM.label}}",
+                            "value": "FM",
                             "type": "active"
                         },
                         {
@@ -328,77 +328,77 @@
                         },
                         {
                             "key": "digitalTv",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.digitalTv.label}}",
+                            "value": "Digital TV",
                             "type": "active"
                         },
                         {
                             "key": "USB",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.USB.label}}",
+                            "value": "USB",
                             "type": "active"
                         },
                         {
                             "key": "YouTube",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.YouTube.label}}",
+                            "value": "YouTube",
                             "type": "active"
                         },
                         {
                             "key": "aux",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.aux.label}}",
+                            "value": "Aux",
                             "type": "active"
                         },
                         {
                             "key": "bluetooth",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.bluetooth.label}}",
+                            "value": "Bluetooth",
                             "type": "active"
                         },
                         {
                             "key": "digital",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.digital.label}}",
+                            "value": "Digital",
                             "type": "active"
                         },
                         {
                             "key": "melon",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.melon.label}}",
+                            "value": "Melon",
                             "type": "active"
                         },
                         {
                             "key": "wifi",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.wifi.label}}",
+                            "value": "Wi-Fi",
                             "type": "active"
                         },
                         {
                             "key": "network",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.network.label}}",
+                            "value": "Network",
                             "type": "active"
                         },
                         {
                             "key": "optical",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.optical.label}}",
+                            "value": "Optical",
                             "type": "active"
                         },
                         {
                             "key": "coaxial",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.coaxial.label}}",
+                            "value": "Coaxial",
                             "type": "active"
                         },
                         {
                             "key": "analog1",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog1.label}}",
+                            "value": "Analogue 1",
                             "type": "active"
                         },
                         {
                             "key": "analog2",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog2.label}}",
+                            "value": "Analogue 2",
                             "type": "active"
                         },
                         {
                             "key": "analog3",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog3.label}}",
+                            "value": "Analogue 3",
                             "type": "active"
                         },
                         {
                             "key": "phono",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.phono.label}}",
+                            "value": "Phono",
                             "type": "active"
                         }
                     ]
@@ -409,23 +409,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.inputSource.label}}",
+                "label": "Media input source",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "AM",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.AM.label}}",
+                            "value": "AM",
                             "type": "active"
                         },
                         {
                             "key": "CD",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.CD.label}}",
+                            "value": "CD",
                             "type": "active"
                         },
                         {
                             "key": "FM",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.FM.label}}",
+                            "value": "FM",
                             "type": "active"
                         },
                         {
@@ -465,77 +465,77 @@
                         },
                         {
                             "key": "digitalTv",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.digitalTv.label}}",
+                            "value": "Digital TV",
                             "type": "active"
                         },
                         {
                             "key": "USB",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.USB.label}}",
+                            "value": "USB",
                             "type": "active"
                         },
                         {
                             "key": "YouTube",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.YouTube.label}}",
+                            "value": "YouTube",
                             "type": "active"
                         },
                         {
                             "key": "aux",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.aux.label}}",
+                            "value": "Aux",
                             "type": "active"
                         },
                         {
                             "key": "bluetooth",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.bluetooth.label}}",
+                            "value": "Bluetooth",
                             "type": "active"
                         },
                         {
                             "key": "digital",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.digital.label}}",
+                            "value": "Digital",
                             "type": "active"
                         },
                         {
                             "key": "melon",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.melon.label}}",
+                            "value": "Melon",
                             "type": "active"
                         },
                         {
                             "key": "wifi",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.wifi.label}}",
+                            "value": "Wi-Fi",
                             "type": "active"
                         },
                         {
                             "key": "network",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.network.label}}",
+                            "value": "Network",
                             "type": "active"
                         },
                         {
                             "key": "optical",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.optical.label}}",
+                            "value": "Optical",
                             "type": "active"
                         },
                         {
                             "key": "coaxial",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.coaxial.label}}",
+                            "value": "Coaxial",
                             "type": "active"
                         },
                         {
                             "key": "analog1",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog1.label}}",
+                            "value": "Analogue 1",
                             "type": "active"
                         },
                         {
                             "key": "analog2",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog2.label}}",
+                            "value": "Analogue 2",
                             "type": "active"
                         },
                         {
                             "key": "analog3",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog3.label}}",
+                            "value": "Analogue 3",
                             "type": "active"
                         },
                         {
                             "key": "phono",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.phono.label}}",
+                            "value": "Phono",
                             "type": "active"
                         }
                     ],
@@ -548,23 +548,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.commands.setInputSource.label}}",
+                "label": "Media input source",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "AM",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.AM.label}}",
+                            "value": "AM",
                             "type": "active"
                         },
                         {
                             "key": "CD",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.CD.label}}",
+                            "value": "CD",
                             "type": "active"
                         },
                         {
                             "key": "FM",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.FM.label}}",
+                            "value": "FM",
                             "type": "active"
                         },
                         {
@@ -604,77 +604,77 @@
                         },
                         {
                             "key": "digitalTv",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.digitalTv.label}}",
+                            "value": "Digital TV",
                             "type": "active"
                         },
                         {
                             "key": "USB",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.USB.label}}",
+                            "value": "USB",
                             "type": "active"
                         },
                         {
                             "key": "YouTube",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.YouTube.label}}",
+                            "value": "YouTube",
                             "type": "active"
                         },
                         {
                             "key": "aux",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.aux.label}}",
+                            "value": "Aux",
                             "type": "active"
                         },
                         {
                             "key": "bluetooth",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.bluetooth.label}}",
+                            "value": "Bluetooth",
                             "type": "active"
                         },
                         {
                             "key": "digital",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.digital.label}}",
+                            "value": "Digital",
                             "type": "active"
                         },
                         {
                             "key": "melon",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.melon.label}}",
+                            "value": "Melon",
                             "type": "active"
                         },
                         {
                             "key": "wifi",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.wifi.label}}",
+                            "value": "Wi-Fi",
                             "type": "active"
                         },
                         {
                             "key": "network",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.network.label}}",
+                            "value": "Network",
                             "type": "active"
                         },
                         {
                             "key": "optical",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.optical.label}}",
+                            "value": "Optical",
                             "type": "active"
                         },
                         {
                             "key": "coaxial",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.coaxial.label}}",
+                            "value": "Coaxial",
                             "type": "active"
                         },
                         {
                             "key": "analog1",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog1.label}}",
+                            "value": "Analogue 1",
                             "type": "active"
                         },
                         {
                             "key": "analog2",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog2.label}}",
+                            "value": "Analogue 2",
                             "type": "active"
                         },
                         {
                             "key": "analog3",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.analog3.label}}",
+                            "value": "Analogue 3",
                             "type": "active"
                         },
                         {
                             "key": "phono",
-                            "value": "{{i18n.attributes.inputSource.i18n.value.phono.label}}",
+                            "value": "Phono",
                             "type": "active"
                         }
                     ],
diff --git a/json/mediaPlayback.i18n.fr.json b/json/mediaPlayback.i18n.fr.json
index e906deab..305a0a97 100755
--- a/json/mediaPlayback.i18n.fr.json
+++ b/json/mediaPlayback.i18n.fr.json
@@ -31,7 +31,7 @@
                         "label": "Lecture"
                     },
                     "fast forwarding": {
-                        "label": "Avance rapide"
+                        "label": "Fast forward"
                     }
                 }
             }
diff --git a/json/mediaPlaybackPresentation.json b/json/mediaPlaybackPresentation.json
index 2cc82766..0f955a3f 100755
--- a/json/mediaPlaybackPresentation.json
+++ b/json/mediaPlaybackPresentation.json
@@ -6,27 +6,27 @@
                 "alternatives": [
                     {
                         "key": "playing",
-                        "value": "{{i18n.attributes.playbackStatus.i18n.value.playing.label}}",
+                        "value": "Play",
                         "type": "active"
                     },
                     {
                         "key": "stopped",
-                        "value": "{{i18n.attributes.playbackStatus.i18n.value.stopped.label}}",
+                        "value": "Stop",
                         "type": "inactive"
                     },
                     {
                         "key": "paused",
-                        "value": "{{i18n.attributes.playbackStatus.i18n.value.paused.label}}",
+                        "value": "Pause",
                         "type": "inactive"
                     },
                     {
                         "key": "fast forwarding",
-                        "value": "{{i18n.attributes.playbackStatus.i18n.value.fast forwarding.label}}",
+                        "value": "Fast forward",
                         "type": "active"
                     },
                     {
                         "key": "rewinding",
-                        "value": "{{i18n.attributes.playbackStatus.i18n.value.rewinding.label}}",
+                        "value": "Rewind",
                         "type": "active"
                     }
                 ]
@@ -48,17 +48,17 @@
                         "alternatives": [
                             {
                                 "key": "stopped",
-                                "value": "{{i18n.attributes.playbackStatus.i18n.value.stopped.label}}",
+                                "value": "Stop",
                                 "type": "inactive"
                             },
                             {
                                 "key": "fast forwarding",
-                                "value": "{{i18n.attributes.playbackStatus.i18n.value.fast forwarding.label}}",
+                                "value": "Fast forward",
                                 "type": "active"
                             },
                             {
                                 "key": "rewinding",
-                                "value": "{{i18n.attributes.playbackStatus.i18n.value.rewinding.label}}",
+                                "value": "Rewind",
                                 "type": "active"
                             }
                         ]
@@ -79,17 +79,17 @@
                         "alternatives": [
                             {
                                 "key": "paused",
-                                "value": "{{i18n.attributes.playbackStatus.i18n.value.paused.label}}",
+                                "value": "Pause",
                                 "type": "inactive"
                             },
                             {
                                 "key": "fast forwarding",
-                                "value": "{{i18n.attributes.playbackStatus.i18n.value.fast forwarding.label}}",
+                                "value": "Fast forward",
                                 "type": "active"
                             },
                             {
                                 "key": "rewinding",
-                                "value": "{{i18n.attributes.playbackStatus.i18n.value.rewinding.label}}",
+                                "value": "Rewind",
                                 "type": "active"
                             }
                         ],
@@ -102,34 +102,34 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Media playback",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.commands.play.label}}",
+                            "value": "Play",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.stop.label}}",
+                            "value": "Stop",
                             "type": "inactive"
                         },
                         {
                             "key": "rewind",
-                            "value": "{{i18n.commands.rewind.label}}",
+                            "value": "Rewind",
                             "type": "active"
                         },
                         {
                             "key": "fastForward",
-                            "value": "{{i18n.commands.fastForward.label}}",
+                            "value": "Fast forward",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         }
                     ],
@@ -141,27 +141,27 @@
                     "alternatives": [
                         {
                             "key": "playing",
-                            "value": "{{i18n.attributes.playbackStatus.i18n.value.playing.label}}",
+                            "value": "Play",
                             "type": "active"
                         },
                         {
                             "key": "stopped",
-                            "value": "{{i18n.attributes.playbackStatus.i18n.value.stopped.label}}",
+                            "value": "Stop",
                             "type": "inactive"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.playbackStatus.i18n.value.paused.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         },
                         {
                             "key": "fast forwarding",
-                            "value": "{{i18n.attributes.playbackStatus.i18n.value.fast forwarding.label}}",
+                            "value": "Fast forward",
                             "type": "active"
                         },
                         {
                             "key": "rewinding",
-                            "value": "{{i18n.attributes.playbackStatus.i18n.value.rewinding.label}}",
+                            "value": "Rewind",
                             "type": "active"
                         }
                     ]
@@ -172,33 +172,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Media playback",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "playing",
-                            "value": "{{i18n.attributes.playbackStatus.i18n.value.playing.label}}",
+                            "value": "Play",
                             "type": "active"
                         },
                         {
                             "key": "stopped",
-                            "value": "{{i18n.attributes.playbackStatus.i18n.value.stopped.label}}",
+                            "value": "Stop",
                             "type": "inactive"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.playbackStatus.i18n.value.paused.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         },
                         {
                             "key": "fast forwarding",
-                            "value": "{{i18n.attributes.playbackStatus.i18n.value.fast forwarding.label}}",
+                            "value": "Fast forward",
                             "type": "active"
                         },
                         {
                             "key": "rewinding",
-                            "value": "{{i18n.attributes.playbackStatus.i18n.value.rewinding.label}}",
+                            "value": "Rewind",
                             "type": "active"
                         }
                     ],
@@ -210,33 +210,33 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Media playback",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.commands.play.label}}",
+                            "value": "Play",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.stop.label}}",
+                            "value": "Stop",
                             "type": "inactive"
                         },
                         {
                             "key": "rewind",
-                            "value": "{{i18n.commands.rewind.label}}",
+                            "value": "Rewind",
                             "type": "active"
                         },
                         {
                             "key": "fastForward",
-                            "value": "{{i18n.commands.fastForward.label}}",
+                            "value": "Fast forward",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/mediaPlaybackRepeatPresentation.json b/json/mediaPlaybackRepeatPresentation.json
index bbf57b67..16c7eded 100755
--- a/json/mediaPlaybackRepeatPresentation.json
+++ b/json/mediaPlaybackRepeatPresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "all",
-                        "value": "{{i18n.attributes.playbackRepeatMode.i18n.value.all.label}}",
+                        "value": "All",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.playbackRepeatMode.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "active"
                     },
                     {
                         "key": "one",
-                        "value": "{{i18n.attributes.playbackRepeatMode.i18n.value.one.label}}",
+                        "value": "One",
                         "type": "active"
                     }
                 ]
@@ -27,7 +27,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Repeat",
             "displayType": "list",
             "list": {
                 "command": {
@@ -35,17 +35,17 @@
                     "alternatives": [
                         {
                             "key": "all",
-                            "value": "{{i18n.commands.setPlaybackRepeatMode.arguments.mode.i18n.all.label}}",
+                            "value": "All",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setPlaybackRepeatMode.arguments.mode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "one",
-                            "value": "{{i18n.commands.setPlaybackRepeatMode.arguments.mode.i18n.one.label}}",
+                            "value": "One",
                             "type": "active"
                         }
                     ]
@@ -55,17 +55,17 @@
                     "alternatives": [
                         {
                             "key": "all",
-                            "value": "{{i18n.attributes.playbackRepeatMode.i18n.value.all.label}}",
+                            "value": "All",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.playbackRepeatMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "one",
-                            "value": "{{i18n.attributes.playbackRepeatMode.i18n.value.one.label}}",
+                            "value": "One",
                             "type": "active"
                         }
                     ]
@@ -76,23 +76,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Repeat",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "all",
-                            "value": "{{i18n.attributes.playbackRepeatMode.i18n.value.all.label}}",
+                            "value": "All",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.playbackRepeatMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "one",
-                            "value": "{{i18n.attributes.playbackRepeatMode.i18n.value.one.label}}",
+                            "value": "One",
                             "type": "active"
                         }
                     ],
@@ -103,23 +103,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Repeat",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "all",
-                            "value": "{{i18n.commands.setPlaybackRepeatMode.arguments.mode.i18n.all.label}}",
+                            "value": "All",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setPlaybackRepeatMode.arguments.mode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "one",
-                            "value": "{{i18n.commands.setPlaybackRepeatMode.arguments.mode.i18n.one.label}}",
+                            "value": "One",
                             "type": "active"
                         }
                     ],
diff --git a/json/mediaPlaybackShufflePresentation.json b/json/mediaPlaybackShufflePresentation.json
index 16c6eea6..bc8a7707 100755
--- a/json/mediaPlaybackShufflePresentation.json
+++ b/json/mediaPlaybackShufflePresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "enabled",
-                        "value": "{{i18n.attributes.playbackShuffle.i18n.value.enabled.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "disabled",
-                        "value": "{{i18n.attributes.playbackShuffle.i18n.value.disabled.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -22,7 +22,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Shuffle",
             "displayType": "list",
             "list": {
                 "command": {
@@ -30,12 +30,12 @@
                     "alternatives": [
                         {
                             "key": "enabled",
-                            "value": "{{i18n.commands.setPlaybackShuffle.arguments.shuffle.i18n.enabled.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "disabled",
-                            "value": "{{i18n.commands.setPlaybackShuffle.arguments.shuffle.i18n.disabled.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
@@ -45,12 +45,12 @@
                     "alternatives": [
                         {
                             "key": "enabled",
-                            "value": "{{i18n.attributes.playbackShuffle.i18n.value.enabled.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "disabled",
-                            "value": "{{i18n.attributes.playbackShuffle.i18n.value.disabled.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
@@ -61,18 +61,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Shuffle",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "enabled",
-                            "value": "{{i18n.attributes.playbackShuffle.i18n.value.enabled.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "disabled",
-                            "value": "{{i18n.attributes.playbackShuffle.i18n.value.disabled.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -83,18 +83,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Shuffle",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "enabled",
-                            "value": "{{i18n.commands.setPlaybackShuffle.arguments.shuffle.i18n.enabled.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "disabled",
-                            "value": "{{i18n.commands.setPlaybackShuffle.arguments.shuffle.i18n.disabled.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/mediaPresetsPresentation.json b/json/mediaPresetsPresentation.json
index b349d53b..42d8e253 100755
--- a/json/mediaPresetsPresentation.json
+++ b/json/mediaPresetsPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Play a favourite",
             "displayType": "state",
             "state": {
                 "label": "{{presets.value}}"
@@ -12,7 +12,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Play a favourite",
                 "displayType": "textField",
                 "textField": {
                     "command": "playPreset",
diff --git a/json/mediaTrackControlPresentation.json b/json/mediaTrackControlPresentation.json
index 9518dd12..0a636df4 100755
--- a/json/mediaTrackControlPresentation.json
+++ b/json/mediaTrackControlPresentation.json
@@ -1,19 +1,19 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Media track control",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "nextTrack",
-                            "value": "{{i18n.commands.nextTrack.label}}",
+                            "value": "Next",
                             "type": "active"
                         },
                         {
                             "key": "previousTrack",
-                            "value": "{{i18n.commands.previousTrack.label}}",
+                            "value": "Previous",
                             "type": "active"
                         }
                     ],
@@ -26,18 +26,18 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Media track control",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "nextTrack",
-                            "value": "{{i18n.commands.nextTrack.label}}",
+                            "value": "Next",
                             "type": "active"
                         },
                         {
                             "key": "previousTrack",
-                            "value": "{{i18n.commands.previousTrack.label}}",
+                            "value": "Previous",
                             "type": "active"
                         }
                     ],
diff --git a/json/modePresentation.json b/json/modePresentation.json
index a0f7ab50..129a15fe 100755
--- a/json/modePresentation.json
+++ b/json/modePresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -40,7 +40,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
@@ -58,7 +58,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.commands.setMode.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
diff --git a/json/moldHealthConcern.i18n.en.json b/json/moldHealthConcern.i18n.en.json
index 03fd59fb..8972487c 100755
--- a/json/moldHealthConcern.i18n.en.json
+++ b/json/moldHealthConcern.i18n.en.json
@@ -32,6 +32,12 @@
                     }
                 }
             }
+        },
+        "supportedMoldValues": {
+            "label": "Supported mold values",
+            "description": "The list of mold health concern values that the device supports. Is optional, defaults to all values if not set.",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
         }
     },
     "commands": {}
diff --git a/json/moldHealthConcern.i18n.fr.json b/json/moldHealthConcern.i18n.fr.json
index aac8a3fb..699cfd54 100755
--- a/json/moldHealthConcern.i18n.fr.json
+++ b/json/moldHealthConcern.i18n.fr.json
@@ -32,6 +32,12 @@
                     }
                 }
             }
+        },
+        "supportedMoldValues": {
+            "label": "Supported mold values",
+            "description": "The list of mold health concern values that the device supports. Is optional, defaults to all values if not set.",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
         }
     },
     "commands": {}
diff --git a/json/moldHealthConcernPresentation.json b/json/moldHealthConcernPresentation.json
index 279dcbd7..d2fcf78b 100755
--- a/json/moldHealthConcernPresentation.json
+++ b/json/moldHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Mold level",
             "displayType": "state",
             "state": {
                 "label": "{{moldHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.moldHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mold level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.moldHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.moldHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.moldHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.moldHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.moldHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.moldHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.moldHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/momentaryPresentation.json b/json/momentaryPresentation.json
index ea5ebbca..22d849bf 100755
--- a/json/momentaryPresentation.json
+++ b/json/momentaryPresentation.json
@@ -2,7 +2,7 @@
     "dashboard": {
         "states": [
             {
-                "label": "{{___PO_CODE_CAPABILITY.SMARTTHINGS.MOMENTARY_DEFAULT_STANDBY}}"
+                "label": "Standby"
             }
         ],
         "actions": [
@@ -17,7 +17,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Momentary",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "push"
@@ -28,13 +28,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Momentary",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "push",
-                            "value": "{{i18n.commands.push.label}}",
+                            "value": "Press momentary",
                             "type": "active"
                         }
                     ]
diff --git a/json/motionBed.i18n.en.json b/json/motionBed.i18n.en.json
index f44b63bc..180c849b 100644
--- a/json/motionBed.i18n.en.json
+++ b/json/motionBed.i18n.en.json
@@ -12,7 +12,7 @@
                         "label": "Anti-snore"
                     },
                     "noMode": {
-                        "label": "noMode"
+                        "label": "No mode"
                     },
                     "tv": {
                         "label": "TV"
diff --git a/json/motionBed.i18n.fr.json b/json/motionBed.i18n.fr.json
index a3d21a00..a7ff2073 100644
--- a/json/motionBed.i18n.fr.json
+++ b/json/motionBed.i18n.fr.json
@@ -12,7 +12,7 @@
                         "label": "Anti-ronflement"
                     },
                     "noMode": {
-                        "label": "noMode"
+                        "label": "No mode"
                     },
                     "tv": {
                         "label": "TV"
diff --git a/json/motionBedPresentation.json b/json/motionBedPresentation.json
index b40f70a7..35792623 100644
--- a/json/motionBedPresentation.json
+++ b/json/motionBedPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "preset1",
-                        "value": "{{i18n.attributes.mode.i18n.value.preset1.label}}",
+                        "value": "Preset",
                         "type": "active"
                     },
                     {
                         "key": "preset2",
-                        "value": "{{i18n.attributes.mode.i18n.value.preset2.label}}",
+                        "value": "Preset 2",
                         "type": "active"
                     },
                     {
                         "key": "zeroG",
-                        "value": "{{i18n.attributes.mode.i18n.value.zeroG.label}}",
+                        "value": "Zero gravity",
                         "type": "active"
                     },
                     {
                         "key": "flat",
-                        "value": "{{i18n.attributes.mode.i18n.value.flat.label}}",
+                        "value": "Flat",
                         "type": "active"
                     },
                     {
                         "key": "tv",
-                        "value": "{{i18n.attributes.mode.i18n.value.tv.label}}",
+                        "value": "TV",
                         "type": "active"
                     },
                     {
                         "key": "reading",
-                        "value": "{{i18n.attributes.mode.i18n.value.reading.label}}",
+                        "value": "Reading",
                         "type": "active"
                     },
                     {
                         "key": "antiSnore",
-                        "value": "{{i18n.attributes.mode.i18n.value.antiSnore.label}}",
+                        "value": "Anti-snore",
                         "type": "active"
                     }
                 ]
@@ -47,7 +47,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Motion",
             "displayType": "list",
             "list": {
                 "command": {
@@ -55,37 +55,37 @@
                     "alternatives": [
                         {
                             "key": "preset1",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.preset1.label}}",
+                            "value": "Preset",
                             "type": "active"
                         },
                         {
                             "key": "preset2",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.preset2.label}}",
+                            "value": "Preset 2",
                             "type": "active"
                         },
                         {
                             "key": "zeroG",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.zeroG.label}}",
+                            "value": "Zero gravity",
                             "type": "active"
                         },
                         {
                             "key": "flat",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.flat.label}}",
+                            "value": "Flat",
                             "type": "active"
                         },
                         {
                             "key": "tv",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.tv.label}}",
+                            "value": "TV",
                             "type": "active"
                         },
                         {
                             "key": "reading",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.reading.label}}",
+                            "value": "Reading",
                             "type": "active"
                         },
                         {
                             "key": "antiSnore",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.antiSnore.label}}",
+                            "value": "Anti-snore",
                             "type": "active"
                         }
                     ],
@@ -98,37 +98,37 @@
                     "alternatives": [
                         {
                             "key": "preset1",
-                            "value": "{{i18n.attributes.mode.i18n.value.preset1.label}}",
+                            "value": "Preset",
                             "type": "active"
                         },
                         {
                             "key": "preset2",
-                            "value": "{{i18n.attributes.mode.i18n.value.preset2.label}}",
+                            "value": "Preset 2",
                             "type": "active"
                         },
                         {
                             "key": "zeroG",
-                            "value": "{{i18n.attributes.mode.i18n.value.zeroG.label}}",
+                            "value": "Zero gravity",
                             "type": "active"
                         },
                         {
                             "key": "flat",
-                            "value": "{{i18n.attributes.mode.i18n.value.flat.label}}",
+                            "value": "Flat",
                             "type": "active"
                         },
                         {
                             "key": "tv",
-                            "value": "{{i18n.attributes.mode.i18n.value.tv.label}}",
+                            "value": "TV",
                             "type": "active"
                         },
                         {
                             "key": "reading",
-                            "value": "{{i18n.attributes.mode.i18n.value.reading.label}}",
+                            "value": "Reading",
                             "type": "active"
                         },
                         {
                             "key": "antiSnore",
-                            "value": "{{i18n.attributes.mode.i18n.value.antiSnore.label}}",
+                            "value": "Anti-snore",
                             "type": "active"
                         }
                     ]
@@ -136,7 +136,7 @@
             }
         },
         {
-            "label": "{{i18n.commands.start.label}}",
+            "label": "start",
             "displayType": "list",
             "list": {
                 "command": {
@@ -144,32 +144,32 @@
                     "alternatives": [
                         {
                             "key": "headUp",
-                            "value": "{{i18n.commands.start.arguments.position.i18n.headUp.label}}",
+                            "value": "Head up",
                             "type": "active"
                         },
                         {
                             "key": "headDown",
-                            "value": "{{i18n.commands.start.arguments.position.i18n.headDown.label}}",
+                            "value": "Head down",
                             "type": "active"
                         },
                         {
                             "key": "footUp",
-                            "value": "{{i18n.commands.start.arguments.position.i18n.footUp.label}}",
+                            "value": "Foot up",
                             "type": "active"
                         },
                         {
                             "key": "footDown",
-                            "value": "{{i18n.commands.start.arguments.position.i18n.footDown.label}}",
+                            "value": "Foot down",
                             "type": "active"
                         },
                         {
                             "key": "elevationUp",
-                            "value": "{{i18n.commands.start.arguments.position.i18n.elevationUp.label}}",
+                            "value": "Elevation up",
                             "type": "active"
                         },
                         {
                             "key": "elevationDown",
-                            "value": "{{i18n.commands.start.arguments.position.i18n.elevationDown.label}}",
+                            "value": "Elevation down",
                             "type": "active"
                         }
                     ],
@@ -179,7 +179,7 @@
             }
         },
         {
-            "label": "{{i18n.commands.stop.label}}",
+            "label": "stop",
             "displayType": "list",
             "list": {
                 "command": {
@@ -187,32 +187,32 @@
                     "alternatives": [
                         {
                             "key": "headUp",
-                            "value": "{{i18n.commands.stop.arguments.position.i18n.headUp.label}}",
+                            "value": "Head up",
                             "type": "active"
                         },
                         {
                             "key": "headDown",
-                            "value": "{{i18n.commands.stop.arguments.position.i18n.headDown.label}}",
+                            "value": "Head down",
                             "type": "active"
                         },
                         {
                             "key": "footUp",
-                            "value": "{{i18n.commands.stop.arguments.position.i18n.footUp.label}}",
+                            "value": "Foot up",
                             "type": "active"
                         },
                         {
                             "key": "footDown",
-                            "value": "{{i18n.commands.stop.arguments.position.i18n.footDown.label}}",
+                            "value": "Foot down",
                             "type": "active"
                         },
                         {
                             "key": "elevationUp",
-                            "value": "{{i18n.commands.stop.arguments.position.i18n.elevationUp.label}}",
+                            "value": "Elevation up",
                             "type": "active"
                         },
                         {
                             "key": "elevationDown",
-                            "value": "{{i18n.commands.stop.arguments.position.i18n.elevationDown.label}}",
+                            "value": "Elevation down",
                             "type": "active"
                         }
                     ],
@@ -225,43 +225,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Motion",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "preset1",
-                            "value": "{{i18n.attributes.mode.i18n.value.preset1.label}}",
+                            "value": "Preset",
                             "type": "active"
                         },
                         {
                             "key": "preset2",
-                            "value": "{{i18n.attributes.mode.i18n.value.preset2.label}}",
+                            "value": "Preset 2",
                             "type": "active"
                         },
                         {
                             "key": "zeroG",
-                            "value": "{{i18n.attributes.mode.i18n.value.zeroG.label}}",
+                            "value": "Zero gravity",
                             "type": "active"
                         },
                         {
                             "key": "flat",
-                            "value": "{{i18n.attributes.mode.i18n.value.flat.label}}",
+                            "value": "Flat",
                             "type": "active"
                         },
                         {
                             "key": "tv",
-                            "value": "{{i18n.attributes.mode.i18n.value.tv.label}}",
+                            "value": "TV",
                             "type": "active"
                         },
                         {
                             "key": "reading",
-                            "value": "{{i18n.attributes.mode.i18n.value.reading.label}}",
+                            "value": "Reading",
                             "type": "active"
                         },
                         {
                             "key": "antiSnore",
-                            "value": "{{i18n.attributes.mode.i18n.value.antiSnore.label}}",
+                            "value": "Anti-snore",
                             "type": "active"
                         }
                     ],
@@ -274,43 +274,43 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Motion",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "preset1",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.preset1.label}}",
+                            "value": "Preset",
                             "type": "active"
                         },
                         {
                             "key": "preset2",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.preset2.label}}",
+                            "value": "Preset 2",
                             "type": "active"
                         },
                         {
                             "key": "zeroG",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.zeroG.label}}",
+                            "value": "Zero gravity",
                             "type": "active"
                         },
                         {
                             "key": "flat",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.flat.label}}",
+                            "value": "Flat",
                             "type": "active"
                         },
                         {
                             "key": "tv",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.tv.label}}",
+                            "value": "TV",
                             "type": "active"
                         },
                         {
                             "key": "reading",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.reading.label}}",
+                            "value": "Reading",
                             "type": "active"
                         },
                         {
                             "key": "antiSnore",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.antiSnore.label}}",
+                            "value": "Anti-snore",
                             "type": "active"
                         }
                     ],
diff --git a/json/motionSensorPresentation.json b/json/motionSensorPresentation.json
index 10efc0fc..dc408298 100755
--- a/json/motionSensorPresentation.json
+++ b/json/motionSensorPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "active",
-                        "value": "{{i18n.attributes.motion.i18n.value.active.label}}",
+                        "value": "Motion detected",
                         "type": "active"
                     },
                     {
                         "key": "inactive",
-                        "value": "{{i18n.attributes.motion.i18n.value.inactive.label}}",
+                        "value": "No motion",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Motion sensor",
             "displayType": "state",
             "state": {
                 "label": "{{motion.value}}",
                 "alternatives": [
                     {
                         "key": "active",
-                        "value": "{{i18n.attributes.motion.i18n.value.active.label}}",
+                        "value": "Motion detected",
                         "type": "active"
                     },
                     {
                         "key": "inactive",
-                        "value": "{{i18n.attributes.motion.i18n.value.inactive.label}}",
+                        "value": "No motion",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Motion sensor",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "active",
-                            "value": "{{i18n.attributes.motion.i18n.value.active.label}}",
+                            "value": "Motion detected",
                             "type": "active"
                         },
                         {
                             "key": "inactive",
-                            "value": "{{i18n.attributes.motion.i18n.value.inactive.label}}",
+                            "value": "No motion",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/movementSensorPresentation.json b/json/movementSensorPresentation.json
index 3246a40a..93184dda 100755
--- a/json/movementSensorPresentation.json
+++ b/json/movementSensorPresentation.json
@@ -6,47 +6,47 @@
                 "alternatives": [
                     {
                         "key": "inactive",
-                        "value": "{{i18n.attributes.movement.i18n.value.inactive.label}}",
+                        "value": "No movement",
                         "type": "inactive"
                     },
                     {
                         "key": "approaching",
-                        "value": "{{i18n.attributes.movement.i18n.value.approaching.label}}",
+                        "value": "Approaching",
                         "type": "active"
                     },
                     {
                         "key": "movingAway",
-                        "value": "{{i18n.attributes.movement.i18n.value.movingAway.label}}",
+                        "value": "Moving away",
                         "type": "active"
                     },
                     {
                         "key": "entering",
-                        "value": "{{i18n.attributes.movement.i18n.value.entering.label}}",
+                        "value": "Entering",
                         "type": "active"
                     },
                     {
                         "key": "leaving",
-                        "value": "{{i18n.attributes.movement.i18n.value.leaving.label}}",
+                        "value": "Leaving",
                         "type": "active"
                     },
                     {
                         "key": "enteringLeft",
-                        "value": "{{i18n.attributes.movement.i18n.value.enteringLeft.label}}",
+                        "value": "Entering left",
                         "type": "active"
                     },
                     {
                         "key": "enteringRight",
-                        "value": "{{i18n.attributes.movement.i18n.value.enteringRight.label}}",
+                        "value": "Entering right",
                         "type": "active"
                     },
                     {
                         "key": "leavingLeft",
-                        "value": "{{i18n.attributes.movement.i18n.value.leavingLeft.label}}",
+                        "value": "Leaving left",
                         "type": "active"
                     },
                     {
                         "key": "leavingRight",
-                        "value": "{{i18n.attributes.movement.i18n.value.leavingRight.label}}",
+                        "value": "Leaving right",
                         "type": "active"
                     }
                 ]
@@ -57,54 +57,54 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Movement sensor detection",
             "displayType": "state",
             "state": {
                 "label": "{{movement.value}}",
                 "alternatives": [
                     {
                         "key": "inactive",
-                        "value": "{{i18n.attributes.movement.i18n.value.inactive.label}}",
+                        "value": "No movement",
                         "type": "inactive"
                     },
                     {
                         "key": "approaching",
-                        "value": "{{i18n.attributes.movement.i18n.value.approaching.label}}",
+                        "value": "Approaching",
                         "type": "active"
                     },
                     {
                         "key": "movingAway",
-                        "value": "{{i18n.attributes.movement.i18n.value.movingAway.label}}",
+                        "value": "Moving away",
                         "type": "active"
                     },
                     {
                         "key": "entering",
-                        "value": "{{i18n.attributes.movement.i18n.value.entering.label}}",
+                        "value": "Entering",
                         "type": "active"
                     },
                     {
                         "key": "leaving",
-                        "value": "{{i18n.attributes.movement.i18n.value.leaving.label}}",
+                        "value": "Leaving",
                         "type": "active"
                     },
                     {
                         "key": "enteringLeft",
-                        "value": "{{i18n.attributes.movement.i18n.value.enteringLeft.label}}",
+                        "value": "Entering left",
                         "type": "active"
                     },
                     {
                         "key": "enteringRight",
-                        "value": "{{i18n.attributes.movement.i18n.value.enteringRight.label}}",
+                        "value": "Entering right",
                         "type": "active"
                     },
                     {
                         "key": "leavingLeft",
-                        "value": "{{i18n.attributes.movement.i18n.value.leavingLeft.label}}",
+                        "value": "Leaving left",
                         "type": "active"
                     },
                     {
                         "key": "leavingRight",
-                        "value": "{{i18n.attributes.movement.i18n.value.leavingRight.label}}",
+                        "value": "Leaving right",
                         "type": "active"
                     }
                 ]
@@ -114,53 +114,53 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Movement sensor detection",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "inactive",
-                            "value": "{{i18n.attributes.movement.i18n.value.inactive.label}}",
+                            "value": "No movement",
                             "type": "inactive"
                         },
                         {
                             "key": "approaching",
-                            "value": "{{i18n.attributes.movement.i18n.value.approaching.label}}",
+                            "value": "Approaching",
                             "type": "active"
                         },
                         {
                             "key": "movingAway",
-                            "value": "{{i18n.attributes.movement.i18n.value.movingAway.label}}",
+                            "value": "Moving away",
                             "type": "active"
                         },
                         {
                             "key": "entering",
-                            "value": "{{i18n.attributes.movement.i18n.value.entering.label}}",
+                            "value": "Entering",
                             "type": "active"
                         },
                         {
                             "key": "leaving",
-                            "value": "{{i18n.attributes.movement.i18n.value.leaving.label}}",
+                            "value": "Leaving",
                             "type": "active"
                         },
                         {
                             "key": "enteringLeft",
-                            "value": "{{i18n.attributes.movement.i18n.value.enteringLeft.label}}",
+                            "value": "Entering left",
                             "type": "active"
                         },
                         {
                             "key": "enteringRight",
-                            "value": "{{i18n.attributes.movement.i18n.value.enteringRight.label}}",
+                            "value": "Entering right",
                             "type": "active"
                         },
                         {
                             "key": "leavingLeft",
-                            "value": "{{i18n.attributes.movement.i18n.value.leavingLeft.label}}",
+                            "value": "Leaving left",
                             "type": "active"
                         },
                         {
                             "key": "leavingRight",
-                            "value": "{{i18n.attributes.movement.i18n.value.leavingRight.label}}",
+                            "value": "Leaving right",
                             "type": "active"
                         }
                     ],
diff --git a/json/multipleZonePresencePresentation.json b/json/multipleZonePresencePresentation.json
index 82a67254..76833fa7 100755
--- a/json/multipleZonePresencePresentation.json
+++ b/json/multipleZonePresencePresentation.json
@@ -1,19 +1,19 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Presence of people by zone",
             "displayType": "state",
             "state": {
                 "label": "{{zoneState.value}}",
                 "alternatives": [
                     {
                         "key": "present",
-                        "value": "{{i18n.attributes.zoneState.i18n.value.present.label}}",
+                        "value": "Present",
                         "type": "active"
                     },
                     {
                         "key": "not present",
-                        "value": "{{i18n.attributes.zoneState.i18n.value.not present.label}}",
+                        "value": "Not present",
                         "type": "inactive"
                     }
                 ]
@@ -23,18 +23,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Presence of people by zone",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "present",
-                            "value": "{{i18n.attributes.zoneState.i18n.value.present.label}}",
+                            "value": "Present",
                             "type": "active"
                         },
                         {
                             "key": "not present",
-                            "value": "{{i18n.attributes.zoneState.i18n.value.not present.label}}",
+                            "value": "Not present",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/musicPlayer.i18n.en.json b/json/musicPlayer.i18n.en.json
index 6fb20735..ff4e20d5 100755
--- a/json/musicPlayer.i18n.en.json
+++ b/json/musicPlayer.i18n.en.json
@@ -51,12 +51,12 @@
                     "paused": {
                         "label": "Paused"
                     },
-                    "stop": {
-                        "label": "Stop"
-                    },
                     "standby": {
                         "label": "Standby"
                     },
+                    "stop": {
+                        "label": "Stop"
+                    },
                     "playing": {
                         "label": "Playing"
                     },
diff --git a/json/musicPlayer.i18n.fr.json b/json/musicPlayer.i18n.fr.json
index 86e4f732..238d439b 100755
--- a/json/musicPlayer.i18n.fr.json
+++ b/json/musicPlayer.i18n.fr.json
@@ -51,12 +51,12 @@
                     "paused": {
                         "label": "En pause"
                     },
-                    "stop": {
-                        "label": "Arrêter"
-                    },
                     "standby": {
                         "label": "En veille"
                     },
+                    "stop": {
+                        "label": "Arrêter"
+                    },
                     "playing": {
                         "label": "Lecture"
                     },
diff --git a/json/musicPlayerPresentation.json b/json/musicPlayerPresentation.json
index afb05f8f..b5c6e6e6 100755
--- a/json/musicPlayerPresentation.json
+++ b/json/musicPlayerPresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "playing",
-                        "value": "{{i18n.attributes.status.i18n.value.playing.label}}",
+                        "value": "Playing",
                         "type": "active"
                     },
                     {
                         "key": "paused",
-                        "value": "{{i18n.attributes.status.i18n.value.paused.label}}",
+                        "value": "Paused",
                         "type": "inactive"
                     },
                     {
                         "key": "stopped",
-                        "value": "{{i18n.attributes.status.i18n.value.stopped.label}}",
+                        "value": "Stopped",
                         "type": "inactive"
                     },
                     {
                         "key": "standby",
-                        "value": "{{i18n.attributes.status.i18n.value.standby.label}}",
+                        "value": "Standby",
                         "type": "inactive"
                     }
                 ]
@@ -42,12 +42,12 @@
                         "alternatives": [
                             {
                                 "key": "stopped",
-                                "value": "{{i18n.attributes.status.i18n.value.stopped.label}}",
+                                "value": "Stopped",
                                 "type": "inactive"
                             },
                             {
                                 "key": "standby",
-                                "value": "{{i18n.attributes.status.i18n.value.standby.label}}",
+                                "value": "Standby",
                                 "type": "inactive"
                             }
                         ]
@@ -59,24 +59,24 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Music player",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.commands.play.label}}",
+                            "value": "Play",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.stop.label}}",
+                            "value": "Stop",
                             "type": "inactive"
                         }
                     ]
@@ -86,37 +86,37 @@
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.status.i18n.value.play.label}}",
+                            "value": "Play",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.status.i18n.value.pause.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.status.i18n.value.stop.label}}",
+                            "value": "Stop",
                             "type": "inactive"
                         },
                         {
                             "key": "playing",
-                            "value": "{{i18n.attributes.status.i18n.value.playing.label}}",
+                            "value": "Playing",
                             "type": "active"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.status.i18n.value.paused.label}}",
+                            "value": "Paused",
                             "type": "inactive"
                         },
                         {
                             "key": "stopped",
-                            "value": "{{i18n.attributes.status.i18n.value.stopped.label}}",
+                            "value": "Stopped",
                             "type": "inactive"
                         },
                         {
                             "key": "standby",
-                            "value": "{{i18n.attributes.status.i18n.value.standby.label}}",
+                            "value": "Standby",
                             "type": "inactive"
                         }
                     ]
@@ -124,7 +124,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.level.label}}",
+            "label": "Volume",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -138,7 +138,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.mute.label}}",
+            "label": "Mute",
             "displayType": "toggleSwitch",
             "toggleSwitch": {
                 "command": {
@@ -153,12 +153,12 @@
                     "alternatives": [
                         {
                             "key": "muted",
-                            "value": "{{i18n.attributes.mute.i18n.value.muted.label}}",
+                            "value": "Mute",
                             "type": "inactive"
                         },
                         {
                             "key": "unmuted",
-                            "value": "{{i18n.attributes.mute.i18n.value.unmuted.label}}",
+                            "value": "Unmute",
                             "type": "active"
                         }
                     ]
@@ -173,19 +173,19 @@
             }
         },
         {
-            "label": "{{i18n.attributes.trackData.label}}",
+            "label": "Media track control",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "nextTrack",
-                            "value": "{{i18n.commands.nextTrack.label}}",
+                            "value": "Next",
                             "type": "active"
                         },
                         {
                             "key": "previousTrack",
-                            "value": "{{i18n.commands.previousTrack.label}}",
+                            "value": "Previous",
                             "type": "active"
                         }
                     ]
@@ -196,23 +196,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Music player",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "playing",
-                            "value": "{{i18n.attributes.status.i18n.value.playing.label}}",
+                            "value": "Playing",
                             "type": "active"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.status.i18n.value.paused.label}}",
+                            "value": "Paused",
                             "type": "inactive"
                         },
                         {
                             "key": "stopped",
-                            "value": "{{i18n.attributes.status.i18n.value.stopped.label}}",
+                            "value": "Stopped",
                             "type": "inactive"
                         }
                     ],
@@ -221,7 +221,7 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.level.label}}",
+                "label": "Volume",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -233,18 +233,18 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.mute.label}}",
+                "label": "Mute",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "muted",
-                            "value": "{{i18n.attributes.mute.i18n.value.muted.label}}",
+                            "value": "Mute",
                             "type": "inactive"
                         },
                         {
                             "key": "unmuted",
-                            "value": "{{i18n.attributes.mute.i18n.value.unmuted.label}}",
+                            "value": "Unmute",
                             "type": "active"
                         }
                     ],
@@ -256,30 +256,30 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Music player",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.commands.play.label}}",
+                            "value": "Play",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.stop.label}}",
+                            "value": "Stop",
                             "type": "inactive"
                         }
                     ]
                 }
             },
             {
-                "label": "{{i18n.attributes.level.label}}",
+                "label": "Volume",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -291,18 +291,18 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.mute.label}}",
+                "label": "Mute",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "mute",
-                            "value": "{{i18n.commands.mute.label}}",
+                            "value": "Mute",
                             "type": "inactive"
                         },
                         {
                             "key": "unmute",
-                            "value": "{{i18n.commands.unmute.label}}",
+                            "value": "Unmute",
                             "type": "active"
                         }
                     ]
@@ -310,18 +310,18 @@
                 "emphasis": true
             },
             {
-                "label": "{{i18n.attributes.trackData.label}}",
+                "label": "Media track control",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "nextTrack",
-                            "value": "{{i18n.commands.nextTrack.label}}",
+                            "value": "Next",
                             "type": "active"
                         },
                         {
                             "key": "previousTrack",
-                            "value": "{{i18n.commands.previousTrack.label}}",
+                            "value": "Previous",
                             "type": "active"
                         }
                     ]
diff --git a/json/nightVision.i18n.en.json b/json/nightVision.i18n.en.json
new file mode 100644
index 00000000..6c77a092
--- /dev/null
+++ b/json/nightVision.i18n.en.json
@@ -0,0 +1,55 @@
+{
+    "tag": "en",
+    "label": "Night Vision",
+    "attributes": {
+        "illumination": {
+            "label": "illumination",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "auto": {
+                        "label": "auto"
+                    },
+                    "off": {
+                        "label": "off"
+                    },
+                    "on": {
+                        "label": "on"
+                    }
+                }
+            }
+        },
+        "nightVision": {
+            "label": "nightVision",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "auto": {
+                        "label": "auto"
+                    },
+                    "off": {
+                        "label": "off"
+                    },
+                    "on": {
+                        "label": "on"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setIllumination": {
+            "label": "setIllumination",
+            "arguments": {}
+        },
+        "setNightVision": {
+            "label": "setNightVision",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/nightVision.i18n.fr.json b/json/nightVision.i18n.fr.json
new file mode 100644
index 00000000..6c77a092
--- /dev/null
+++ b/json/nightVision.i18n.fr.json
@@ -0,0 +1,55 @@
+{
+    "tag": "en",
+    "label": "Night Vision",
+    "attributes": {
+        "illumination": {
+            "label": "illumination",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "auto": {
+                        "label": "auto"
+                    },
+                    "off": {
+                        "label": "off"
+                    },
+                    "on": {
+                        "label": "on"
+                    }
+                }
+            }
+        },
+        "nightVision": {
+            "label": "nightVision",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "auto": {
+                        "label": "auto"
+                    },
+                    "off": {
+                        "label": "off"
+                    },
+                    "on": {
+                        "label": "on"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setIllumination": {
+            "label": "setIllumination",
+            "arguments": {}
+        },
+        "setNightVision": {
+            "label": "setNightVision",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/nightVision.json b/json/nightVision.json
new file mode 100644
index 00000000..1f523a45
--- /dev/null
+++ b/json/nightVision.json
@@ -0,0 +1,110 @@
+{
+    "id": "nightVision",
+    "version": 1,
+    "status": "proposed",
+    "name": "Night Vision",
+    "ephemeral": false,
+    "attributes": {
+        "illumination": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "on",
+                            "off",
+                            "auto"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setIllumination",
+            "enumCommands": []
+        },
+        "nightVision": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "on",
+                            "off",
+                            "auto"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setNightVision",
+            "enumCommands": []
+        },
+        "supportedAttributes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "illumination"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "setIllumination": {
+            "name": "setIllumination",
+            "arguments": [
+                {
+                    "name": "mode",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "enum": [
+                            "on",
+                            "off",
+                            "auto"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "setNightVision": {
+            "name": "setNightVision",
+            "arguments": [
+                {
+                    "name": "mode",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "enum": [
+                            "on",
+                            "off",
+                            "auto"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/nitrogenDioxideHealthConcernPresentation.json b/json/nitrogenDioxideHealthConcernPresentation.json
index 3d1ba9ac..32f1d011 100755
--- a/json/nitrogenDioxideHealthConcernPresentation.json
+++ b/json/nitrogenDioxideHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Nitrogen dioxide level",
             "displayType": "state",
             "state": {
                 "label": "{{nitrogenDioxideHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Nitrogen dioxide level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.nitrogenDioxideHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/nitrogenDioxideMeasurementPresentation.json b/json/nitrogenDioxideMeasurementPresentation.json
index 6b54ee5e..eede6c0c 100755
--- a/json/nitrogenDioxideMeasurementPresentation.json
+++ b/json/nitrogenDioxideMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Nitrogen dioxide",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Nitrogen dioxide",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "nitrogenDioxide.value",
diff --git a/json/notificationPresentation.json b/json/notificationPresentation.json
index 75aad5aa..6af03c2a 100755
--- a/json/notificationPresentation.json
+++ b/json/notificationPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Text display",
             "displayType": "textField",
             "textField": {
                 "command": "deviceNotification"
@@ -12,7 +12,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Text display",
                 "displayType": "textField",
                 "textField": {
                     "command": "deviceNotification"
diff --git a/json/objectDetectionPresentation.json b/json/objectDetectionPresentation.json
index 301167cf..00e61bad 100755
--- a/json/objectDetectionPresentation.json
+++ b/json/objectDetectionPresentation.json
@@ -1,36 +1,36 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Object sensor",
             "displayType": "state",
             "state": {
                 "label": "{{detected.value.value}}",
                 "alternatives": [
                     {
                         "key": "human",
-                        "value": "{{i18n.attributes.detected.i18n.value.human.label}}",
+                        "value": "Person",
                         "type": "active"
                     },
                     {
                         "key": "pet",
-                        "value": "{{i18n.attributes.detected.i18n.value.pet.label}}",
+                        "value": "Pet",
                         "type": "active"
                     },
                     {
                         "key": "parcel",
-                        "value": "{{i18n.attributes.detected.i18n.value.parcel.label}}",
+                        "value": "Parcel",
                         "type": "active"
                     },
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.detected.i18n.value.none.label}}",
+                        "value": "None",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Object sensor",
             "displayType": "state",
             "state": {
                 "label": "{{detected.value.qty}}"
@@ -40,28 +40,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Object sensor",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "human",
-                            "value": "{{i18n.attributes.detected.i18n.value.human.label}}",
+                            "value": "Person",
                             "type": "active"
                         },
                         {
                             "key": "pet",
-                            "value": "{{i18n.attributes.detected.i18n.value.pet.label}}",
+                            "value": "Pet",
                             "type": "active"
                         },
                         {
                             "key": "parcel",
-                            "value": "{{i18n.attributes.detected.i18n.value.parcel.label}}",
+                            "value": "Parcel",
                             "type": "active"
                         },
                         {
                             "key": "none",
-                            "value": "{{i18n.attributes.detected.i18n.value.none.label}}",
+                            "value": "None",
                             "type": "active"
                         }
                     ],
diff --git a/json/occupancySensorPresentation.json b/json/occupancySensorPresentation.json
index 05df7dd3..f8ccc5fc 100755
--- a/json/occupancySensorPresentation.json
+++ b/json/occupancySensorPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "unoccupied",
-                        "value": "{{i18n.attributes.occupancy.i18n.value.unoccupied.label}}",
+                        "value": "Away",
                         "type": "inactive"
                     },
                     {
                         "key": "occupied",
-                        "value": "{{i18n.attributes.occupancy.i18n.value.occupied.label}}",
+                        "value": "Inside",
                         "type": "active"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Occupancy",
             "displayType": "state",
             "state": {
                 "label": "{{occupancy.value}}",
                 "alternatives": [
                     {
                         "key": "unoccupied",
-                        "value": "{{i18n.attributes.occupancy.i18n.value.unoccupied.label}}",
+                        "value": "Away",
                         "type": "inactive"
                     },
                     {
                         "key": "occupied",
-                        "value": "{{i18n.attributes.occupancy.i18n.value.occupied.label}}",
+                        "value": "Inside",
                         "type": "active"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Occupancy",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "unoccupied",
-                            "value": "{{i18n.attributes.occupancy.i18n.value.unoccupied.label}}",
+                            "value": "Away",
                             "type": "inactive"
                         },
                         {
                             "key": "occupied",
-                            "value": "{{i18n.attributes.occupancy.i18n.value.occupied.label}}",
+                            "value": "Inside",
                             "type": "active"
                         }
                     ],
diff --git a/json/odorSensorPresentation.json b/json/odorSensorPresentation.json
index 810cc731..a83efd25 100755
--- a/json/odorSensorPresentation.json
+++ b/json/odorSensorPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Odour sensor",
             "displayType": "state",
             "state": {
                 "label": "{{odorLevel.value}}"
@@ -11,7 +11,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Odour sensor",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "odorLevel.value",
diff --git a/json/operationalState.i18n.en.json b/json/operationalState.i18n.en.json
index c3763849..336ddd4b 100755
--- a/json/operationalState.i18n.en.json
+++ b/json/operationalState.i18n.en.json
@@ -5,13 +5,14 @@
     "attributes": {
         "supportedOperationalStates": {
             "label": "Supported Operational States",
-            "description": "Supported operational state commands for this machine to receive",
+            "description": "Supported operational states for this machine",
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "supportedCommands": {
-            "label": "supportedCommands",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "Supported Commands",
+            "description": "Supported commands for this machine to receive",
+            "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "operationalState": {
@@ -35,6 +36,9 @@
                     "unableToStartOrResume": {
                         "label": "Couldn't start"
                     },
+                    "standby": {
+                        "label": "Standby"
+                    },
                     "commandInvalidInCurrentState": {
                         "label": "Couldn't do action"
                     }
@@ -44,19 +48,23 @@
     },
     "commands": {
         "resume": {
-            "label": "resume",
+            "label": "Resume",
+            "description": "Resume the machine",
             "arguments": {}
         },
         "stop": {
-            "label": "stop",
+            "label": "Stop",
+            "description": "Stop the machine",
             "arguments": {}
         },
         "start": {
-            "label": "start",
+            "label": "Start",
+            "description": "Start the machine",
             "arguments": {}
         },
         "pause": {
-            "label": "pause",
+            "label": "Pause",
+            "description": "Pause the machine",
             "arguments": {}
         }
     }
diff --git a/json/operationalState.i18n.fr.json b/json/operationalState.i18n.fr.json
index 1ea2c768..36c3ada1 100755
--- a/json/operationalState.i18n.fr.json
+++ b/json/operationalState.i18n.fr.json
@@ -5,13 +5,14 @@
     "attributes": {
         "supportedOperationalStates": {
             "label": "Supported Operational States",
-            "description": "Supported operational state commands for this machine to receive",
+            "description": "Supported operational states for this machine",
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "supportedCommands": {
-            "label": "supportedCommands",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "label": "Supported Commands",
+            "description": "Supported commands for this machine to receive",
+            "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {}
         },
         "operationalState": {
@@ -35,6 +36,9 @@
                     "unableToStartOrResume": {
                         "label": "Impossible de démarrer"
                     },
+                    "standby": {
+                        "label": "En veille"
+                    },
                     "commandInvalidInCurrentState": {
                         "label": "Impossible d'effectuer l\\'action"
                     }
@@ -44,19 +48,23 @@
     },
     "commands": {
         "resume": {
-            "label": "resume",
+            "label": "Reprendre",
+            "description": "Resume the machine",
             "arguments": {}
         },
         "stop": {
-            "label": "stop",
+            "label": "Arrêter",
+            "description": "Stop the machine",
             "arguments": {}
         },
         "start": {
-            "label": "start",
+            "label": "Démarrer",
+            "description": "Start the machine",
             "arguments": {}
         },
         "pause": {
-            "label": "pause",
+            "label": "Pause",
+            "description": "Pause the machine",
             "arguments": {}
         }
     }
diff --git a/json/operationalStatePresentation.json b/json/operationalStatePresentation.json
index 15e0c43a..57128973 100755
--- a/json/operationalStatePresentation.json
+++ b/json/operationalStatePresentation.json
@@ -6,17 +6,37 @@
                 "alternatives": [
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.operationalState.i18n.value.running.label}}",
+                        "value": "Running",
                         "type": "active"
                     },
                     {
                         "key": "stopped",
-                        "value": "{{i18n.attributes.operationalState.i18n.value.stopped.label}}",
+                        "value": "Stopped",
+                        "type": "inactive"
+                    },
+                    {
+                        "key": "standby",
+                        "value": "Standby",
                         "type": "inactive"
                     },
                     {
                         "key": "paused",
-                        "value": "{{i18n.attributes.operationalState.i18n.value.paused.label}}",
+                        "value": "Paused",
+                        "type": "active"
+                    },
+                    {
+                        "key": "unableToStartOrResume",
+                        "value": "Couldn't start",
+                        "type": "active"
+                    },
+                    {
+                        "key": "unableToCompleteOperation",
+                        "value": "Couldn't complete",
+                        "type": "active"
+                    },
+                    {
+                        "key": "commandInvalidInCurrentState",
+                        "value": "Couldn't do action",
                         "type": "active"
                     }
                 ]
@@ -27,29 +47,29 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Status",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "start",
-                            "value": "{{i18n.commands.start.label}}",
+                            "value": "Start",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.stop.label}}",
+                            "value": "Stop",
                             "type": "inactive"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.commands.resume.label}}",
+                            "value": "Resume",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         }
                     ],
@@ -61,32 +81,37 @@
                     "alternatives": [
                         {
                             "key": "running",
-                            "value": "{{i18n.attributes.operationalState.i18n.value.running.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "stopped",
-                            "value": "{{i18n.attributes.operationalState.i18n.value.stopped.label}}",
+                            "value": "Stopped",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "standby",
+                            "value": "Standby",
                             "type": "inactive"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.operationalState.i18n.value.paused.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "unableToStartOrResume",
-                            "value": "{{i18n.attributes.operationalState.i18n.value.unableToStartOrResume.label}}",
+                            "value": "Couldn't start",
                             "type": "active"
                         },
                         {
                             "key": "unableToCompleteOperation",
-                            "value": "{{i18n.attributes.operationalState.i18n.value.unableToCompleteOperation.label}}",
+                            "value": "Couldn't complete",
                             "type": "active"
                         },
                         {
                             "key": "commandInvalidInCurrentState",
-                            "value": "{{i18n.attributes.operationalState.i18n.value.commandInvalidInCurrentState.label}}",
+                            "value": "Couldn't do action",
                             "type": "active"
                         }
                     ]
@@ -97,23 +122,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "running",
-                            "value": "{{i18n.attributes.operationalState.i18n.value.running.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "stopped",
-                            "value": "{{i18n.attributes.operationalState.i18n.value.stopped.label}}",
+                            "value": "Stopped",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "standby",
+                            "value": "Standby",
                             "type": "inactive"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.operationalState.i18n.value.paused.label}}",
+                            "value": "Paused",
+                            "type": "active"
+                        },
+                        {
+                            "key": "unableToStartOrResume",
+                            "value": "Couldn't start",
+                            "type": "active"
+                        },
+                        {
+                            "key": "unableToCompleteOperation",
+                            "value": "Couldn't complete",
+                            "type": "active"
+                        },
+                        {
+                            "key": "commandInvalidInCurrentState",
+                            "value": "Couldn't do action",
                             "type": "active"
                         }
                     ],
@@ -126,28 +171,28 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "start",
-                            "value": "{{i18n.commands.start.label}}",
+                            "value": "Start",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.stop.label}}",
+                            "value": "Stop",
                             "type": "inactive"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.commands.resume.label}}",
+                            "value": "Resume",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         }
                     ],
diff --git a/json/ovenMode.i18n.en.json b/json/ovenMode.i18n.en.json
index d519e59f..ac1d4084 100755
--- a/json/ovenMode.i18n.en.json
+++ b/json/ovenMode.i18n.en.json
@@ -170,12 +170,12 @@
                         "Broil": {
                             "label": "Broil"
                         },
-                        "Proof": {
-                            "label": "Proof"
-                        },
                         "warming": {
                             "label": "Warming"
                         },
+                        "Proof": {
+                            "label": "Proof"
+                        },
                         "ConvectionBroil": {
                             "label": "Convection Broil"
                         },
diff --git a/json/ovenMode.i18n.fr.json b/json/ovenMode.i18n.fr.json
index 1ff68f6b..27a9da79 100755
--- a/json/ovenMode.i18n.fr.json
+++ b/json/ovenMode.i18n.fr.json
@@ -170,12 +170,12 @@
                         "Broil": {
                             "label": "Broil"
                         },
-                        "Proof": {
-                            "label": "Proof"
-                        },
                         "warming": {
                             "label": "Réchauffage"
                         },
+                        "Proof": {
+                            "label": "Proof"
+                        },
                         "ConvectionBroil": {
                             "label": "Convection Broil"
                         },
diff --git a/json/ovenModePresentation.json b/json/ovenModePresentation.json
index 65ebdef2..3b2e197a 100755
--- a/json/ovenModePresentation.json
+++ b/json/ovenModePresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "heating",
-                        "value": "{{i18n.attributes.ovenMode.i18n.value.heating.label}}",
+                        "value": "Heating",
                         "type": "active"
                     },
                     {
                         "key": "grill",
-                        "value": "{{i18n.attributes.ovenMode.i18n.value.grill.label}}",
+                        "value": "Grill",
                         "type": "active"
                     },
                     {
                         "key": "warming",
-                        "value": "{{i18n.attributes.ovenMode.i18n.value.warming.label}}",
+                        "value": "Warming",
                         "type": "active"
                     },
                     {
                         "key": "defrosting",
-                        "value": "{{i18n.attributes.ovenMode.i18n.value.defrosting.label}}",
+                        "value": "Defrosting",
                         "type": "active"
                     }
                 ]
@@ -32,7 +32,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -40,22 +40,22 @@
                     "alternatives": [
                         {
                             "key": "heating",
-                            "value": "{{i18n.commands.setOvenMode.arguments.mode.i18n.heating.label}}",
+                            "value": "Heating",
                             "type": "active"
                         },
                         {
                             "key": "grill",
-                            "value": "{{i18n.commands.setOvenMode.arguments.mode.i18n.grill.label}}",
+                            "value": "Grill",
                             "type": "active"
                         },
                         {
                             "key": "warming",
-                            "value": "{{i18n.commands.setOvenMode.arguments.mode.i18n.warming.label}}",
+                            "value": "Warming",
                             "type": "active"
                         },
                         {
                             "key": "defrosting",
-                            "value": "{{i18n.commands.setOvenMode.arguments.mode.i18n.defrosting.label}}",
+                            "value": "Defrosting",
                             "type": "active"
                         }
                     ]
@@ -65,22 +65,22 @@
                     "alternatives": [
                         {
                             "key": "heating",
-                            "value": "{{i18n.attributes.ovenMode.i18n.value.heating.label}}",
+                            "value": "Heating",
                             "type": "active"
                         },
                         {
                             "key": "grill",
-                            "value": "{{i18n.attributes.ovenMode.i18n.value.grill.label}}",
+                            "value": "Grill",
                             "type": "active"
                         },
                         {
                             "key": "warming",
-                            "value": "{{i18n.attributes.ovenMode.i18n.value.warming.label}}",
+                            "value": "Warming",
                             "type": "active"
                         },
                         {
                             "key": "defrosting",
-                            "value": "{{i18n.attributes.ovenMode.i18n.value.defrosting.label}}",
+                            "value": "Defrosting",
                             "type": "active"
                         }
                     ]
@@ -91,28 +91,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "heating",
-                            "value": "{{i18n.attributes.ovenMode.i18n.value.heating.label}}",
+                            "value": "Heating",
                             "type": "active"
                         },
                         {
                             "key": "grill",
-                            "value": "{{i18n.attributes.ovenMode.i18n.value.grill.label}}",
+                            "value": "Grill",
                             "type": "active"
                         },
                         {
                             "key": "warming",
-                            "value": "{{i18n.attributes.ovenMode.i18n.value.warming.label}}",
+                            "value": "Warming",
                             "type": "active"
                         },
                         {
                             "key": "defrosting",
-                            "value": "{{i18n.attributes.ovenMode.i18n.value.defrosting.label}}",
+                            "value": "Defrosting",
                             "type": "active"
                         }
                     ],
@@ -123,28 +123,28 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "heating",
-                            "value": "{{i18n.commands.setOvenMode.arguments.mode.i18n.heating.label}}",
+                            "value": "Heating",
                             "type": "active"
                         },
                         {
                             "key": "grill",
-                            "value": "{{i18n.commands.setOvenMode.arguments.mode.i18n.grill.label}}",
+                            "value": "Grill",
                             "type": "active"
                         },
                         {
                             "key": "warming",
-                            "value": "{{i18n.commands.setOvenMode.arguments.mode.i18n.warming.label}}",
+                            "value": "Warming",
                             "type": "active"
                         },
                         {
                             "key": "defrosting",
-                            "value": "{{i18n.commands.setOvenMode.arguments.mode.i18n.defrosting.label}}",
+                            "value": "Defrosting",
                             "type": "active"
                         }
                     ],
diff --git a/json/ovenOperatingState.i18n.en.json b/json/ovenOperatingState.i18n.en.json
index 2dbe04d0..f106d8de 100755
--- a/json/ovenOperatingState.i18n.en.json
+++ b/json/ovenOperatingState.i18n.en.json
@@ -4,7 +4,7 @@
     "description": "Allows for the control of the oven operational state.",
     "attributes": {
         "completionTime": {
-            "label": "completion time",
+            "label": "Cook time",
             "description": "The completion time for the oven job",
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {}
diff --git a/json/ovenOperatingState.i18n.fr.json b/json/ovenOperatingState.i18n.fr.json
index 49fc047e..9d64571d 100755
--- a/json/ovenOperatingState.i18n.fr.json
+++ b/json/ovenOperatingState.i18n.fr.json
@@ -4,7 +4,7 @@
     "description": "Allows for the control of the oven operational state.",
     "attributes": {
         "completionTime": {
-            "label": "Heure de fin",
+            "label": "Temps de cuisson",
             "description": "The completion time for the oven job",
             "displayTemplate": "{{attribute}} de {{device.label}} était : {{value}}",
             "i18n": {}
diff --git a/json/ovenOperatingStatePresentation.json b/json/ovenOperatingStatePresentation.json
index d868ec50..e23b88eb 100755
--- a/json/ovenOperatingStatePresentation.json
+++ b/json/ovenOperatingStatePresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "cleaning",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.cleaning.label}}",
+                        "value": "Cleaning",
                         "type": "active"
                     },
                     {
                         "key": "cooking",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.cooking.label}}",
+                        "value": "Cooking",
                         "type": "active"
                     },
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.cooling.label}}",
+                        "value": "Cooling down",
                         "type": "active"
                     },
                     {
                         "key": "draining",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.draining.label}}",
+                        "value": "Draining",
                         "type": "active"
                     },
                     {
                         "key": "preheat",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.preheat.label}}",
+                        "value": "Preheating",
                         "type": "active"
                     },
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.ready.label}}",
-                        "type": "inactive"
+                        "value": "Ready",
+                        "type": "active"
                     },
                     {
                         "key": "rinsing",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.rinsing.label}}",
+                        "value": "Rinsing",
                         "type": "active"
                     }
                 ]
@@ -46,17 +46,17 @@
                 "alternatives": [
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.machineState.i18n.value.ready.label}}",
-                        "type": "inactive"
+                        "value": "Ready",
+                        "type": "active"
                     },
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.machineState.i18n.value.running.label}}",
+                        "value": "Running",
                         "type": "active"
                     },
                     {
                         "key": "paused",
-                        "value": "{{i18n.attributes.machineState.i18n.value.paused.label}}",
+                        "value": "Paused",
                         "type": "active"
                     }
                 ]
@@ -77,51 +77,51 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Oven",
             "displayType": "state",
             "state": {
                 "label": "{{ovenJobState.value}}",
                 "alternatives": [
                     {
                         "key": "cleaning",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.cleaning.label}}",
+                        "value": "Cleaning",
                         "type": "active"
                     },
                     {
                         "key": "cooking",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.cooking.label}}",
+                        "value": "Cooking",
                         "type": "active"
                     },
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.cooling.label}}",
+                        "value": "Cooling down",
                         "type": "active"
                     },
                     {
                         "key": "draining",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.draining.label}}",
+                        "value": "Draining",
                         "type": "active"
                     },
                     {
                         "key": "preheat",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.preheat.label}}",
+                        "value": "Preheating",
                         "type": "active"
                     },
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.ready.label}}",
-                        "type": "inactive"
+                        "value": "Ready",
+                        "type": "active"
                     },
                     {
                         "key": "rinsing",
-                        "value": "{{i18n.attributes.ovenJobState.i18n.value.rinsing.label}}",
+                        "value": "Rinsing",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.machineState.label}}",
+            "label": "Device status",
             "displayType": "list",
             "list": {
                 "command": {
@@ -129,7 +129,7 @@
                     "alternatives": [
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.stop.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.OVENOPERATINGSTATE_DEFAULT_COMMANDS_SETMACHINESTATE_STATE_STOP",
                             "type": "inactive"
                         }
                     ],
@@ -142,17 +142,17 @@
                     "alternatives": [
                         {
                             "key": "ready",
-                            "value": "{{i18n.attributes.machineState.i18n.value.ready.label}}",
-                            "type": "inactive"
+                            "value": "Ready",
+                            "type": "active"
                         },
                         {
                             "key": "running",
-                            "value": "{{i18n.attributes.machineState.i18n.value.running.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.machineState.i18n.value.paused.label}}",
+                            "value": "Paused",
                             "type": "active"
                         }
                     ]
@@ -160,7 +160,7 @@
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Cook time",
             "displayType": "state",
             "state": {
                 "label": "{{completionTime.value}}"
@@ -170,23 +170,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.machineState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "ready",
-                            "value": "{{i18n.attributes.machineState.i18n.value.ready.label}}",
-                            "type": "inactive"
+                            "value": "Ready",
+                            "type": "active"
                         },
                         {
                             "key": "running",
-                            "value": "{{i18n.attributes.machineState.i18n.value.running.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.machineState.i18n.value.paused.label}}",
+                            "value": "Paused",
                             "type": "active"
                         }
                     ],
@@ -196,43 +196,43 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.ovenJobState.label}}",
+                "label": "Oven",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "cleaning",
-                            "value": "{{i18n.attributes.ovenJobState.i18n.value.cleaning.label}}",
+                            "value": "Cleaning",
                             "type": "active"
                         },
                         {
                             "key": "cooking",
-                            "value": "{{i18n.attributes.ovenJobState.i18n.value.cooking.label}}",
+                            "value": "Cooking",
                             "type": "active"
                         },
                         {
                             "key": "cooling",
-                            "value": "{{i18n.attributes.ovenJobState.i18n.value.cooling.label}}",
+                            "value": "Cooling down",
                             "type": "active"
                         },
                         {
                             "key": "draining",
-                            "value": "{{i18n.attributes.ovenJobState.i18n.value.draining.label}}",
+                            "value": "Draining",
                             "type": "active"
                         },
                         {
                             "key": "preheat",
-                            "value": "{{i18n.attributes.ovenJobState.i18n.value.preheat.label}}",
+                            "value": "Preheating",
                             "type": "active"
                         },
                         {
                             "key": "ready",
-                            "value": "{{i18n.attributes.ovenJobState.i18n.value.ready.label}}",
-                            "type": "inactive"
+                            "value": "Ready",
+                            "type": "active"
                         },
                         {
                             "key": "rinsing",
-                            "value": "{{i18n.attributes.ovenJobState.i18n.value.rinsing.label}}",
+                            "value": "Rinsing",
                             "type": "active"
                         }
                     ],
@@ -244,13 +244,13 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.machineState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.stop.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.OVENOPERATINGSTATE_DEFAULT_COMMANDS_SETMACHINESTATE_STATE_STOP",
                             "type": "inactive"
                         }
                     ]
diff --git a/json/ovenSetpointPresentation.json b/json/ovenSetpointPresentation.json
index 66c6afc4..540dbb8b 100755
--- a/json/ovenSetpointPresentation.json
+++ b/json/ovenSetpointPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Oven temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -21,7 +21,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Oven temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setOvenSetpoint",
diff --git a/json/ozoneHealthConcernPresentation.json b/json/ozoneHealthConcernPresentation.json
index 44a12628..87cb3726 100755
--- a/json/ozoneHealthConcernPresentation.json
+++ b/json/ozoneHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Ozone level",
             "displayType": "state",
             "state": {
                 "label": "{{ozoneHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Ozone level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.ozoneHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/ozoneMeasurementPresentation.json b/json/ozoneMeasurementPresentation.json
index 69351d47..d33602df 100755
--- a/json/ozoneMeasurementPresentation.json
+++ b/json/ozoneMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Ozone",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Ozone",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "ozone.value",
diff --git a/json/pHMeasurementPresentation.json b/json/pHMeasurementPresentation.json
index c54f7fb2..6638cc0b 100755
--- a/json/pHMeasurementPresentation.json
+++ b/json/pHMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Acidity",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Acidity",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "pH.value",
diff --git a/json/panicAlarmPresentation.json b/json/panicAlarmPresentation.json
index 9d010d1e..23b0c54c 100755
--- a/json/panicAlarmPresentation.json
+++ b/json/panicAlarmPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "panic",
-                        "value": "{{i18n.attributes.panicAlarm.i18n.value.panic.label}}",
+                        "value": "Panic",
                         "type": "active"
                     },
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.panicAlarm.i18n.value.clear.label}}",
+                        "value": "Clear",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Panic alarm",
             "displayType": "state",
             "state": {
                 "label": "{{panicAlarm.value}}",
                 "alternatives": [
                     {
                         "key": "panic",
-                        "value": "{{i18n.attributes.panicAlarm.i18n.value.panic.label}}",
+                        "value": "Panic",
                         "type": "active"
                     },
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.panicAlarm.i18n.value.clear.label}}",
+                        "value": "Clear",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Panic alarm",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "panic",
-                            "value": "{{i18n.attributes.panicAlarm.i18n.value.panic.label}}",
+                            "value": "Panic",
                             "type": "active"
                         },
                         {
                             "key": "clear",
-                            "value": "{{i18n.attributes.panicAlarm.i18n.value.clear.label}}",
+                            "value": "Clear",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/pestControlPresentation.json b/json/pestControlPresentation.json
index 747a0567..11dc8f6d 100755
--- a/json/pestControlPresentation.json
+++ b/json/pestControlPresentation.json
@@ -6,27 +6,27 @@
                 "alternatives": [
                     {
                         "key": "idle",
-                        "value": "{{i18n.attributes.pestControl.i18n.value.idle.label}}",
+                        "value": "Trap unarmed",
                         "type": "active"
                     },
                     {
                         "key": "trapArmed",
-                        "value": "{{i18n.attributes.pestControl.i18n.value.trapArmed.label}}",
+                        "value": "Trap armed",
                         "type": "active"
                     },
                     {
                         "key": "trapRearmRequired",
-                        "value": "{{i18n.attributes.pestControl.i18n.value.trapRearmRequired.label}}",
+                        "value": "Trap rearm required",
                         "type": "active"
                     },
                     {
                         "key": "pestDetected",
-                        "value": "{{i18n.attributes.pestControl.i18n.value.pestDetected.label}}",
+                        "value": "Pest detected",
                         "type": "active"
                     },
                     {
                         "key": "pestExterminated",
-                        "value": "{{i18n.attributes.pestControl.i18n.value.pestExterminated.label}}",
+                        "value": "Pest exterminated",
                         "type": "active"
                     }
                 ]
@@ -37,34 +37,34 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Pest control",
             "displayType": "state",
             "state": {
                 "label": "{{pestControl.value}}",
                 "alternatives": [
                     {
                         "key": "idle",
-                        "value": "{{i18n.attributes.pestControl.i18n.value.idle.label}}",
+                        "value": "Trap unarmed",
                         "type": "active"
                     },
                     {
                         "key": "trapArmed",
-                        "value": "{{i18n.attributes.pestControl.i18n.value.trapArmed.label}}",
+                        "value": "Trap armed",
                         "type": "active"
                     },
                     {
                         "key": "trapRearmRequired",
-                        "value": "{{i18n.attributes.pestControl.i18n.value.trapRearmRequired.label}}",
+                        "value": "Trap rearm required",
                         "type": "active"
                     },
                     {
                         "key": "pestDetected",
-                        "value": "{{i18n.attributes.pestControl.i18n.value.pestDetected.label}}",
+                        "value": "Pest detected",
                         "type": "active"
                     },
                     {
                         "key": "pestExterminated",
-                        "value": "{{i18n.attributes.pestControl.i18n.value.pestExterminated.label}}",
+                        "value": "Pest exterminated",
                         "type": "active"
                     }
                 ]
@@ -74,33 +74,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Pest control",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "idle",
-                            "value": "{{i18n.attributes.pestControl.i18n.value.idle.label}}",
+                            "value": "Trap unarmed",
                             "type": "active"
                         },
                         {
                             "key": "trapArmed",
-                            "value": "{{i18n.attributes.pestControl.i18n.value.trapArmed.label}}",
+                            "value": "Trap armed",
                             "type": "active"
                         },
                         {
                             "key": "trapRearmRequired",
-                            "value": "{{i18n.attributes.pestControl.i18n.value.trapRearmRequired.label}}",
+                            "value": "Trap rearm required",
                             "type": "active"
                         },
                         {
                             "key": "pestDetected",
-                            "value": "{{i18n.attributes.pestControl.i18n.value.pestDetected.label}}",
+                            "value": "Pest detected",
                             "type": "active"
                         },
                         {
                             "key": "pestExterminated",
-                            "value": "{{i18n.attributes.pestControl.i18n.value.pestExterminated.label}}",
+                            "value": "Pest exterminated",
                             "type": "active"
                         }
                     ],
diff --git a/json/petActivity.i18n.en.json b/json/petActivity.i18n.en.json
index c1646568..fb165d1c 100644
--- a/json/petActivity.i18n.en.json
+++ b/json/petActivity.i18n.en.json
@@ -9,30 +9,15 @@
             "displayTemplate": "{{device.label}} {{attribute}} : {{value}}",
             "i18n": {
                 "value": {
-                    "running": {
-                        "label": "Pet is running"
-                    },
                     "resting": {
                         "label": "Pet is resting"
                     },
                     "idle": {
                         "label": "Pet activity is not found"
                     },
-                    "meowing": {
-                        "label": "Pet is meowing"
-                    },
-                    "pooping": {
-                        "label": "Pet is defecating"
-                    },
-                    "walking": {
-                        "label": "Pet is walking"
-                    },
                     "drinkingWater": {
                         "label": "Pet is drinking water"
                     },
-                    "playing": {
-                        "label": "Pet is playing"
-                    },
                     "barking": {
                         "label": "Pet is barking"
                     },
@@ -44,6 +29,24 @@
                     },
                     "peeing": {
                         "label": "Pet is urinating"
+                    },
+                    "running": {
+                        "label": "Pet is running"
+                    },
+                    "toileting": {
+                        "label": "Toileting"
+                    },
+                    "meowing": {
+                        "label": "Pet is meowing"
+                    },
+                    "pooping": {
+                        "label": "Pet is defecating"
+                    },
+                    "walking": {
+                        "label": "Pet is walking"
+                    },
+                    "playing": {
+                        "label": "Pet is playing"
                     }
                 }
             }
@@ -54,30 +57,15 @@
             "displayTemplate": "{{device.label}} {{attribute}} : {{value}}",
             "i18n": {
                 "value": {
-                    "running": {
-                        "label": "Running"
-                    },
                     "resting": {
                         "label": "Resting"
                     },
                     "idle": {
                         "label": "Standby"
                     },
-                    "pooping": {
-                        "label": "Toilet (solid waste)"
-                    },
-                    "walking": {
-                        "label": "Walking"
-                    },
-                    "meowing": {
-                        "label": "Meowing"
-                    },
                     "drinkingWater": {
                         "label": "Drinking"
                     },
-                    "playing": {
-                        "label": "Playing"
-                    },
                     "barking": {
                         "label": "Barking"
                     },
@@ -89,6 +77,24 @@
                     },
                     "peeing": {
                         "label": "Toilet (urine)"
+                    },
+                    "running": {
+                        "label": "Running"
+                    },
+                    "toileting": {
+                        "label": "Toilet"
+                    },
+                    "pooping": {
+                        "label": "Toilet (solid waste)"
+                    },
+                    "walking": {
+                        "label": "Walking"
+                    },
+                    "meowing": {
+                        "label": "Meowing"
+                    },
+                    "playing": {
+                        "label": "Playing"
                     }
                 }
             }
diff --git a/json/petActivity.i18n.fr.json b/json/petActivity.i18n.fr.json
index 344e9dd4..23c629e7 100644
--- a/json/petActivity.i18n.fr.json
+++ b/json/petActivity.i18n.fr.json
@@ -9,30 +9,15 @@
             "displayTemplate": "{{device.label}} {{attribute}} : {{value}}",
             "i18n": {
                 "value": {
-                    "running": {
-                        "label": "Pet is running"
-                    },
                     "resting": {
                         "label": "Pet is resting"
                     },
                     "idle": {
                         "label": "Pet activity is not found"
                     },
-                    "meowing": {
-                        "label": "Pet is meowing"
-                    },
-                    "pooping": {
-                        "label": "Pet is defecating"
-                    },
-                    "walking": {
-                        "label": "Pet is walking"
-                    },
                     "drinkingWater": {
                         "label": "Pet is drinking water"
                     },
-                    "playing": {
-                        "label": "Pet is playing"
-                    },
                     "barking": {
                         "label": "Pet is barking"
                     },
@@ -44,6 +29,24 @@
                     },
                     "peeing": {
                         "label": "Pet is urinating"
+                    },
+                    "running": {
+                        "label": "Pet is running"
+                    },
+                    "toileting": {
+                        "label": "Toileting"
+                    },
+                    "meowing": {
+                        "label": "Pet is meowing"
+                    },
+                    "pooping": {
+                        "label": "Pet is defecating"
+                    },
+                    "walking": {
+                        "label": "Pet is walking"
+                    },
+                    "playing": {
+                        "label": "Pet is playing"
                     }
                 }
             }
@@ -54,30 +57,15 @@
             "displayTemplate": "{{device.label}} {{attribute}} : {{value}}",
             "i18n": {
                 "value": {
-                    "running": {
-                        "label": "Course"
-                    },
                     "resting": {
                         "label": "Repos"
                     },
                     "idle": {
                         "label": "En veille"
                     },
-                    "pooping": {
-                        "label": "Toilettes (déchets solides)"
-                    },
-                    "walking": {
-                        "label": "Marche"
-                    },
-                    "meowing": {
-                        "label": "Miaulement"
-                    },
                     "drinkingWater": {
                         "label": "Hydratation"
                     },
-                    "playing": {
-                        "label": "Jeu"
-                    },
                     "barking": {
                         "label": "Aboiement"
                     },
@@ -89,6 +77,24 @@
                     },
                     "peeing": {
                         "label": "Toilettes (urine)"
+                    },
+                    "running": {
+                        "label": "Course"
+                    },
+                    "toileting": {
+                        "label": "Besoins"
+                    },
+                    "pooping": {
+                        "label": "Toilettes (déchets solides)"
+                    },
+                    "walking": {
+                        "label": "Marche"
+                    },
+                    "meowing": {
+                        "label": "Miaulement"
+                    },
+                    "playing": {
+                        "label": "Jeu"
                     }
                 }
             }
diff --git a/json/petActivityPresentation.json b/json/petActivityPresentation.json
index 1f8f99ff..66e785b4 100644
--- a/json/petActivityPresentation.json
+++ b/json/petActivityPresentation.json
@@ -6,62 +6,67 @@
                 "alternatives": [
                     {
                         "key": "idle",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.idle.label}}",
+                        "value": "Standby",
                         "type": "active"
                     },
                     {
                         "key": "eating",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.eating.label}}",
+                        "value": "Eating",
                         "type": "active"
                     },
                     {
                         "key": "pooping",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.pooping.label}}",
+                        "value": "Toilet (solid waste)",
                         "type": "active"
                     },
                     {
                         "key": "sleeping",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.sleeping.label}}",
+                        "value": "Sleeping",
                         "type": "active"
                     },
                     {
                         "key": "drinkingWater",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.drinkingWater.label}}",
+                        "value": "Drinking",
                         "type": "active"
                     },
                     {
                         "key": "peeing",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.peeing.label}}",
+                        "value": "Toilet (urine)",
                         "type": "active"
                     },
                     {
                         "key": "playing",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.playing.label}}",
+                        "value": "Playing",
                         "type": "active"
                     },
                     {
                         "key": "resting",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.resting.label}}",
+                        "value": "Resting",
                         "type": "active"
                     },
                     {
                         "key": "walking",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.walking.label}}",
+                        "value": "Walking",
                         "type": "active"
                     },
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.running.label}}",
+                        "value": "Running",
                         "type": "active"
                     },
                     {
                         "key": "barking",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.barking.label}}",
+                        "value": "Barking",
                         "type": "active"
                     },
                     {
                         "key": "meowing",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.meowing.label}}",
+                        "value": "Meowing",
+                        "type": "active"
+                    },
+                    {
+                        "key": "toileting",
+                        "value": "Toilet",
                         "type": "active"
                     }
                 ]
@@ -72,69 +77,74 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Pet activity",
             "displayType": "state",
             "state": {
                 "label": "{{petActivity.value}}",
                 "alternatives": [
                     {
                         "key": "idle",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.idle.label}}",
+                        "value": "Standby",
                         "type": "active"
                     },
                     {
                         "key": "eating",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.eating.label}}",
+                        "value": "Eating",
                         "type": "active"
                     },
                     {
                         "key": "pooping",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.pooping.label}}",
+                        "value": "Toilet (solid waste)",
                         "type": "active"
                     },
                     {
                         "key": "sleeping",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.sleeping.label}}",
+                        "value": "Sleeping",
                         "type": "active"
                     },
                     {
                         "key": "drinkingWater",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.drinkingWater.label}}",
+                        "value": "Drinking",
                         "type": "active"
                     },
                     {
                         "key": "peeing",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.peeing.label}}",
+                        "value": "Toilet (urine)",
                         "type": "active"
                     },
                     {
                         "key": "playing",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.playing.label}}",
+                        "value": "Playing",
                         "type": "active"
                     },
                     {
                         "key": "resting",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.resting.label}}",
+                        "value": "Resting",
                         "type": "active"
                     },
                     {
                         "key": "walking",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.walking.label}}",
+                        "value": "Walking",
                         "type": "active"
                     },
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.running.label}}",
+                        "value": "Running",
                         "type": "active"
                     },
                     {
                         "key": "barking",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.barking.label}}",
+                        "value": "Barking",
                         "type": "active"
                     },
                     {
                         "key": "meowing",
-                        "value": "{{i18n.attributes.petActivity.i18n.value.meowing.label}}",
+                        "value": "Meowing",
+                        "type": "active"
+                    },
+                    {
+                        "key": "toileting",
+                        "value": "Toilet",
                         "type": "active"
                     }
                 ]
@@ -144,68 +154,73 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Pet activity",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "idle",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.idle.label}}",
+                            "value": "Standby",
                             "type": "active"
                         },
                         {
                             "key": "eating",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.eating.label}}",
+                            "value": "Eating",
                             "type": "active"
                         },
                         {
                             "key": "pooping",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.pooping.label}}",
+                            "value": "Toilet (solid waste)",
                             "type": "active"
                         },
                         {
                             "key": "sleeping",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.sleeping.label}}",
+                            "value": "Sleeping",
                             "type": "active"
                         },
                         {
                             "key": "drinkingWater",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.drinkingWater.label}}",
+                            "value": "Drinking",
                             "type": "active"
                         },
                         {
                             "key": "peeing",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.peeing.label}}",
+                            "value": "Toilet (urine)",
                             "type": "active"
                         },
                         {
                             "key": "playing",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.playing.label}}",
+                            "value": "Playing",
                             "type": "active"
                         },
                         {
                             "key": "resting",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.resting.label}}",
+                            "value": "Resting",
                             "type": "active"
                         },
                         {
                             "key": "walking",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.walking.label}}",
+                            "value": "Walking",
                             "type": "active"
                         },
                         {
                             "key": "running",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.running.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "barking",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.barking.label}}",
+                            "value": "Barking",
                             "type": "active"
                         },
                         {
                             "key": "meowing",
-                            "value": "{{i18n.attributes.petActivity.i18n.value.meowing.label}}",
+                            "value": "Meowing",
+                            "type": "active"
+                        },
+                        {
+                            "key": "toileting",
+                            "value": "Toilet",
                             "type": "active"
                         }
                     ],
diff --git a/json/plantCultivation.i18n.en.json b/json/plantCultivation.i18n.en.json
new file mode 100644
index 00000000..4d039833
--- /dev/null
+++ b/json/plantCultivation.i18n.en.json
@@ -0,0 +1,321 @@
+{
+    "tag": "en",
+    "label": "Plant type",
+    "attributes": {
+        "supportedPlantType": {
+            "label": "Supported plant types",
+            "description": "The list of plant types this device can support",
+            "displayTemplate": "{{device.label}} supports {{value}}",
+            "i18n": {}
+        },
+        "supportedCommands": {
+            "label": "Supported commands",
+            "description": "List of commands this device supports",
+            "displayTemplate": "{{device.label}} supports the following commands: {{value}}",
+            "i18n": {}
+        },
+        "startTime": {
+            "label": "Planting days",
+            "description": "The date cultivation began",
+            "displayTemplate": "{{device.label}} started growing at {{value}}",
+            "i18n": {}
+        },
+        "plantType": {
+            "label": "Plant type",
+            "description": "The currently selected plant type for cultivation",
+            "displayTemplate": "{{device.label}} is growing {{value}}",
+            "i18n": {
+                "value": {
+                    "pepper": {
+                        "label": "Pepper"
+                    },
+                    "philodendron": {
+                        "label": "Philodendron"
+                    },
+                    "catnip": {
+                        "label": "Catnip"
+                    },
+                    "rucola": {
+                        "label": "Arugula"
+                    },
+                    "cilantro": {
+                        "label": "Cilantro"
+                    },
+                    "newGreen": {
+                        "label": "New green"
+                    },
+                    "lemonBalm": {
+                        "label": "Lemon balm"
+                    },
+                    "burningBushSpindletree": {
+                        "label": "Burning bush"
+                    },
+                    "redVeinedSorrel": {
+                        "label": "Red veined sorrel"
+                    },
+                    "none": {
+                        "label": "None"
+                    },
+                    "pakchoi": {
+                        "label": "Bok choy"
+                    },
+                    "endive": {
+                        "label": "Endive"
+                    },
+                    "tatsoi_vitamin": {
+                        "label": "Tatsoi"
+                    },
+                    "thyme": {
+                        "label": "Thyme"
+                    },
+                    "thaiBasil": {
+                        "label": "Thai basil"
+                    },
+                    "cherryTomato": {
+                        "label": "Cherry tomato"
+                    },
+                    "lettuce_multiGreen": {
+                        "label": "Multigreen lettuce"
+                    },
+                    "mint": {
+                        "label": "Mint"
+                    },
+                    "lettuce_caesarsGreen": {
+                        "label": "Caesar's green lettuce"
+                    },
+                    "parsley": {
+                        "label": "Parsley"
+                    },
+                    "lettuce_miniRomaine": {
+                        "label": "Mini romaine lettuce"
+                    },
+                    "garlicChives": {
+                        "label": "Garlic chives"
+                    },
+                    "leafRedChicory": {
+                        "label": "Red leaf chicory"
+                    },
+                    "sage": {
+                        "label": "Sage"
+                    },
+                    "parsley_italian": {
+                        "label": "Italian parsley"
+                    },
+                    "lolloBionda_Bartimer": {
+                        "label": "Bartimer lettuce"
+                    },
+                    "collardLeafKale": {
+                        "label": "Collard greens"
+                    },
+                    "eggplant": {
+                        "label": "Aubergine"
+                    },
+                    "leafMustard": {
+                        "label": "Leaf mustard"
+                    },
+                    "basil": {
+                        "label": "Basil"
+                    },
+                    "lettuce_jeokOak": {
+                        "label": "Korean red lettuce"
+                    },
+                    "napaCabbage": {
+                        "label": "Napa cabbage"
+                    },
+                    "strawberry": {
+                        "label": "Strawberry"
+                    },
+                    "dill": {
+                        "label": "Dill"
+                    },
+                    "peperomia": {
+                        "label": "Peperomia"
+                    },
+                    "sansevieria": {
+                        "label": "Snake plant"
+                    },
+                    "lettuce": {
+                        "label": "Lettuce"
+                    },
+                    "rosemary": {
+                        "label": "Rosemary"
+                    },
+                    "paprika": {
+                        "label": "Paprika"
+                    },
+                    "monstera": {
+                        "label": "Monstera"
+                    },
+                    "peppermint": {
+                        "label": "Peppermint"
+                    },
+                    "appleMint": {
+                        "label": "Apple mint"
+                    },
+                    "UNKNOWN": {
+                        "label": "Unknown"
+                    },
+                    "garlandChrysanthemum": {
+                        "label": "Garland chrysanthemum"
+                    },
+                    "peaceLily": {
+                        "label": "Peace lily"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "resetStartTime": {
+            "label": "Add planting date",
+            "description": "Reset the cultivation start date",
+            "arguments": {}
+        },
+        "setPlantType": {
+            "label": "Set plant type",
+            "description": "Select a plant type to grow",
+            "arguments": {
+                "plantType": {
+                    "i18n": {
+                        "pepper": {
+                            "label": "Pepper"
+                        },
+                        "philodendron": {
+                            "label": "Philodendron"
+                        },
+                        "catnip": {
+                            "label": "Catnip"
+                        },
+                        "rucola": {
+                            "label": "Arugula"
+                        },
+                        "lettuce miniromaine": {
+                            "label": "Mini romaine lettuce"
+                        },
+                        "parsley italian": {
+                            "label": "Italian parsley"
+                        },
+                        "newGreen": {
+                            "label": "New green"
+                        },
+                        "cilantro": {
+                            "label": "Cilantro"
+                        },
+                        "lemonBalm": {
+                            "label": "Lemon balm"
+                        },
+                        "redVeinedSorrel": {
+                            "label": "Red veined sorrel"
+                        },
+                        "burningBushSpindletree": {
+                            "label": "Burning bush"
+                        },
+                        "pakchoi": {
+                            "label": "Bok choy"
+                        },
+                        "none": {
+                            "label": "None"
+                        },
+                        "endive": {
+                            "label": "Endive"
+                        },
+                        "thyme": {
+                            "label": "Thyme"
+                        },
+                        "thaiBasil": {
+                            "label": "Thai basil"
+                        },
+                        "cherryTomato": {
+                            "label": "Cherry tomato"
+                        },
+                        "lettuce caesarsgreen": {
+                            "label": "Caesar's green lettuce"
+                        },
+                        "mint": {
+                            "label": "Mint"
+                        },
+                        "parsley": {
+                            "label": "Parsley"
+                        },
+                        "tatsoi vitamin": {
+                            "label": "Tatsoi"
+                        },
+                        "garlicChives": {
+                            "label": "Garlic chives"
+                        },
+                        "leafRedChicory": {
+                            "label": "Red leaf chicory"
+                        },
+                        "lollobionda bartimer": {
+                            "label": "Bartimer lettuce"
+                        },
+                        "sage": {
+                            "label": "Sage"
+                        },
+                        "eggplant": {
+                            "label": "Aubergine"
+                        },
+                        "collardLeafKale": {
+                            "label": "Collard greens"
+                        },
+                        "leafMustard": {
+                            "label": "Leaf mustard"
+                        },
+                        "basil": {
+                            "label": "Basil"
+                        },
+                        "napaCabbage": {
+                            "label": "Napa cabbage"
+                        },
+                        "strawberry": {
+                            "label": "Strawberry"
+                        },
+                        "dill": {
+                            "label": "Dill"
+                        },
+                        "peperomia": {
+                            "label": "Peperomia"
+                        },
+                        "sansevieria": {
+                            "label": "Snake plant"
+                        },
+                        "lettuce": {
+                            "label": "Lettuce"
+                        },
+                        "paprika": {
+                            "label": "Paprika"
+                        },
+                        "rosemary": {
+                            "label": "Rosemary"
+                        },
+                        "monstera": {
+                            "label": "Monstera"
+                        },
+                        "peppermint": {
+                            "label": "Peppermint"
+                        },
+                        "appleMint": {
+                            "label": "Apple mint"
+                        },
+                        "lettuce multigreen": {
+                            "label": "Multigreen lettuce"
+                        },
+                        "UNKNOWN": {
+                            "label": "Unknown"
+                        },
+                        "garlandChrysanthemum": {
+                            "label": "Garland chrysanthemum"
+                        },
+                        "lettuce jeokoak": {
+                            "label": "Korean red lettuce"
+                        },
+                        "peaceLily": {
+                            "label": "Peace lily"
+                        }
+                    },
+                    "description": "A plant type"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/plantCultivation.i18n.fr.json b/json/plantCultivation.i18n.fr.json
new file mode 100644
index 00000000..827996bd
--- /dev/null
+++ b/json/plantCultivation.i18n.fr.json
@@ -0,0 +1,321 @@
+{
+    "tag": "fr",
+    "label": "Type de plante",
+    "attributes": {
+        "supportedPlantType": {
+            "label": "Supported plant types",
+            "description": "The list of plant types this device can support",
+            "displayTemplate": "{{device.label}} supports {{value}}",
+            "i18n": {}
+        },
+        "supportedCommands": {
+            "label": "Supported commands",
+            "description": "List of commands this device supports",
+            "displayTemplate": "{{device.label}} supports the following commands: {{value}}",
+            "i18n": {}
+        },
+        "startTime": {
+            "label": "Jours de plantation",
+            "description": "The date cultivation began",
+            "displayTemplate": "{{device.label}} started growing at {{value}}",
+            "i18n": {}
+        },
+        "plantType": {
+            "label": "Type de plante",
+            "description": "The currently selected plant type for cultivation",
+            "displayTemplate": "{{device.label}} is growing {{value}}",
+            "i18n": {
+                "value": {
+                    "pepper": {
+                        "label": "Poivre"
+                    },
+                    "philodendron": {
+                        "label": "Philodendron"
+                    },
+                    "catnip": {
+                        "label": "Cataire"
+                    },
+                    "rucola": {
+                        "label": "Roquette"
+                    },
+                    "cilantro": {
+                        "label": "Coriandre"
+                    },
+                    "newGreen": {
+                        "label": "Jeunes pousses"
+                    },
+                    "lemonBalm": {
+                        "label": "Mélisse"
+                    },
+                    "burningBushSpindletree": {
+                        "label": "Buisson ardent"
+                    },
+                    "redVeinedSorrel": {
+                        "label": "Oseille à veines rouges"
+                    },
+                    "none": {
+                        "label": "Aucun(e)"
+                    },
+                    "pakchoi": {
+                        "label": "Bok choy"
+                    },
+                    "endive": {
+                        "label": "Endive"
+                    },
+                    "tatsoi_vitamin": {
+                        "label": "Tatsoi"
+                    },
+                    "thyme": {
+                        "label": "Thym"
+                    },
+                    "thaiBasil": {
+                        "label": "Basilic thaï"
+                    },
+                    "cherryTomato": {
+                        "label": "Tomate cerise"
+                    },
+                    "lettuce_multiGreen": {
+                        "label": "Laitue multifeuille"
+                    },
+                    "mint": {
+                        "label": "Menthe"
+                    },
+                    "lettuce_caesarsGreen": {
+                        "label": "Laitue verte César"
+                    },
+                    "parsley": {
+                        "label": "Persil"
+                    },
+                    "lettuce_miniRomaine": {
+                        "label": "Mini laitue romaine"
+                    },
+                    "garlicChives": {
+                        "label": "Ciboule"
+                    },
+                    "leafRedChicory": {
+                        "label": "Chicorée à feuilles rouges"
+                    },
+                    "sage": {
+                        "label": "Sauge"
+                    },
+                    "parsley_italian": {
+                        "label": "Persil italien"
+                    },
+                    "lolloBionda_Bartimer": {
+                        "label": "Laitue lollo verte"
+                    },
+                    "collardLeafKale": {
+                        "label": "Feuilles de chou vert"
+                    },
+                    "eggplant": {
+                        "label": "Aubergine"
+                    },
+                    "leafMustard": {
+                        "label": "Moutarde brune"
+                    },
+                    "basil": {
+                        "label": "Basilic"
+                    },
+                    "lettuce_jeokOak": {
+                        "label": "Laitue rouge coréenne"
+                    },
+                    "napaCabbage": {
+                        "label": "Chou chinois"
+                    },
+                    "strawberry": {
+                        "label": "Fraise"
+                    },
+                    "dill": {
+                        "label": "Aneth"
+                    },
+                    "peperomia": {
+                        "label": "Pépéromie"
+                    },
+                    "sansevieria": {
+                        "label": "Langue de belle-mère"
+                    },
+                    "lettuce": {
+                        "label": "Laitue"
+                    },
+                    "rosemary": {
+                        "label": "Romarin"
+                    },
+                    "paprika": {
+                        "label": "Paprika"
+                    },
+                    "monstera": {
+                        "label": "Monstera"
+                    },
+                    "peppermint": {
+                        "label": "Menthe poivrée"
+                    },
+                    "appleMint": {
+                        "label": "Menthe à feuilles rondes"
+                    },
+                    "UNKNOWN": {
+                        "label": "Inconnu"
+                    },
+                    "garlandChrysanthemum": {
+                        "label": "Chrysanthème de guirlande"
+                    },
+                    "peaceLily": {
+                        "label": "Lys de la paix"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "resetStartTime": {
+            "label": "Ajouter date plantation",
+            "description": "Reset the cultivation start date",
+            "arguments": {}
+        },
+        "setPlantType": {
+            "label": "Set plant type",
+            "description": "Select a plant type to grow",
+            "arguments": {
+                "plantType": {
+                    "i18n": {
+                        "pepper": {
+                            "label": "Poivre"
+                        },
+                        "philodendron": {
+                            "label": "Philodendron"
+                        },
+                        "catnip": {
+                            "label": "Cataire"
+                        },
+                        "rucola": {
+                            "label": "Roquette"
+                        },
+                        "lettuce miniromaine": {
+                            "label": "Mini laitue romaine"
+                        },
+                        "parsley italian": {
+                            "label": "Persil italien"
+                        },
+                        "newGreen": {
+                            "label": "Jeunes pousses"
+                        },
+                        "cilantro": {
+                            "label": "Coriandre"
+                        },
+                        "lemonBalm": {
+                            "label": "Mélisse"
+                        },
+                        "redVeinedSorrel": {
+                            "label": "Oseille à veines rouges"
+                        },
+                        "burningBushSpindletree": {
+                            "label": "Buisson ardent"
+                        },
+                        "pakchoi": {
+                            "label": "Bok choy"
+                        },
+                        "none": {
+                            "label": "Aucun(e)"
+                        },
+                        "endive": {
+                            "label": "Endive"
+                        },
+                        "thyme": {
+                            "label": "Thym"
+                        },
+                        "thaiBasil": {
+                            "label": "Basilic thaï"
+                        },
+                        "cherryTomato": {
+                            "label": "Tomate cerise"
+                        },
+                        "lettuce caesarsgreen": {
+                            "label": "Laitue verte César"
+                        },
+                        "mint": {
+                            "label": "Menthe"
+                        },
+                        "parsley": {
+                            "label": "Persil"
+                        },
+                        "tatsoi vitamin": {
+                            "label": "Tatsoi"
+                        },
+                        "garlicChives": {
+                            "label": "Ciboule"
+                        },
+                        "leafRedChicory": {
+                            "label": "Chicorée à feuilles rouges"
+                        },
+                        "lollobionda bartimer": {
+                            "label": "Laitue lollo verte"
+                        },
+                        "sage": {
+                            "label": "Sauge"
+                        },
+                        "eggplant": {
+                            "label": "Aubergine"
+                        },
+                        "collardLeafKale": {
+                            "label": "Feuilles de chou vert"
+                        },
+                        "leafMustard": {
+                            "label": "Moutarde brune"
+                        },
+                        "basil": {
+                            "label": "Basilic"
+                        },
+                        "napaCabbage": {
+                            "label": "Chou chinois"
+                        },
+                        "strawberry": {
+                            "label": "Fraise"
+                        },
+                        "dill": {
+                            "label": "Aneth"
+                        },
+                        "peperomia": {
+                            "label": "Pépéromie"
+                        },
+                        "sansevieria": {
+                            "label": "Langue de belle-mère"
+                        },
+                        "lettuce": {
+                            "label": "Laitue"
+                        },
+                        "paprika": {
+                            "label": "Paprika"
+                        },
+                        "rosemary": {
+                            "label": "Romarin"
+                        },
+                        "monstera": {
+                            "label": "Monstera"
+                        },
+                        "peppermint": {
+                            "label": "Menthe poivrée"
+                        },
+                        "appleMint": {
+                            "label": "Menthe à feuilles rondes"
+                        },
+                        "lettuce multigreen": {
+                            "label": "Laitue multifeuille"
+                        },
+                        "UNKNOWN": {
+                            "label": "Inconnu"
+                        },
+                        "garlandChrysanthemum": {
+                            "label": "Chrysanthème de guirlande"
+                        },
+                        "lettuce jeokoak": {
+                            "label": "Laitue rouge coréenne"
+                        },
+                        "peaceLily": {
+                            "label": "Lys de la paix"
+                        }
+                    },
+                    "description": "A plant type"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/plantCultivationPresentation.json b/json/plantCultivationPresentation.json
new file mode 100644
index 00000000..e7df3057
--- /dev/null
+++ b/json/plantCultivationPresentation.json
@@ -0,0 +1,967 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{plantType.value}}",
+                "alternatives": [
+                    {
+                        "key": "none",
+                        "value": "None",
+                        "type": "active"
+                    },
+                    {
+                        "key": "lettuce_caesarsGreen",
+                        "value": "Caesar's green lettuce",
+                        "type": "active"
+                    },
+                    {
+                        "key": "lettuce_jeokOak",
+                        "value": "Korean red lettuce",
+                        "type": "active"
+                    },
+                    {
+                        "key": "tatsoi_vitamin",
+                        "value": "Tatsoi",
+                        "type": "active"
+                    },
+                    {
+                        "key": "collardLeafKale",
+                        "value": "Collard greens",
+                        "type": "active"
+                    },
+                    {
+                        "key": "leafRedChicory",
+                        "value": "Red leaf chicory",
+                        "type": "active"
+                    },
+                    {
+                        "key": "garlandChrysanthemum",
+                        "value": "Garland chrysanthemum",
+                        "type": "active"
+                    },
+                    {
+                        "key": "pakchoi",
+                        "value": "Bok choy",
+                        "type": "active"
+                    },
+                    {
+                        "key": "leafMustard",
+                        "value": "Leaf mustard",
+                        "type": "active"
+                    },
+                    {
+                        "key": "basil",
+                        "value": "Basil",
+                        "type": "active"
+                    },
+                    {
+                        "key": "rucola",
+                        "value": "Arugula",
+                        "type": "active"
+                    },
+                    {
+                        "key": "cilantro",
+                        "value": "Cilantro",
+                        "type": "active"
+                    },
+                    {
+                        "key": "dill",
+                        "value": "Dill",
+                        "type": "active"
+                    },
+                    {
+                        "key": "thyme",
+                        "value": "Thyme",
+                        "type": "active"
+                    },
+                    {
+                        "key": "lemonBalm",
+                        "value": "Lemon balm",
+                        "type": "active"
+                    },
+                    {
+                        "key": "catnip",
+                        "value": "Catnip",
+                        "type": "active"
+                    },
+                    {
+                        "key": "endive",
+                        "value": "Endive",
+                        "type": "active"
+                    },
+                    {
+                        "key": "lettuce_multiGreen",
+                        "value": "Multigreen lettuce",
+                        "type": "active"
+                    },
+                    {
+                        "key": "napaCabbage",
+                        "value": "Napa cabbage",
+                        "type": "active"
+                    },
+                    {
+                        "key": "appleMint",
+                        "value": "Apple mint",
+                        "type": "active"
+                    },
+                    {
+                        "key": "thaiBasil",
+                        "value": "Thai basil",
+                        "type": "active"
+                    },
+                    {
+                        "key": "peppermint",
+                        "value": "Peppermint",
+                        "type": "active"
+                    },
+                    {
+                        "key": "burningBushSpindletree",
+                        "value": "Burning bush",
+                        "type": "active"
+                    },
+                    {
+                        "key": "lolloBionda_Bartimer",
+                        "value": "Bartimer lettuce",
+                        "type": "active"
+                    },
+                    {
+                        "key": "lettuce_miniRomaine",
+                        "value": "Mini romaine lettuce",
+                        "type": "active"
+                    },
+                    {
+                        "key": "newGreen",
+                        "value": "New green",
+                        "type": "active"
+                    },
+                    {
+                        "key": "redVeinedSorrel",
+                        "value": "Red veined sorrel",
+                        "type": "active"
+                    },
+                    {
+                        "key": "sage",
+                        "value": "Sage",
+                        "type": "active"
+                    },
+                    {
+                        "key": "eggplant",
+                        "value": "Aubergine",
+                        "type": "active"
+                    },
+                    {
+                        "key": "pepper",
+                        "value": "Pepper",
+                        "type": "active"
+                    },
+                    {
+                        "key": "strawberry",
+                        "value": "Strawberry",
+                        "type": "active"
+                    },
+                    {
+                        "key": "rosemary",
+                        "value": "Rosemary",
+                        "type": "active"
+                    },
+                    {
+                        "key": "monstera",
+                        "value": "Monstera",
+                        "type": "active"
+                    },
+                    {
+                        "key": "mint",
+                        "value": "Mint",
+                        "type": "active"
+                    },
+                    {
+                        "key": "cherryTomato",
+                        "value": "Cherry tomato",
+                        "type": "active"
+                    },
+                    {
+                        "key": "garlicChives",
+                        "value": "Garlic chives",
+                        "type": "active"
+                    },
+                    {
+                        "key": "sansevieria",
+                        "value": "Snake plant",
+                        "type": "active"
+                    },
+                    {
+                        "key": "lettuce",
+                        "value": "Lettuce",
+                        "type": "active"
+                    },
+                    {
+                        "key": "peaceLily",
+                        "value": "Peace lily",
+                        "type": "active"
+                    },
+                    {
+                        "key": "parsley",
+                        "value": "Parsley",
+                        "type": "active"
+                    },
+                    {
+                        "key": "paprika",
+                        "value": "Paprika",
+                        "type": "active"
+                    },
+                    {
+                        "key": "peperomia",
+                        "value": "Peperomia",
+                        "type": "active"
+                    },
+                    {
+                        "key": "philodendron",
+                        "value": "Philodendron",
+                        "type": "active"
+                    },
+                    {
+                        "key": "parsley_italian",
+                        "value": "Italian parsley",
+                        "type": "active"
+                    },
+                    {
+                        "key": "UNKNOWN",
+                        "value": "Unknown",
+                        "type": "active"
+                    }
+                ]
+            }
+        ],
+        "actions": [],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "Plant type",
+            "displayType": "list",
+            "list": {
+                "command": {
+                    "name": "setPlantType",
+                    "alternatives": [
+                        {
+                            "key": "none",
+                            "value": "None",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_caesarsGreen",
+                            "value": "Caesar's green lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_jeokOak",
+                            "value": "Korean red lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "tatsoi_vitamin",
+                            "value": "Tatsoi",
+                            "type": "active"
+                        },
+                        {
+                            "key": "collardLeafKale",
+                            "value": "Collard greens",
+                            "type": "active"
+                        },
+                        {
+                            "key": "leafRedChicory",
+                            "value": "Red leaf chicory",
+                            "type": "active"
+                        },
+                        {
+                            "key": "garlandChrysanthemum",
+                            "value": "Garland chrysanthemum",
+                            "type": "active"
+                        },
+                        {
+                            "key": "pakchoi",
+                            "value": "Bok choy",
+                            "type": "active"
+                        },
+                        {
+                            "key": "leafMustard",
+                            "value": "Leaf mustard",
+                            "type": "active"
+                        },
+                        {
+                            "key": "basil",
+                            "value": "Basil",
+                            "type": "active"
+                        },
+                        {
+                            "key": "rucola",
+                            "value": "Arugula",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cilantro",
+                            "value": "Cilantro",
+                            "type": "active"
+                        },
+                        {
+                            "key": "dill",
+                            "value": "Dill",
+                            "type": "active"
+                        },
+                        {
+                            "key": "thyme",
+                            "value": "Thyme",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lemonBalm",
+                            "value": "Lemon balm",
+                            "type": "active"
+                        },
+                        {
+                            "key": "catnip",
+                            "value": "Catnip",
+                            "type": "active"
+                        },
+                        {
+                            "key": "endive",
+                            "value": "Endive",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_multiGreen",
+                            "value": "Multigreen lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "napaCabbage",
+                            "value": "Napa cabbage",
+                            "type": "active"
+                        },
+                        {
+                            "key": "appleMint",
+                            "value": "Apple mint",
+                            "type": "active"
+                        },
+                        {
+                            "key": "thaiBasil",
+                            "value": "Thai basil",
+                            "type": "active"
+                        },
+                        {
+                            "key": "peppermint",
+                            "value": "Peppermint",
+                            "type": "active"
+                        },
+                        {
+                            "key": "burningBushSpindletree",
+                            "value": "Burning bush",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lolloBionda_Bartimer",
+                            "value": "Bartimer lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_miniRomaine",
+                            "value": "Mini romaine lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "newGreen",
+                            "value": "New green",
+                            "type": "active"
+                        },
+                        {
+                            "key": "redVeinedSorrel",
+                            "value": "Red veined sorrel",
+                            "type": "active"
+                        },
+                        {
+                            "key": "sage",
+                            "value": "Sage",
+                            "type": "active"
+                        },
+                        {
+                            "key": "eggplant",
+                            "value": "Aubergine",
+                            "type": "active"
+                        },
+                        {
+                            "key": "pepper",
+                            "value": "Pepper",
+                            "type": "active"
+                        },
+                        {
+                            "key": "strawberry",
+                            "value": "Strawberry",
+                            "type": "active"
+                        },
+                        {
+                            "key": "rosemary",
+                            "value": "Rosemary",
+                            "type": "active"
+                        },
+                        {
+                            "key": "monstera",
+                            "value": "Monstera",
+                            "type": "active"
+                        },
+                        {
+                            "key": "mint",
+                            "value": "Mint",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cherryTomato",
+                            "value": "Cherry tomato",
+                            "type": "active"
+                        },
+                        {
+                            "key": "garlicChives",
+                            "value": "Garlic chives",
+                            "type": "active"
+                        },
+                        {
+                            "key": "sansevieria",
+                            "value": "Snake plant",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce",
+                            "value": "Lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "peaceLily",
+                            "value": "Peace lily",
+                            "type": "active"
+                        },
+                        {
+                            "key": "parsley",
+                            "value": "Parsley",
+                            "type": "active"
+                        },
+                        {
+                            "key": "paprika",
+                            "value": "Paprika",
+                            "type": "active"
+                        },
+                        {
+                            "key": "peperomia",
+                            "value": "Peperomia",
+                            "type": "active"
+                        },
+                        {
+                            "key": "philodendron",
+                            "value": "Philodendron",
+                            "type": "active"
+                        },
+                        {
+                            "key": "parsley_italian",
+                            "value": "Italian parsley",
+                            "type": "active"
+                        },
+                        {
+                            "key": "UNKNOWN",
+                            "value": "Unknown",
+                            "type": "active"
+                        }
+                    ],
+                    "argumentType": "string",
+                    "supportedValues": "supportedPlantType.value"
+                },
+                "state": {
+                    "value": "plantType.value",
+                    "valueType": "string",
+                    "alternatives": [
+                        {
+                            "key": "none",
+                            "value": "None",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_caesarsGreen",
+                            "value": "Caesar's green lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_jeokOak",
+                            "value": "Korean red lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "tatsoi_vitamin",
+                            "value": "Tatsoi",
+                            "type": "active"
+                        },
+                        {
+                            "key": "collardLeafKale",
+                            "value": "Collard greens",
+                            "type": "active"
+                        },
+                        {
+                            "key": "leafRedChicory",
+                            "value": "Red leaf chicory",
+                            "type": "active"
+                        },
+                        {
+                            "key": "garlandChrysanthemum",
+                            "value": "Garland chrysanthemum",
+                            "type": "active"
+                        },
+                        {
+                            "key": "pakchoi",
+                            "value": "Bok choy",
+                            "type": "active"
+                        },
+                        {
+                            "key": "leafMustard",
+                            "value": "Leaf mustard",
+                            "type": "active"
+                        },
+                        {
+                            "key": "basil",
+                            "value": "Basil",
+                            "type": "active"
+                        },
+                        {
+                            "key": "rucola",
+                            "value": "Arugula",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cilantro",
+                            "value": "Cilantro",
+                            "type": "active"
+                        },
+                        {
+                            "key": "dill",
+                            "value": "Dill",
+                            "type": "active"
+                        },
+                        {
+                            "key": "thyme",
+                            "value": "Thyme",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lemonBalm",
+                            "value": "Lemon balm",
+                            "type": "active"
+                        },
+                        {
+                            "key": "catnip",
+                            "value": "Catnip",
+                            "type": "active"
+                        },
+                        {
+                            "key": "endive",
+                            "value": "Endive",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_multiGreen",
+                            "value": "Multigreen lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "napaCabbage",
+                            "value": "Napa cabbage",
+                            "type": "active"
+                        },
+                        {
+                            "key": "appleMint",
+                            "value": "Apple mint",
+                            "type": "active"
+                        },
+                        {
+                            "key": "thaiBasil",
+                            "value": "Thai basil",
+                            "type": "active"
+                        },
+                        {
+                            "key": "peppermint",
+                            "value": "Peppermint",
+                            "type": "active"
+                        },
+                        {
+                            "key": "burningBushSpindletree",
+                            "value": "Burning bush",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lolloBionda_Bartimer",
+                            "value": "Bartimer lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_miniRomaine",
+                            "value": "Mini romaine lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "newGreen",
+                            "value": "New green",
+                            "type": "active"
+                        },
+                        {
+                            "key": "redVeinedSorrel",
+                            "value": "Red veined sorrel",
+                            "type": "active"
+                        },
+                        {
+                            "key": "sage",
+                            "value": "Sage",
+                            "type": "active"
+                        },
+                        {
+                            "key": "eggplant",
+                            "value": "Aubergine",
+                            "type": "active"
+                        },
+                        {
+                            "key": "pepper",
+                            "value": "Pepper",
+                            "type": "active"
+                        },
+                        {
+                            "key": "strawberry",
+                            "value": "Strawberry",
+                            "type": "active"
+                        },
+                        {
+                            "key": "rosemary",
+                            "value": "Rosemary",
+                            "type": "active"
+                        },
+                        {
+                            "key": "monstera",
+                            "value": "Monstera",
+                            "type": "active"
+                        },
+                        {
+                            "key": "mint",
+                            "value": "Mint",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cherryTomato",
+                            "value": "Cherry tomato",
+                            "type": "active"
+                        },
+                        {
+                            "key": "garlicChives",
+                            "value": "Garlic chives",
+                            "type": "active"
+                        },
+                        {
+                            "key": "sansevieria",
+                            "value": "Snake plant",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce",
+                            "value": "Lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "peaceLily",
+                            "value": "Peace lily",
+                            "type": "active"
+                        },
+                        {
+                            "key": "parsley",
+                            "value": "Parsley",
+                            "type": "active"
+                        },
+                        {
+                            "key": "paprika",
+                            "value": "Paprika",
+                            "type": "active"
+                        },
+                        {
+                            "key": "peperomia",
+                            "value": "Peperomia",
+                            "type": "active"
+                        },
+                        {
+                            "key": "philodendron",
+                            "value": "Philodendron",
+                            "type": "active"
+                        },
+                        {
+                            "key": "parsley_italian",
+                            "value": "Italian parsley",
+                            "type": "active"
+                        },
+                        {
+                            "key": "UNKNOWN",
+                            "value": "Unknown",
+                            "type": "active"
+                        }
+                    ]
+                }
+            }
+        },
+        {
+            "label": "Planting days",
+            "displayType": "state",
+            "state": {
+                "label": "{{startTime.value}}"
+            }
+        },
+        {
+            "label": "Add planting date",
+            "displayType": "pushButton",
+            "pushButton": {
+                "command": "resetStartTime"
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "Plant type",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "none",
+                            "value": "None",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_caesarsGreen",
+                            "value": "Caesar's green lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_jeokOak",
+                            "value": "Korean red lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "tatsoi_vitamin",
+                            "value": "Tatsoi",
+                            "type": "active"
+                        },
+                        {
+                            "key": "collardLeafKale",
+                            "value": "Collard greens",
+                            "type": "active"
+                        },
+                        {
+                            "key": "leafRedChicory",
+                            "value": "Red leaf chicory",
+                            "type": "active"
+                        },
+                        {
+                            "key": "garlandChrysanthemum",
+                            "value": "Garland chrysanthemum",
+                            "type": "active"
+                        },
+                        {
+                            "key": "pakchoi",
+                            "value": "Bok choy",
+                            "type": "active"
+                        },
+                        {
+                            "key": "leafMustard",
+                            "value": "Leaf mustard",
+                            "type": "active"
+                        },
+                        {
+                            "key": "basil",
+                            "value": "Basil",
+                            "type": "active"
+                        },
+                        {
+                            "key": "rucola",
+                            "value": "Arugula",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cilantro",
+                            "value": "Cilantro",
+                            "type": "active"
+                        },
+                        {
+                            "key": "dill",
+                            "value": "Dill",
+                            "type": "active"
+                        },
+                        {
+                            "key": "thyme",
+                            "value": "Thyme",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lemonBalm",
+                            "value": "Lemon balm",
+                            "type": "active"
+                        },
+                        {
+                            "key": "catnip",
+                            "value": "Catnip",
+                            "type": "active"
+                        },
+                        {
+                            "key": "endive",
+                            "value": "Endive",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_multiGreen",
+                            "value": "Multigreen lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "napaCabbage",
+                            "value": "Napa cabbage",
+                            "type": "active"
+                        },
+                        {
+                            "key": "appleMint",
+                            "value": "Apple mint",
+                            "type": "active"
+                        },
+                        {
+                            "key": "thaiBasil",
+                            "value": "Thai basil",
+                            "type": "active"
+                        },
+                        {
+                            "key": "peppermint",
+                            "value": "Peppermint",
+                            "type": "active"
+                        },
+                        {
+                            "key": "burningBushSpindletree",
+                            "value": "Burning bush",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lolloBionda_Bartimer",
+                            "value": "Bartimer lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce_miniRomaine",
+                            "value": "Mini romaine lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "newGreen",
+                            "value": "New green",
+                            "type": "active"
+                        },
+                        {
+                            "key": "redVeinedSorrel",
+                            "value": "Red veined sorrel",
+                            "type": "active"
+                        },
+                        {
+                            "key": "sage",
+                            "value": "Sage",
+                            "type": "active"
+                        },
+                        {
+                            "key": "eggplant",
+                            "value": "Aubergine",
+                            "type": "active"
+                        },
+                        {
+                            "key": "pepper",
+                            "value": "Pepper",
+                            "type": "active"
+                        },
+                        {
+                            "key": "strawberry",
+                            "value": "Strawberry",
+                            "type": "active"
+                        },
+                        {
+                            "key": "rosemary",
+                            "value": "Rosemary",
+                            "type": "active"
+                        },
+                        {
+                            "key": "monstera",
+                            "value": "Monstera",
+                            "type": "active"
+                        },
+                        {
+                            "key": "mint",
+                            "value": "Mint",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cherryTomato",
+                            "value": "Cherry tomato",
+                            "type": "active"
+                        },
+                        {
+                            "key": "garlicChives",
+                            "value": "Garlic chives",
+                            "type": "active"
+                        },
+                        {
+                            "key": "sansevieria",
+                            "value": "Snake plant",
+                            "type": "active"
+                        },
+                        {
+                            "key": "lettuce",
+                            "value": "Lettuce",
+                            "type": "active"
+                        },
+                        {
+                            "key": "peaceLily",
+                            "value": "Peace lily",
+                            "type": "active"
+                        },
+                        {
+                            "key": "parsley",
+                            "value": "Parsley",
+                            "type": "active"
+                        },
+                        {
+                            "key": "paprika",
+                            "value": "Paprika",
+                            "type": "active"
+                        },
+                        {
+                            "key": "peperomia",
+                            "value": "Peperomia",
+                            "type": "active"
+                        },
+                        {
+                            "key": "philodendron",
+                            "value": "Philodendron",
+                            "type": "active"
+                        },
+                        {
+                            "key": "parsley_italian",
+                            "value": "Italian parsley",
+                            "type": "active"
+                        },
+                        {
+                            "key": "UNKNOWN",
+                            "value": "Unknown",
+                            "type": "active"
+                        }
+                    ],
+                    "supportedValues": "supportedPlantType.value",
+                    "value": "plantType.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": []
+    },
+    "id": "plantCultivation",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/powerMeterPresentation.json b/json/powerMeterPresentation.json
index 1c4b34ff..59540acc 100755
--- a/json/powerMeterPresentation.json
+++ b/json/powerMeterPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Power meter",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Power meter",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "power.value",
diff --git a/json/powerSourcePresentation.json b/json/powerSourcePresentation.json
index 5e1c0035..6f825acb 100755
--- a/json/powerSourcePresentation.json
+++ b/json/powerSourcePresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "battery",
-                        "value": "{{i18n.attributes.powerSource.i18n.value.battery.label}}",
+                        "value": "Battery",
                         "type": "active"
                     },
                     {
                         "key": "dc",
-                        "value": "{{i18n.attributes.powerSource.i18n.value.dc.label}}",
+                        "value": "DC power supply",
                         "type": "active"
                     },
                     {
                         "key": "mains",
-                        "value": "{{i18n.attributes.powerSource.i18n.value.mains.label}}",
+                        "value": "AC power supply",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.powerSource.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -32,29 +32,29 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Power source",
             "displayType": "state",
             "state": {
                 "label": "{{powerSource.value}}",
                 "alternatives": [
                     {
                         "key": "battery",
-                        "value": "{{i18n.attributes.powerSource.i18n.value.battery.label}}",
+                        "value": "Battery",
                         "type": "active"
                     },
                     {
                         "key": "dc",
-                        "value": "{{i18n.attributes.powerSource.i18n.value.dc.label}}",
+                        "value": "DC power supply",
                         "type": "active"
                     },
                     {
                         "key": "mains",
-                        "value": "{{i18n.attributes.powerSource.i18n.value.mains.label}}",
+                        "value": "AC power supply",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.powerSource.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -64,28 +64,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Power source",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "battery",
-                            "value": "{{i18n.attributes.powerSource.i18n.value.battery.label}}",
+                            "value": "Battery",
                             "type": "active"
                         },
                         {
                             "key": "dc",
-                            "value": "{{i18n.attributes.powerSource.i18n.value.dc.label}}",
+                            "value": "DC power supply",
                             "type": "active"
                         },
                         {
                             "key": "mains",
-                            "value": "{{i18n.attributes.powerSource.i18n.value.mains.label}}",
+                            "value": "AC power supply",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.powerSource.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/precipitationSensorPresentation.json b/json/precipitationSensorPresentation.json
index 103f760e..19762e0b 100755
--- a/json/precipitationSensorPresentation.json
+++ b/json/precipitationSensorPresentation.json
@@ -6,32 +6,32 @@
                 "alternatives": [
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.none.label}}",
+                        "value": "None",
                         "type": "inactive"
                     },
                     {
                         "key": "possiblePrecipitation",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.possiblePrecipitation.label}}",
+                        "value": "Possible precipitation",
                         "type": "active"
                     },
                     {
                         "key": "light",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.light.label}}",
+                        "value": "Light",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "heavy",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.heavy.label}}",
+                        "value": "Heavy",
                         "type": "active"
                     },
                     {
                         "key": "violent",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.violent.label}}",
+                        "value": "Violent",
                         "type": "active"
                     }
                 ]
@@ -42,39 +42,39 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Precipitation",
             "displayType": "state",
             "state": {
                 "label": "{{precipitationIntensity.value}}",
                 "alternatives": [
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.none.label}}",
+                        "value": "None",
                         "type": "inactive"
                     },
                     {
                         "key": "possiblePrecipitation",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.possiblePrecipitation.label}}",
+                        "value": "Possible precipitation",
                         "type": "active"
                     },
                     {
                         "key": "light",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.light.label}}",
+                        "value": "Light",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "heavy",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.heavy.label}}",
+                        "value": "Heavy",
                         "type": "active"
                     },
                     {
                         "key": "violent",
-                        "value": "{{i18n.attributes.precipitationIntensity.i18n.value.violent.label}}",
+                        "value": "Violent",
                         "type": "active"
                     }
                 ]
@@ -84,38 +84,38 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Precipitation",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "none",
-                            "value": "{{i18n.attributes.precipitationIntensity.i18n.value.none.label}}",
+                            "value": "None",
                             "type": "inactive"
                         },
                         {
                             "key": "possiblePrecipitation",
-                            "value": "{{i18n.attributes.precipitationIntensity.i18n.value.possiblePrecipitation.label}}",
+                            "value": "Possible precipitation",
                             "type": "active"
                         },
                         {
                             "key": "light",
-                            "value": "{{i18n.attributes.precipitationIntensity.i18n.value.light.label}}",
+                            "value": "Light",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.precipitationIntensity.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "heavy",
-                            "value": "{{i18n.attributes.precipitationIntensity.i18n.value.heavy.label}}",
+                            "value": "Heavy",
                             "type": "active"
                         },
                         {
                             "key": "violent",
-                            "value": "{{i18n.attributes.precipitationIntensity.i18n.value.violent.label}}",
+                            "value": "Violent",
                             "type": "active"
                         }
                     ],
diff --git a/json/presenceSensorPresentation.json b/json/presenceSensorPresentation.json
index 9342cf28..d0f41ee0 100755
--- a/json/presenceSensorPresentation.json
+++ b/json/presenceSensorPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "not present",
-                        "value": "{{i18n.attributes.presence.i18n.value.not present.label}}",
+                        "value": "Not present",
                         "type": "inactive"
                     },
                     {
                         "key": "present",
-                        "value": "{{i18n.attributes.presence.i18n.value.present.label}}",
+                        "value": "Present",
                         "type": "active"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Presence sensor",
             "displayType": "state",
             "state": {
                 "label": "{{presence.value}}",
                 "alternatives": [
                     {
                         "key": "not present",
-                        "value": "{{i18n.attributes.presence.i18n.value.not present.label}}",
+                        "value": "Not present",
                         "type": "inactive"
                     },
                     {
                         "key": "present",
-                        "value": "{{i18n.attributes.presence.i18n.value.present.label}}",
+                        "value": "Present",
                         "type": "active"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Presence sensor",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "not present",
-                            "value": "{{i18n.attributes.presence.i18n.value.not present.label}}",
+                            "value": "Not present",
                             "type": "inactive"
                         },
                         {
                             "key": "present",
-                            "value": "{{i18n.attributes.presence.i18n.value.present.label}}",
+                            "value": "Present",
                             "type": "active"
                         }
                     ],
diff --git a/json/pumpControlMode.i18n.en.json b/json/pumpControlMode.i18n.en.json
index 334e17b9..79613512 100755
--- a/json/pumpControlMode.i18n.en.json
+++ b/json/pumpControlMode.i18n.en.json
@@ -1,11 +1,11 @@
 {
     "tag": "en",
     "label": "Control mode",
-    "description": "Allows to view the current effective control mode of the pump.",
+    "description": "Allows for viewing the current effective control mode of the pump.",
     "attributes": {
         "controlMode": {
             "label": "Control Mode",
-            "description": "The control mode of the pump",
+            "description": "The control mode of the pump.",
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {
                 "value": {
@@ -32,7 +32,7 @@
         },
         "supportedControlModes": {
             "label": "Supported Control Modes",
-            "description": "Supported control modes for this device to be in",
+            "description": "Supported control modes for this device.",
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {
                 "value": {
@@ -59,7 +59,7 @@
         },
         "currentControlMode": {
             "label": "Control mode",
-            "description": "The current effective control mode of the pump",
+            "description": "The current effective control mode of the pump.",
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {
                 "value": {
@@ -88,30 +88,48 @@
     "commands": {
         "setControlMode": {
             "label": "setControlMode",
-            "description": "Set the control mode",
+            "description": "Set the control mode.",
             "arguments": {
                 "controlMode": {
                     "i18n": {
                         "constantTemperature": {
                             "label": "Constant temperature"
                         },
+                        "constantflow description": {
+                            "label": "The pump will regulate its speed to maintain a constant flow through the pump."
+                        },
+                        "constanttemperature description": {
+                            "label": "The pump will regulate its speed to maintain a constant temperature."
+                        },
+                        "proportionalpressure description": {
+                            "label": "The pump will regulate its speed to maintain a constant differential pressure over its flanges that is proportional to the speed."
+                        },
                         "constantFlow": {
                             "label": "Constant flow"
                         },
+                        "automatic description": {
+                            "label": "The operation of the pump is automatically optimized to provide the most suitable performance with respect to comfort and energy savings."
+                        },
+                        "constantspeed description": {
+                            "label": "The pump is running at a constant speed."
+                        },
+                        "constantpressure description": {
+                            "label": "The pump will regulate its speed to maintain a constant differential pressure over its flanges."
+                        },
                         "automatic": {
                             "label": "Automatic"
                         },
-                        "constantSpeed": {
-                            "label": "Constant speed"
-                        },
                         "constantPressure": {
                             "label": "Constant pressure"
                         },
                         "proportionalPressure": {
                             "label": "Automatic pressure"
+                        },
+                        "constantSpeed": {
+                            "label": "Constant speed"
                         }
                     },
-                    "description": "The control mode to set the device to"
+                    "description": "The control mode to set the device to."
                 }
             }
         }
diff --git a/json/pumpControlMode.i18n.fr.json b/json/pumpControlMode.i18n.fr.json
index 1c4fdcfd..73e536bf 100755
--- a/json/pumpControlMode.i18n.fr.json
+++ b/json/pumpControlMode.i18n.fr.json
@@ -1,11 +1,11 @@
 {
     "tag": "fr",
     "label": "Mode de contrôle",
-    "description": "Allows to view the current effective control mode of the pump.",
+    "description": "Allows for viewing the current effective control mode of the pump.",
     "attributes": {
         "controlMode": {
             "label": "Control Mode",
-            "description": "The control mode of the pump",
+            "description": "The control mode of the pump.",
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {
                 "value": {
@@ -32,7 +32,7 @@
         },
         "supportedControlModes": {
             "label": "Supported Control Modes",
-            "description": "Supported control modes for this device to be in",
+            "description": "Supported control modes for this device.",
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {
                 "value": {
@@ -59,7 +59,7 @@
         },
         "currentControlMode": {
             "label": "Mode de contrôle",
-            "description": "The current effective control mode of the pump",
+            "description": "The current effective control mode of the pump.",
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {
                 "value": {
@@ -88,30 +88,48 @@
     "commands": {
         "setControlMode": {
             "label": "setControlMode",
-            "description": "Set the control mode",
+            "description": "Set the control mode.",
             "arguments": {
                 "controlMode": {
                     "i18n": {
                         "constantTemperature": {
                             "label": "Température constante"
                         },
+                        "constantflow description": {
+                            "label": "The pump will regulate its speed to maintain a constant flow through the pump."
+                        },
+                        "constanttemperature description": {
+                            "label": "The pump will regulate its speed to maintain a constant temperature."
+                        },
+                        "proportionalpressure description": {
+                            "label": "The pump will regulate its speed to maintain a constant differential pressure over its flanges that is proportional to the speed."
+                        },
                         "constantFlow": {
                             "label": "Flux constant"
                         },
+                        "automatic description": {
+                            "label": "The operation of the pump is automatically optimized to provide the most suitable performance with respect to comfort and energy savings."
+                        },
+                        "constantspeed description": {
+                            "label": "The pump is running at a constant speed."
+                        },
+                        "constantpressure description": {
+                            "label": "The pump will regulate its speed to maintain a constant differential pressure over its flanges."
+                        },
                         "automatic": {
                             "label": "Automatique"
                         },
-                        "constantSpeed": {
-                            "label": "Rythme constant"
-                        },
                         "constantPressure": {
                             "label": "Pression constante"
                         },
                         "proportionalPressure": {
                             "label": "Pression automatique"
+                        },
+                        "constantSpeed": {
+                            "label": "Rythme constant"
                         }
                     },
-                    "description": "The control mode to set the device to"
+                    "description": "The control mode to set the device to."
                 }
             }
         }
diff --git a/json/pumpControlMode.json b/json/pumpControlMode.json
index 70c5081c..7130930b 100755
--- a/json/pumpControlMode.json
+++ b/json/pumpControlMode.json
@@ -27,7 +27,6 @@
                     "value"
                 ]
             },
-            "setter": "setControlMode",
             "enumCommands": []
         },
         "supportedControlModes": {
@@ -100,7 +99,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/pumpControlModePresentation.json b/json/pumpControlModePresentation.json
index 543f79ca..b296b2ef 100755
--- a/json/pumpControlModePresentation.json
+++ b/json/pumpControlModePresentation.json
@@ -6,32 +6,32 @@
                 "alternatives": [
                     {
                         "key": "constantSpeed",
-                        "value": "{{i18n.attributes.currentControlMode.i18n.value.constantSpeed.label}}",
+                        "value": "Constant speed",
                         "type": "active"
                     },
                     {
                         "key": "constantPressure",
-                        "value": "{{i18n.attributes.currentControlMode.i18n.value.constantPressure.label}}",
+                        "value": "Constant pressure",
                         "type": "active"
                     },
                     {
                         "key": "proportionalPressure",
-                        "value": "{{i18n.attributes.currentControlMode.i18n.value.proportionalPressure.label}}",
+                        "value": "Automatic pressure",
                         "type": "active"
                     },
                     {
                         "key": "constantFlow",
-                        "value": "{{i18n.attributes.currentControlMode.i18n.value.constantFlow.label}}",
+                        "value": "Constant flow",
                         "type": "active"
                     },
                     {
                         "key": "constantTemperature",
-                        "value": "{{i18n.attributes.currentControlMode.i18n.value.constantTemperature.label}}",
+                        "value": "Constant temperature",
                         "type": "active"
                     },
                     {
                         "key": "automatic",
-                        "value": "{{i18n.attributes.currentControlMode.i18n.value.automatic.label}}",
+                        "value": "Automatic",
                         "type": "active"
                     }
                 ]
@@ -42,7 +42,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Control mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -50,32 +50,32 @@
                     "alternatives": [
                         {
                             "key": "constantSpeed",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.constantSpeed.label}}",
+                            "value": "Constant speed",
                             "type": "active"
                         },
                         {
                             "key": "constantPressure",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.constantPressure.label}}",
+                            "value": "Constant pressure",
                             "type": "active"
                         },
                         {
                             "key": "proportionalPressure",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.proportionalPressure.label}}",
+                            "value": "Automatic pressure",
                             "type": "active"
                         },
                         {
                             "key": "constantFlow",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.constantFlow.label}}",
+                            "value": "Constant flow",
                             "type": "active"
                         },
                         {
                             "key": "constantTemperature",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.constantTemperature.label}}",
+                            "value": "Constant temperature",
                             "type": "active"
                         },
                         {
                             "key": "automatic",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.automatic.label}}",
+                            "value": "Automatic",
                             "type": "active"
                         }
                     ],
@@ -88,32 +88,32 @@
                     "alternatives": [
                         {
                             "key": "constantSpeed",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.constantSpeed.label}}",
+                            "value": "Constant speed",
                             "type": "active"
                         },
                         {
                             "key": "constantPressure",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.constantPressure.label}}",
+                            "value": "Constant pressure",
                             "type": "active"
                         },
                         {
                             "key": "proportionalPressure",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.proportionalPressure.label}}",
+                            "value": "Automatic pressure",
                             "type": "active"
                         },
                         {
                             "key": "constantFlow",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.constantFlow.label}}",
+                            "value": "Constant flow",
                             "type": "active"
                         },
                         {
                             "key": "constantTemperature",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.constantTemperature.label}}",
+                            "value": "Constant temperature",
                             "type": "active"
                         },
                         {
                             "key": "automatic",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.automatic.label}}",
+                            "value": "Automatic",
                             "type": "active"
                         }
                     ]
@@ -124,38 +124,38 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Control mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "constantSpeed",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.constantSpeed.label}}",
+                            "value": "Constant speed",
                             "type": "active"
                         },
                         {
                             "key": "constantPressure",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.constantPressure.label}}",
+                            "value": "Constant pressure",
                             "type": "active"
                         },
                         {
                             "key": "proportionalPressure",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.proportionalPressure.label}}",
+                            "value": "Automatic pressure",
                             "type": "active"
                         },
                         {
                             "key": "constantFlow",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.constantFlow.label}}",
+                            "value": "Constant flow",
                             "type": "active"
                         },
                         {
                             "key": "constantTemperature",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.constantTemperature.label}}",
+                            "value": "Constant temperature",
                             "type": "active"
                         },
                         {
                             "key": "automatic",
-                            "value": "{{i18n.attributes.currentControlMode.i18n.value.automatic.label}}",
+                            "value": "Automatic",
                             "type": "active"
                         }
                     ],
@@ -168,38 +168,38 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Control mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "constantSpeed",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.constantSpeed.label}}",
+                            "value": "Constant speed",
                             "type": "active"
                         },
                         {
                             "key": "constantPressure",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.constantPressure.label}}",
+                            "value": "Constant pressure",
                             "type": "active"
                         },
                         {
                             "key": "proportionalPressure",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.proportionalPressure.label}}",
+                            "value": "Automatic pressure",
                             "type": "active"
                         },
                         {
                             "key": "constantFlow",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.constantFlow.label}}",
+                            "value": "Constant flow",
                             "type": "active"
                         },
                         {
                             "key": "constantTemperature",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.constantTemperature.label}}",
+                            "value": "Constant temperature",
                             "type": "active"
                         },
                         {
                             "key": "automatic",
-                            "value": "{{i18n.commands.setControlMode.arguments.controlMode.i18n.automatic.label}}",
+                            "value": "Automatic",
                             "type": "active"
                         }
                     ],
diff --git a/json/pumpOperationModePresentation.json b/json/pumpOperationModePresentation.json
index 9bed92ff..a60a2bc9 100755
--- a/json/pumpOperationModePresentation.json
+++ b/json/pumpOperationModePresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.currentOperationMode.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "active"
                     },
                     {
                         "key": "minimum",
-                        "value": "{{i18n.attributes.currentOperationMode.i18n.value.minimum.label}}",
+                        "value": "Minimum",
                         "type": "active"
                     },
                     {
                         "key": "maximum",
-                        "value": "{{i18n.attributes.currentOperationMode.i18n.value.maximum.label}}",
+                        "value": "Maximum",
                         "type": "active"
                     },
                     {
                         "key": "localSetting",
-                        "value": "{{i18n.attributes.currentOperationMode.i18n.value.localSetting.label}}",
+                        "value": "Local",
                         "type": "active"
                     }
                 ]
@@ -32,7 +32,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Operation mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -40,22 +40,22 @@
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.commands.setOperationMode.arguments.operationMode.i18n.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "minimum",
-                            "value": "{{i18n.commands.setOperationMode.arguments.operationMode.i18n.minimum.label}}",
+                            "value": "Minimum",
                             "type": "active"
                         },
                         {
                             "key": "maximum",
-                            "value": "{{i18n.commands.setOperationMode.arguments.operationMode.i18n.maximum.label}}",
+                            "value": "Maximum",
                             "type": "active"
                         },
                         {
                             "key": "localSetting",
-                            "value": "{{i18n.commands.setOperationMode.arguments.operationMode.i18n.localSetting.label}}",
+                            "value": "Local",
                             "type": "active"
                         }
                     ],
@@ -68,22 +68,22 @@
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.currentOperationMode.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "minimum",
-                            "value": "{{i18n.attributes.currentOperationMode.i18n.value.minimum.label}}",
+                            "value": "Minimum",
                             "type": "active"
                         },
                         {
                             "key": "maximum",
-                            "value": "{{i18n.attributes.currentOperationMode.i18n.value.maximum.label}}",
+                            "value": "Maximum",
                             "type": "active"
                         },
                         {
                             "key": "localSetting",
-                            "value": "{{i18n.attributes.currentOperationMode.i18n.value.localSetting.label}}",
+                            "value": "Local",
                             "type": "active"
                         }
                     ]
@@ -94,28 +94,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Operation mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.currentOperationMode.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "minimum",
-                            "value": "{{i18n.attributes.currentOperationMode.i18n.value.minimum.label}}",
+                            "value": "Minimum",
                             "type": "active"
                         },
                         {
                             "key": "maximum",
-                            "value": "{{i18n.attributes.currentOperationMode.i18n.value.maximum.label}}",
+                            "value": "Maximum",
                             "type": "active"
                         },
                         {
                             "key": "localSetting",
-                            "value": "{{i18n.attributes.currentOperationMode.i18n.value.localSetting.label}}",
+                            "value": "Local",
                             "type": "active"
                         }
                     ],
@@ -128,28 +128,28 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Operation mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.commands.setOperationMode.arguments.operationMode.i18n.normal.label}}",
+                            "value": "Normal",
                             "type": "active"
                         },
                         {
                             "key": "minimum",
-                            "value": "{{i18n.commands.setOperationMode.arguments.operationMode.i18n.minimum.label}}",
+                            "value": "Minimum",
                             "type": "active"
                         },
                         {
                             "key": "maximum",
-                            "value": "{{i18n.commands.setOperationMode.arguments.operationMode.i18n.maximum.label}}",
+                            "value": "Maximum",
                             "type": "active"
                         },
                         {
                             "key": "localSetting",
-                            "value": "{{i18n.commands.setOperationMode.arguments.operationMode.i18n.localSetting.label}}",
+                            "value": "Local",
                             "type": "active"
                         }
                     ],
diff --git a/json/radonHealthConcernPresentation.json b/json/radonHealthConcernPresentation.json
index 9d152b6b..7b3186a4 100755
--- a/json/radonHealthConcernPresentation.json
+++ b/json/radonHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Radon level",
             "displayType": "state",
             "state": {
                 "label": "{{radonHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.radonHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Radon level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.radonHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.radonHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.radonHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.radonHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.radonHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.radonHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.radonHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/radonMeasurementPresentation.json b/json/radonMeasurementPresentation.json
index de64db61..c8642647 100755
--- a/json/radonMeasurementPresentation.json
+++ b/json/radonMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Radon",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Radon",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "radonLevel.value",
diff --git a/json/rainSensorPresentation.json b/json/rainSensorPresentation.json
index f708410c..0afceaf0 100644
--- a/json/rainSensorPresentation.json
+++ b/json/rainSensorPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.rain.i18n.value.detected.label}}",
+                        "value": "Detected",
                         "type": "active"
                     },
                     {
                         "key": "undetected",
-                        "value": "{{i18n.attributes.rain.i18n.value.undetected.label}}",
+                        "value": "Not detected",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Rain sensor",
             "displayType": "state",
             "state": {
                 "label": "{{rain.value}}",
                 "alternatives": [
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.rain.i18n.value.detected.label}}",
+                        "value": "Detected",
                         "type": "active"
                     },
                     {
                         "key": "undetected",
-                        "value": "{{i18n.attributes.rain.i18n.value.undetected.label}}",
+                        "value": "Not detected",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Rain sensor",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "detected",
-                            "value": "{{i18n.attributes.rain.i18n.value.detected.label}}",
+                            "value": "Detected",
                             "type": "active"
                         },
                         {
                             "key": "undetected",
-                            "value": "{{i18n.attributes.rain.i18n.value.undetected.label}}",
+                            "value": "Not detected",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/rapidCoolingPresentation.json b/json/rapidCoolingPresentation.json
index 04763ecc..83db8ff7 100755
--- a/json/rapidCoolingPresentation.json
+++ b/json/rapidCoolingPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.rapidCooling.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.rapidCooling.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -22,7 +22,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Power cool",
             "displayType": "switch",
             "switch": {
                 "command": {
@@ -37,12 +37,12 @@
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.rapidCooling.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.rapidCooling.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
@@ -53,18 +53,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Power cool",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.rapidCooling.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.rapidCooling.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -75,18 +75,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Power cool",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setRapidCooling.arguments.rapidCooling.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setRapidCooling.arguments.rapidCooling.i18n.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/refreshPresentation.json b/json/refreshPresentation.json
index 011b452b..9615ec40 100755
--- a/json/refreshPresentation.json
+++ b/json/refreshPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Refresh",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "refresh"
diff --git a/json/refrigerationPresentation.json b/json/refrigerationPresentation.json
index d4855956..4d4a7e85 100755
--- a/json/refrigerationPresentation.json
+++ b/json/refrigerationPresentation.json
@@ -3,18 +3,18 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.commands.setRapidFreezing.label}}",
+                "label": "Power cool",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setRapidFreezing.arguments.rapidCooling.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setRapidFreezing.arguments.rapidCooling.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         }
                     ],
@@ -22,18 +22,18 @@
                 }
             },
             {
-                "label": "{{i18n.commands.setRapidCooling.label}}",
+                "label": "Power cool",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setRapidCooling.arguments.rapidCooling.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setRapidCooling.arguments.rapidCooling.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         }
                     ],
diff --git a/json/refrigerationSetpointPresentation.json b/json/refrigerationSetpointPresentation.json
index c9ef3d76..9637065c 100755
--- a/json/refrigerationSetpointPresentation.json
+++ b/json/refrigerationSetpointPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Set temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -20,7 +20,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Set temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setRefrigerationSetpoint",
diff --git a/json/relativeBrightnessPresentation.json b/json/relativeBrightnessPresentation.json
index 44c8717c..85566708 100755
--- a/json/relativeBrightnessPresentation.json
+++ b/json/relativeBrightnessPresentation.json
@@ -6,7 +6,7 @@
                 "alternatives": [
                     {
                         "key": "level",
-                        "value": "{{i18n.attributes.brightnessIntensity.i18n.unit.level.label}}",
+                        "value": "Level",
                         "type": "active"
                     }
                 ]
@@ -17,7 +17,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Illuminance level",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -28,49 +28,49 @@
                 "alternatives": [
                     {
                         "key": "1",
-                        "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_LABEL_1",
+                        "value": "Night",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_DESCRIPTION_1"
+                        "description": "Night (below 1 lux)"
                     },
                     {
                         "key": "2",
-                        "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_LABEL_2",
+                        "value": "Twilight",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_DESCRIPTION_2"
+                        "description": "Twilight (1 - 20 lux)"
                     },
                     {
                         "key": "3",
-                        "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_LABEL_3",
+                        "value": "Low indoor lighting",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_DESCRIPTION_3"
+                        "description": "Low indoor lighting (21 - 80 lux)"
                     },
                     {
                         "key": "4",
-                        "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_LABEL_4",
+                        "value": "Moderate indoor lighting",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_DESCRIPTION_4"
+                        "description": "Moderate indoor lighting (81 - 250 lux)"
                     },
                     {
                         "key": "5",
-                        "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_LABEL_5",
+                        "value": "Office lighting",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_DESCRIPTION_5"
+                        "description": "Office lighting (251 - 800 lux)"
                     },
                     {
                         "key": "6",
-                        "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_LABEL_6",
+                        "value": "Cloudy day",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_DESCRIPTION_6"
+                        "description": "Cloudy day (801 - 3000 lux)"
                     },
                     {
                         "key": "7",
-                        "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_LABEL_7",
+                        "value": "Daylight",
                         "type": "active",
-                        "description": "___PO_CODE_CAPABILITY.SMARTTHINGS.RELATIVEBRIGHTNESS_DEFAULT_DESCRIPTION_7"
+                        "description": "Daylight (above 3000 lux)"
                     },
                     {
                         "key": "level",
-                        "value": "{{i18n.attributes.brightnessIntensity.i18n.unit.level.label}}",
+                        "value": "Level",
                         "type": "active"
                     }
                 ],
@@ -82,7 +82,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Illuminance level",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -93,7 +93,7 @@
                     "alternatives": [
                         {
                             "key": "level",
-                            "value": "{{i18n.attributes.brightnessIntensity.i18n.unit.level.label}}",
+                            "value": "Level",
                             "type": "active"
                         }
                     ],
diff --git a/json/relativeHumidityMeasurementPresentation.json b/json/relativeHumidityMeasurementPresentation.json
index dfdfbc1e..a94cbf58 100755
--- a/json/relativeHumidityMeasurementPresentation.json
+++ b/json/relativeHumidityMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Humidity",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Humidity",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "humidity.value",
diff --git a/json/remoteControlStatusPresentation.json b/json/remoteControlStatusPresentation.json
index 74a9b44b..3410fbc4 100755
--- a/json/remoteControlStatusPresentation.json
+++ b/json/remoteControlStatusPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "true",
-                        "value": "{{i18n.attributes.remoteControlEnabled.i18n.value.true.label}}",
+                        "value": "Allowed",
                         "type": "active"
                     },
                     {
                         "key": "false",
-                        "value": "{{i18n.attributes.remoteControlEnabled.i18n.value.false.label}}",
+                        "value": "Not allowed",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Remote control",
             "displayType": "state",
             "state": {
                 "label": "{{remoteControlEnabled.value}}",
                 "alternatives": [
                     {
                         "key": "true",
-                        "value": "{{i18n.attributes.remoteControlEnabled.i18n.value.true.label}}",
+                        "value": "Allowed",
                         "type": "active"
                     },
                     {
                         "key": "false",
-                        "value": "{{i18n.attributes.remoteControlEnabled.i18n.value.false.label}}",
+                        "value": "Not allowed",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Remote control",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "true",
-                            "value": "{{i18n.attributes.remoteControlEnabled.i18n.value.true.label}}",
+                            "value": "Allowed",
                             "type": "active"
                         },
                         {
                             "key": "false",
-                            "value": "{{i18n.attributes.remoteControlEnabled.i18n.value.false.label}}",
+                            "value": "Not allowed",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/riceCooker.i18n.en.json b/json/riceCooker.i18n.en.json
index 170eb050..4e5650c1 100755
--- a/json/riceCooker.i18n.en.json
+++ b/json/riceCooker.i18n.en.json
@@ -1,6 +1,7 @@
 {
     "tag": "en",
     "label": "Rice Cooker",
+    "description": "Control and monitor the cooking functions and status of a rice cooker.",
     "attributes": {
         "completionTime": {
             "label": "Remaining time",
@@ -71,29 +72,17 @@
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {
                 "value": {
-                    "superGrains": {
-                        "label": "Super Grains"
-                    },
-                    "plainPorridge": {
-                        "label": "Plain Porridge"
-                    },
                     "mixedGrainForSaladWithAdlay": {
                         "label": "Mixed Grain for Salad with Adlay"
                     },
                     "scorchedRiceTea": {
                         "label": "Scorched Rice Tea"
                     },
-                    "kamutRice": {
-                        "label": "Kamut Rice"
-                    },
                     "odaemi": {
                         "label": "Odaemi"
                     },
-                    "mixedGrainForSaladWithKamut": {
-                        "label": "Mixed Grain for Salad with Kamut"
-                    },
-                    "sousVide": {
-                        "label": "Sous Vide"
+                    "riceWithRipeKimchiAndAbaloneInHotPot": {
+                        "label": "Rice with Ripe Kimchi and Abalone in Hot Pot"
                     },
                     "mixedGrainsQuick": {
                         "label": "Mixed Grains Quick"
@@ -101,113 +90,65 @@
                     "alchanmi": {
                         "label": "Alchanmi"
                     },
-                    "riceWithRipeKimchiAndAbaloneInHotPot": {
-                        "label": "Rice with Ripe Kimchi and Abalone in Hot Pot"
-                    },
                     "riceForGimbap": {
                         "label": "Rice for Gimbap"
                     },
-                    "riceWithAssortedMushrommsInHotPot": {
-                        "label": "Rice with Assorted Mushromms in Hot Pot"
-                    },
                     "beef,ShiitakeMushroom,EggPorridge": {
                         "label": "Beef, Shiitake Mushroom, Egg Porridge"
                     },
-                    "stickyPlainRice": {
-                        "label": "Sticky Plain Rice"
-                    },
                     "frozenMixedGrain": {
                         "label": "Frozen Mixed Grain"
                     },
+                    "stickyPlainRice": {
+                        "label": "Sticky Plain Rice"
+                    },
                     "beef,Cabbage,WhiteMushroom,Jujube,SoftBoiledRice": {
                         "label": "Beef,Cabbage,White Mushroom,Jujube,Soft Boiled Rice"
                     },
                     "broccoliPorridge": {
                         "label": "Broccoli Porridge"
                     },
-                    "bakedEgg": {
-                        "label": "Baked Egg"
-                    },
-                    "chickpeaRice": {
-                        "label": "Chickpea Rice"
-                    },
-                    "pineNutPorridge": {
-                        "label": "Pine Nut Porridge"
-                    },
                     "riceWithBeans": {
                         "label": "Rice with Beans"
                     },
+                    "babyFood": {
+                        "label": "Baby Food"
+                    },
                     "barleyMixedGrainRice": {
                         "label": "Barley Mixed Grain Rice"
                     },
-                    "mixedGrainForSaladWithQuinoa(1Cup)": {
-                        "label": "Mixed Grain for Salad with Quinoa (1Cup)"
-                    },
                     "codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice": {
                         "label": "Cod Flesh, Sweet Pumpkin, Mung-Bean Sprouts, Black Sesame, Soft Boiled Rice"
                     },
-                    "babyFoodStep1": {
-                        "label": "Baby Food Step 1"
-                    },
-                    "babyFoodStep2": {
-                        "label": "Baby Food Step 2"
-                    },
                     "riceWithTruffledBulgogiInHotPot": {
                         "label": "Rice with Truffled Bulgogi in Hot Pot"
                     },
-                    "babyFoodStep3": {
-                        "label": "Baby Food Step 3"
-                    },
-                    "haedeul": {
-                        "label": "Haedeul"
-                    },
-                    "mixedGrainForSaladWithLentilBean(1Cup)": {
-                        "label": "Mixed Grain for Salad with Lentil Bean (1Cup)"
-                    },
-                    "brownRice100": {
-                        "label": "Brown Rice 100%"
-                    },
                     "riceWithAbaloneInHotPot": {
                         "label": "Rice with Abalone in Hot Pot"
                     },
-                    "konjacRice": {
-                        "label": "Konjac Rice"
-                    },
-                    "beef,Apple,BroccoliPorridge": {
-                        "label": "Beef, Apple, Broccoli Porridge"
-                    },
                     "chicken,SweetPumpkin,Cabbage,StickyRicePorridge": {
                         "label": "Chicken, Sweet Pumpkin, Cabbage, Sticky Rice Porridge"
                     },
                     "mixedGrainForSaladWithQuinoa(2Cup)": {
                         "label": "Mixed Grain for Salad with Quinoa (2Cup)"
                     },
-                    "mixedGrainForSaladWithOatRice": {
-                        "label": "Mixed Grain for Salad with Oat Rice"
-                    },
                     "mixedGrainForSalad": {
                         "label": "Mixed Grain for Salad"
                     },
-                    "quinoaRice": {
-                        "label": "Quinoa Rice"
-                    },
                     "steamedSweetPotato": {
                         "label": "Steamed Sweet Potato"
                     },
                     "mixedGrainForSaladWithLentilBean": {
                         "label": "Mixed Grain for Salad with Lentil Bean"
                     },
-                    "oatRice": {
-                        "label": "Oat Rice"
-                    },
                     "mixedGrainForSaladWithLentilBean(2Cup)": {
                         "label": "Mixed Grain For Salad with Lentil Bean (2 Cup)"
                     },
                     "mixedGrainForSaladWithBrownRice": {
                         "label": "Mixed Grain for Salad with Brown Rice"
                     },
-                    "abalonePorridge": {
-                        "label": "Abalone Porridge"
+                    "oatRice": {
+                        "label": "Oat Rice"
                     },
                     "riceWithBrackenAndSteakInHotPot": {
                         "label": "Rice with Bracken and Steak in Hot Pot"
@@ -218,27 +159,18 @@
                     "mixedGrainForSaladWithChickpea": {
                         "label": "Mixed Grain for Salad with Chickpea"
                     },
-                    "yakbab": {
-                        "label": "Yakbab"
+                    "highHeatMixedGrains": {
+                        "label": "High Heat Mixed Grains"
                     },
                     "riceWithSteakInHotPot": {
                         "label": "rice with Steak in Hot Pot"
                     },
-                    "mixedGrains": {
-                        "label": "Mixed Grains"
-                    },
-                    "riceWithBeefAndBeanSproutsInHotPot": {
-                        "label": "Rice with Beef and Bean Sprouts in Hot Pot"
-                    },
-                    "mixedGrainForSaladWithBrownRice(1Cup)": {
-                        "label": "Mixed Grain for Salad with Brown Rice (1 Cup)"
+                    "germinatedBrownRice": {
+                        "label": "Germinated Brown Rice"
                     },
                     "mixedGrainForSaladWithBarley": {
                         "label": "Mixed Grain for Salad with Barley"
                     },
-                    "cod-Meat,Vitamin,CarrotPorridge": {
-                        "label": "Cod-Meat, Vitamin, Carrot Porridge"
-                    },
                     "galbijjim": {
                         "label": "Galbijjim"
                     },
@@ -248,21 +180,132 @@
                     "riceWithWebfootOctopusAndSaussureaInHotPot": {
                         "label": "Rice with Webfoot Octopus and Saussurea in Hot Pot"
                     },
-                    "riceWithSpicyWebfootOctopusInHotPot": {
-                        "label": "Rice with Spicy Webfoot Octopus in Hot Pot"
-                    },
                     "mixedGrainForSaladWithQuinoa": {
                         "label": "Mixed Grain for Salad with Quinoa"
                     },
                     "mixedGrainForSaladWithBrownRice(2Cup)": {
                         "label": "Mixed Grain for Salad with Brown Rice (2 Cup)"
                     },
-                    "mixedGrainForSaladWithMillet": {
-                        "label": "Mixed Grain for Salad with Millet"
-                    },
                     "mixedGrainForVitality": {
                         "label": "Mixed Grain for Vitality"
                     },
+                    "plainQuick": {
+                        "label": "Plain Quick"
+                    },
+                    "mixedGrainForSaladWithChickpea(2Cup)": {
+                        "label": "Mixed Grain for Salad with Chickpea (2 Cup)"
+                    },
+                    "wellCookedPlainRice": {
+                        "label": "Well Cooked Plain Rice"
+                    },
+                    "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice": {
+                        "label": "Beef, Beet, Enoki Mushroom, Perilla Seeds, Soft Boiled Rice"
+                    },
+                    "vegetableRice": {
+                        "label": "Vegetable Rice"
+                    },
+                    "grains": {
+                        "label": "Grains"
+                    },
+                    "frozenPlainRice": {
+                        "label": "Frozen Plain Rice"
+                    },
+                    "mixedGrainForSlim": {
+                        "label": "Mixed Grain for Slim"
+                    },
+                    "steamedDish": {
+                        "label": "Steamed Dish"
+                    },
+                    "superGrains": {
+                        "label": "Super Grains"
+                    },
+                    "plainPorridge": {
+                        "label": "Plain Porridge"
+                    },
+                    "kamutRice": {
+                        "label": "Kamut Rice"
+                    },
+                    "mixedGrainForSaladWithKamut": {
+                        "label": "Mixed Grain for Salad with Kamut"
+                    },
+                    "sousVide": {
+                        "label": "Sous Vide"
+                    },
+                    "riceWithAssortedMushrommsInHotPot": {
+                        "label": "Rice with Assorted Mushromms in Hot Pot"
+                    },
+                    "bakedEgg": {
+                        "label": "Baked Egg"
+                    },
+                    "chickpeaRice": {
+                        "label": "Chickpea Rice"
+                    },
+                    "pineNutPorridge": {
+                        "label": "Pine Nut Porridge"
+                    },
+                    "mixedGrainForSaladWithQuinoa(1Cup)": {
+                        "label": "Mixed Grain for Salad with Quinoa (1Cup)"
+                    },
+                    "babyFoodStep1": {
+                        "label": "Baby Food Step 1"
+                    },
+                    "babyFoodStep2": {
+                        "label": "Baby Food Step 2"
+                    },
+                    "babyFoodStep3": {
+                        "label": "Baby Food Step 3"
+                    },
+                    "haedeul": {
+                        "label": "Haedeul"
+                    },
+                    "mixedGrainForSaladWithLentilBean(1Cup)": {
+                        "label": "Mixed Grain for Salad with Lentil Bean (1Cup)"
+                    },
+                    "brownRice100": {
+                        "label": "Brown Rice 100%"
+                    },
+                    "konjacRice": {
+                        "label": "Konjac Rice"
+                    },
+                    "beef,Apple,BroccoliPorridge": {
+                        "label": "Beef, Apple, Broccoli Porridge"
+                    },
+                    "mixedGrainForSaladWithOatRice": {
+                        "label": "Mixed Grain for Salad with Oat Rice"
+                    },
+                    "quinoaRice": {
+                        "label": "Quinoa Rice"
+                    },
+                    "abalonePorridge": {
+                        "label": "Abalone Porridge"
+                    },
+                    "whiteRice": {
+                        "label": "White Rice"
+                    },
+                    "yakbab": {
+                        "label": "Yakbab"
+                    },
+                    "mixedGrains": {
+                        "label": "Mixed Grains"
+                    },
+                    "riceWithBeefAndBeanSproutsInHotPot": {
+                        "label": "Rice with Beef and Bean Sprouts in Hot Pot"
+                    },
+                    "mixedGrainForSaladWithBrownRice(1Cup)": {
+                        "label": "Mixed Grain for Salad with Brown Rice (1 Cup)"
+                    },
+                    "cod-Meat,Vitamin,CarrotPorridge": {
+                        "label": "Cod-Meat, Vitamin, Carrot Porridge"
+                    },
+                    "quickMeal": {
+                        "label": "Quick Meal"
+                    },
+                    "riceWithSpicyWebfootOctopusInHotPot": {
+                        "label": "Rice with Spicy Webfoot Octopus in Hot Pot"
+                    },
+                    "mixedGrainForSaladWithMillet": {
+                        "label": "Mixed Grain for Salad with Millet"
+                    },
                     "scorchedRice": {
                         "label": "Scorched Rice"
                     },
@@ -278,41 +321,29 @@
                     "chicken,Zucchini,SweetPotato,StickyRicePorridge": {
                         "label": "Chicken, Zucchini, Sweet Potato, Sticky Rice Porridge"
                     },
-                    "plainQuick": {
-                        "label": "Plain Quick"
-                    },
                     "beef,KingTrumpetMushroom,BroccoliPorridge": {
                         "label": "Beef, King Trumpet Mushroom, Broccoli Porridge"
                     },
                     "nutritiousRiceInHotPot": {
                         "label": "Nutritious Rice in Hot Pot"
                     },
-                    "mixedGrainForSaladWithChickpea(2Cup)": {
-                        "label": "Mixed Grain for Salad with Chickpea (2 Cup)"
-                    },
                     "chicken,Cheese,Beet,Eggplant,SoftBoiledRice": {
                         "label": "Chicken, Cheese, Beet, Eggplant, Soft Boiled Rice"
                     },
-                    "wellCookedPlainRice": {
-                        "label": "Well Cooked Plain Rice"
+                    "noPressureSteaming": {
+                        "label": "No Pressure Steaming"
                     },
                     "chicken,SweetPotato,Beet,BeetPorridge": {
                         "label": "Chicken, Sweet Potato, Beet, Beet Porridge"
                     },
-                    "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice": {
-                        "label": "Beef, Beet, Enoki Mushroom, Perilla Seeds, Soft Boiled Rice"
-                    },
                     "beef,Zucchini,PearPorridge": {
                         "label": "Beef, Zucchini, Pear Porridge"
                     },
-                    "potatoCarrotPorridge": {
-                        "label": "Potato Carrot Porridge"
-                    },
                     "nutritiousPorridge": {
                         "label": "Nutritious Porridge"
                     },
-                    "frozenPlainRice": {
-                        "label": "Frozen Plain Rice"
+                    "potatoCarrotPorridge": {
+                        "label": "Potato Carrot Porridge"
                     },
                     "chicken,BeanSprouts,Jujube,StickyRicePorridge": {
                         "label": "Chicken, Bean Sprouts, Jujube, Sticky Rice Porridge"
@@ -323,18 +354,12 @@
                     "samgyetang": {
                         "label": "Samgyetang"
                     },
-                    "mixedGrainForSlim": {
-                        "label": "Mixed Grain for Slim"
-                    },
                     "boiledEgg": {
                         "label": "Boiled Egg"
                     },
                     "mixedGrainForSaladWithChickpea(1Cup)": {
                         "label": "Mixed Grain for Salad with Chickpea (1 Cup)"
                     },
-                    "steamedDish": {
-                        "label": "Steamed Dish"
-                    },
                     "lentilBeanRice": {
                         "label": "Lentil Bean Rice"
                     }
@@ -419,6 +444,9 @@
                     "barleyMixedGrainRice": {
                         "label": "Rice with barley and mixed grains"
                     },
+                    "babyFood": {
+                        "label": "Baby food"
+                    },
                     "codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice": {
                         "label": "Cod, sweet pumpkin, mung bean sprout, black sesame soft-boiled rice"
                     },
@@ -461,9 +489,15 @@
                     "mixedGrainForSaladWithChickpea": {
                         "label": "Mixed grains and chickpeas for salad"
                     },
+                    "highHeatMixedGrains": {
+                        "label": "High heat mixed grains"
+                    },
                     "riceWithSteakInHotPot": {
                         "label": "Stone pot-style rice with steak"
                     },
+                    "germinatedBrownRice": {
+                        "label": "Germinated brown rice"
+                    },
                     "mixedGrainForSaladWithBarley": {
                         "label": "Mixed grains and barley for salad"
                     },
@@ -497,6 +531,12 @@
                     "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice": {
                         "label": "Beef, beet, enoki mushroom, perilla seed soft-boiled rice"
                     },
+                    "vegetableRice": {
+                        "label": "Rice with vegetables"
+                    },
+                    "grains": {
+                        "label": "Grains"
+                    },
                     "frozenPlainRice": {
                         "label": "Frozen white rice"
                     },
@@ -629,6 +669,9 @@
                     "abalonePorridge": {
                         "label": "Abalone porridge"
                     },
+                    "whiteRice": {
+                        "label": "White rice"
+                    },
                     "yakbab": {
                         "label": "Yakbap"
                     },
@@ -644,6 +687,9 @@
                     "cod-Meat,Vitamin,CarrotPorridge": {
                         "label": "Cod, vitamin, carrot porridge"
                     },
+                    "quickMeal": {
+                        "label": "Quick meal"
+                    },
                     "riceWithSpicyWebfootOctopusInHotPot": {
                         "label": "Stone pot-style rice with webfoot octopus"
                     },
@@ -663,7 +709,7 @@
                         "label": "Chicken, pine nut, chestnut, spinach soft-boiled rice"
                     },
                     "chicken,Zucchini,SweetPotato,StickyRicePorridge": {
-                        "label": "Chicken, zucchini, sweet potato, sticky rice porridge"
+                        "label": "Chicken, courgette, sweet potato, sticky rice porridge"
                     },
                     "beef,KingTrumpetMushroom,BroccoliPorridge": {
                         "label": "Beef, king trumpet mushroom, broccoli porridge"
@@ -674,11 +720,14 @@
                     "chicken,Cheese,Beet,Eggplant,SoftBoiledRice": {
                         "label": "Chicken, cheese, beet, aubergine soft-boiled rice"
                     },
+                    "noPressureSteaming": {
+                        "label": "No pressure steaming"
+                    },
                     "chicken,SweetPotato,Beet,BeetPorridge": {
                         "label": "Chicken, sweet potato, beetroot, beet green porridge"
                     },
                     "beef,Zucchini,PearPorridge": {
-                        "label": "Beef, zucchini, pear porridge"
+                        "label": "Beef, courgette, pear porridge"
                     },
                     "nutritiousPorridge": {
                         "label": "Nutritious porridge"
@@ -713,41 +762,23 @@
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {
                 "value": {
-                    "superGrains": {
-                        "label": "Super Grains"
-                    },
-                    "plainPorridge": {
-                        "label": "Plain Porridge"
-                    },
                     "mixedGrainForSaladWithAdlay": {
                         "label": "Mixed Grain for Salad with Adlay"
                     },
                     "scorchedRiceTea": {
                         "label": "Scorched Rice Tea"
                     },
-                    "kamutRice": {
-                        "label": "Kamut Rice"
-                    },
-                    "mixedGrainForSaladWithKamut": {
-                        "label": "Mixed Grain for Salad with Kamut"
-                    },
                     "odaemi": {
                         "label": "Odaemi"
                     },
-                    "sousVide": {
-                        "label": "Sous Vide"
-                    },
-                    "riceWithRipeKimchiAndAbaloneInHotPot": {
-                        "label": "Rice with Ripe Kimchi and Abalone in Hot Pot"
-                    },
                     "mixedGrainsQuick": {
                         "label": "Mixed Grains Quick"
                     },
                     "alchanmi": {
                         "label": "Alchanmi"
                     },
-                    "riceWithAssortedMushrommsInHotPot": {
-                        "label": "Rice with Assorted Mushromms in Hot Pot"
+                    "riceWithRipeKimchiAndAbaloneInHotPot": {
+                        "label": "Rice with Ripe Kimchi and Abalone in Hot Pot"
                     },
                     "riceForGimbap": {
                         "label": "Rice for Gimbap"
@@ -755,32 +786,23 @@
                     "beef,ShiitakeMushroom,EggPorridge": {
                         "label": "Beef, Shiitake Mushroom, Egg Porridge"
                     },
-                    "stickyPlainRice": {
-                        "label": "Sticky Plain Rice"
-                    },
                     "frozenMixedGrain": {
                         "label": "Frozen Mixed Grain"
                     },
+                    "stickyPlainRice": {
+                        "label": "Sticky Plain Rice"
+                    },
                     "beef,Cabbage,WhiteMushroom,Jujube,SoftBoiledRice": {
                         "label": "Beef,Cabbage,White Mushroom,Jujube,Soft Boiled Rice"
                     },
                     "broccoliPorridge": {
                         "label": "Broccoli Porridge"
                     },
-                    "chickpeaRice": {
-                        "label": "Chickpea Rice"
-                    },
-                    "bakedEgg": {
-                        "label": "Baked Egg"
-                    },
-                    "pineNutPorridge": {
-                        "label": "Pine Nut Porridge"
-                    },
                     "riceWithBeans": {
                         "label": "Rice with Beans"
                     },
-                    "mixedGrainForSaladWithQuinoa(1Cup)": {
-                        "label": "Mixed Grain for Salad with Quinoa (1Cup)"
+                    "babyFood": {
+                        "label": "Baby Food"
                     },
                     "barleyMixedGrainRice": {
                         "label": "Barley Mixed Grain Rice"
@@ -788,54 +810,24 @@
                     "codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice": {
                         "label": "Cod Flesh, Sweet Pumpkin, Mung-Bean Sprouts, Black Sesame, Soft Boiled Rice"
                     },
-                    "babyFoodStep1": {
-                        "label": "Baby Food Step 1"
-                    },
-                    "babyFoodStep2": {
-                        "label": "Baby Food Step 2"
-                    },
-                    "babyFoodStep3": {
-                        "label": "Baby Food Step 3"
-                    },
                     "riceWithTruffledBulgogiInHotPot": {
                         "label": "Rice with Truffled Bulgogi in Hot Pot"
                     },
-                    "haedeul": {
-                        "label": "Haedeul"
-                    },
-                    "mixedGrainForSaladWithLentilBean(1Cup)": {
-                        "label": "Mixed Grain for Salad with Lentil Bean (1Cup)"
-                    },
-                    "brownRice100": {
-                        "label": "Brown Rice 100%"
-                    },
                     "riceWithAbaloneInHotPot": {
                         "label": "Rice with Abalone in Hot Pot"
                     },
-                    "konjacRice": {
-                        "label": "Konjac Rice"
-                    },
-                    "chicken,SweetPumpkin,Cabbage,StickyRicePorridge": {
-                        "label": "Chicken, Sweet Pumpkin, Cabbage, Sticky Rice Porridge"
-                    },
-                    "mixedGrainForSaladWithOatRice": {
-                        "label": "Mixed Grain for Salad with Oat Rice"
-                    },
                     "mixedGrainForSalad": {
                         "label": "Mixed Grain for Salad"
                     },
-                    "beef,Apple,BroccoliPorridge": {
-                        "label": "Beef, Apple, Broccoli Porridge"
-                    },
                     "mixedGrainForSaladWithQuinoa(2Cup)": {
                         "label": "Mixed Grain for Salad with Quinoa (2Cup)"
                     },
+                    "chicken,SweetPumpkin,Cabbage,StickyRicePorridge": {
+                        "label": "Chicken, Sweet Pumpkin, Cabbage, Sticky Rice Porridge"
+                    },
                     "steamedSweetPotato": {
                         "label": "Steamed Sweet Potato"
                     },
-                    "quinoaRice": {
-                        "label": "Quinoa Rice"
-                    },
                     "mixedGrainForSaladWithLentilBean": {
                         "label": "Mixed Grain for Salad with Lentil Bean"
                     },
@@ -848,9 +840,6 @@
                     "mixedGrainForSaladWithLentilBean(2Cup)": {
                         "label": "Mixed Grain For Salad with Lentil Bean (2 Cup)"
                     },
-                    "abalonePorridge": {
-                        "label": "Abalone Porridge"
-                    },
                     "riceWithBrackenAndSteakInHotPot": {
                         "label": "Rice with Bracken and Steak in Hot Pot"
                     },
@@ -860,12 +849,132 @@
                     "mixedGrainForSaladWithChickpea": {
                         "label": "Mixed Grain for Salad with Chickpea"
                     },
-                    "yakbab": {
-                        "label": "Yakbab"
+                    "highHeatMixedGrains": {
+                        "label": "High Heat Mixed Grains"
+                    },
+                    "germinatedBrownRice": {
+                        "label": "Germinated Brown Rice"
                     },
                     "riceWithSteakInHotPot": {
                         "label": "rice with Steak in Hot Pot"
                     },
+                    "mixedGrainForSaladWithBarley": {
+                        "label": "Mixed Grain for Salad with Barley"
+                    },
+                    "riceWithSeasonedVegetablesInHotPot": {
+                        "label": "Rice with Seasoned Vegetables in Hot Pot"
+                    },
+                    "galbijjim": {
+                        "label": "Galbijjim"
+                    },
+                    "riceWithWebfootOctopusAndSaussureaInHotPot": {
+                        "label": "Rice with Webfoot Octopus and Saussurea in Hot Pot"
+                    },
+                    "mixedGrainForSaladWithQuinoa": {
+                        "label": "Mixed Grain for Salad with Quinoa"
+                    },
+                    "mixedGrainForSaladWithBrownRice(2Cup)": {
+                        "label": "Mixed Grain for Salad with Brown Rice (2 Cup)"
+                    },
+                    "mixedGrainForVitality": {
+                        "label": "Mixed Grain for Vitality"
+                    },
+                    "plainQuick": {
+                        "label": "Plain Quick"
+                    },
+                    "mixedGrainForSaladWithChickpea(2Cup)": {
+                        "label": "Mixed Grain for Salad with Chickpea (2 Cup)"
+                    },
+                    "wellCookedPlainRice": {
+                        "label": "Well Cooked Plain Rice"
+                    },
+                    "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice": {
+                        "label": "Beef, Beet, Enoki Mushroom, Perilla Seeds, Soft Boiled Rice"
+                    },
+                    "vegetableRice": {
+                        "label": "Vegetable Rice"
+                    },
+                    "grains": {
+                        "label": "Grains"
+                    },
+                    "frozenPlainRice": {
+                        "label": "Frozen Plain Rice"
+                    },
+                    "mixedGrainForSlim": {
+                        "label": "Mixed Grain for Slim"
+                    },
+                    "steamedDish": {
+                        "label": "Steamed Dish"
+                    },
+                    "superGrains": {
+                        "label": "Super Grains"
+                    },
+                    "plainPorridge": {
+                        "label": "Plain Porridge"
+                    },
+                    "kamutRice": {
+                        "label": "Kamut Rice"
+                    },
+                    "mixedGrainForSaladWithKamut": {
+                        "label": "Mixed Grain for Salad with Kamut"
+                    },
+                    "sousVide": {
+                        "label": "Sous Vide"
+                    },
+                    "riceWithAssortedMushrommsInHotPot": {
+                        "label": "Rice with Assorted Mushromms in Hot Pot"
+                    },
+                    "pineNutPorridge": {
+                        "label": "Pine Nut Porridge"
+                    },
+                    "chickpeaRice": {
+                        "label": "Chickpea Rice"
+                    },
+                    "bakedEgg": {
+                        "label": "Baked Egg"
+                    },
+                    "mixedGrainForSaladWithQuinoa(1Cup)": {
+                        "label": "Mixed Grain for Salad with Quinoa (1Cup)"
+                    },
+                    "babyFoodStep1": {
+                        "label": "Baby Food Step 1"
+                    },
+                    "babyFoodStep2": {
+                        "label": "Baby Food Step 2"
+                    },
+                    "babyFoodStep3": {
+                        "label": "Baby Food Step 3"
+                    },
+                    "haedeul": {
+                        "label": "Haedeul"
+                    },
+                    "mixedGrainForSaladWithLentilBean(1Cup)": {
+                        "label": "Mixed Grain for Salad with Lentil Bean (1Cup)"
+                    },
+                    "brownRice100": {
+                        "label": "Brown Rice 100%"
+                    },
+                    "konjacRice": {
+                        "label": "Konjac Rice"
+                    },
+                    "mixedGrainForSaladWithOatRice": {
+                        "label": "Mixed Grain for Salad with Oat Rice"
+                    },
+                    "beef,Apple,BroccoliPorridge": {
+                        "label": "Beef, Apple, Broccoli Porridge"
+                    },
+                    "quinoaRice": {
+                        "label": "Quinoa Rice"
+                    },
+                    "abalonePorridge": {
+                        "label": "Abalone Porridge"
+                    },
+                    "whiteRice": {
+                        "label": "White Rice"
+                    },
+                    "yakbab": {
+                        "label": "Yakbab"
+                    },
                     "mixedGrains": {
                         "label": "Mixed Grains"
                     },
@@ -878,51 +987,30 @@
                     "cod-Meat,Vitamin,CarrotPorridge": {
                         "label": "Cod-Meat, Vitamin, Carrot Porridge"
                     },
-                    "mixedGrainForSaladWithBarley": {
-                        "label": "Mixed Grain for Salad with Barley"
-                    },
-                    "galbijjim": {
-                        "label": "Galbijjim"
-                    },
-                    "riceWithSeasonedVegetablesInHotPot": {
-                        "label": "Rice with Seasoned Vegetables in Hot Pot"
-                    },
-                    "riceWithWebfootOctopusAndSaussureaInHotPot": {
-                        "label": "Rice with Webfoot Octopus and Saussurea in Hot Pot"
+                    "quickMeal": {
+                        "label": "Quick Meal"
                     },
                     "riceWithSpicyWebfootOctopusInHotPot": {
                         "label": "Rice with Spicy Webfoot Octopus in Hot Pot"
                     },
-                    "mixedGrainForSaladWithQuinoa": {
-                        "label": "Mixed Grain for Salad with Quinoa"
-                    },
-                    "mixedGrainForSaladWithBrownRice(2Cup)": {
-                        "label": "Mixed Grain for Salad with Brown Rice (2 Cup)"
-                    },
                     "mixedGrainForSaladWithMillet": {
                         "label": "Mixed Grain for Salad with Millet"
                     },
-                    "mixedGrainForVitality": {
-                        "label": "Mixed Grain for Vitality"
-                    },
                     "scorchedRice": {
                         "label": "Scorched Rice"
                     },
                     "steamedPotato": {
                         "label": "Steamed Potato"
                     },
-                    "riceWithBeefAndAssortedMushroomsInHotPot": {
-                        "label": "Rice with Beef and Assorted Mushrooms in Hot Pot"
-                    },
                     "chicken,PineNut,Chestnut,Spinach,SoftBoiledRice": {
                         "label": "Chicken, Pine Nut, Chestnut, Spinach, Soft Boiled Rice"
                     },
+                    "riceWithBeefAndAssortedMushroomsInHotPot": {
+                        "label": "Rice with Beef and Assorted Mushrooms in Hot Pot"
+                    },
                     "chicken,Zucchini,SweetPotato,StickyRicePorridge": {
                         "label": "Chicken, Zucchini, Sweet Potato, Sticky Rice Porridge"
                     },
-                    "plainQuick": {
-                        "label": "Plain Quick"
-                    },
                     "beef,KingTrumpetMushroom,BroccoliPorridge": {
                         "label": "Beef, King Trumpet Mushroom, Broccoli Porridge"
                     },
@@ -932,18 +1020,12 @@
                     "nutritiousRiceInHotPot": {
                         "label": "Nutritious Rice in Hot Pot"
                     },
-                    "mixedGrainForSaladWithChickpea(2Cup)": {
-                        "label": "Mixed Grain for Salad with Chickpea (2 Cup)"
-                    },
-                    "wellCookedPlainRice": {
-                        "label": "Well Cooked Plain Rice"
+                    "noPressureSteaming": {
+                        "label": "No Pressure Steaming"
                     },
                     "chicken,SweetPotato,Beet,BeetPorridge": {
                         "label": "Chicken, Sweet Potato, Beet, Beet Porridge"
                     },
-                    "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice": {
-                        "label": "Beef, Beet, Enoki Mushroom, Perilla Seeds, Soft Boiled Rice"
-                    },
                     "beef,Zucchini,PearPorridge": {
                         "label": "Beef, Zucchini, Pear Porridge"
                     },
@@ -953,30 +1035,21 @@
                     "nutritiousPorridge": {
                         "label": "Nutritious Porridge"
                     },
-                    "chicken,BeanSprouts,Jujube,StickyRicePorridge": {
-                        "label": "Chicken, Bean Sprouts, Jujube, Sticky Rice Porridge"
-                    },
                     "chicken,BokChoy,BananaPorridge": {
                         "label": "Chicken, BokChoy, Banana Porridge"
                     },
-                    "frozenPlainRice": {
-                        "label": "Frozen Plain Rice"
+                    "chicken,BeanSprouts,Jujube,StickyRicePorridge": {
+                        "label": "Chicken, Bean Sprouts, Jujube, Sticky Rice Porridge"
                     },
                     "samgyetang": {
                         "label": "Samgyetang"
                     },
-                    "mixedGrainForSlim": {
-                        "label": "Mixed Grain for Slim"
-                    },
                     "boiledEgg": {
                         "label": "Boiled Egg"
                     },
                     "mixedGrainForSaladWithChickpea(1Cup)": {
                         "label": "Mixed Grain for Salad with Chickpea (1 Cup)"
                     },
-                    "steamedDish": {
-                        "label": "Steamed Dish"
-                    },
                     "lentilBeanRice": {
                         "label": "Lentil Bean Rice"
                     }
diff --git a/json/riceCooker.i18n.fr.json b/json/riceCooker.i18n.fr.json
index 1c860bd5..3059f006 100755
--- a/json/riceCooker.i18n.fr.json
+++ b/json/riceCooker.i18n.fr.json
@@ -1,6 +1,7 @@
 {
     "tag": "fr",
     "label": "Rice Cooker",
+    "description": "Control and monitor the cooking functions and status of a rice cooker.",
     "attributes": {
         "completionTime": {
             "label": "Temps restant",
@@ -71,29 +72,17 @@
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {
                 "value": {
-                    "superGrains": {
-                        "label": "Super Grains"
-                    },
-                    "plainPorridge": {
-                        "label": "Plain Porridge"
-                    },
                     "mixedGrainForSaladWithAdlay": {
                         "label": "Mixed Grain for Salad with Adlay"
                     },
                     "scorchedRiceTea": {
                         "label": "Scorched Rice Tea"
                     },
-                    "kamutRice": {
-                        "label": "Kamut Rice"
-                    },
                     "odaemi": {
                         "label": "Odaemi"
                     },
-                    "mixedGrainForSaladWithKamut": {
-                        "label": "Mixed Grain for Salad with Kamut"
-                    },
-                    "sousVide": {
-                        "label": "Sous Vide"
+                    "riceWithRipeKimchiAndAbaloneInHotPot": {
+                        "label": "Rice with Ripe Kimchi and Abalone in Hot Pot"
                     },
                     "mixedGrainsQuick": {
                         "label": "Mixed Grains Quick"
@@ -101,113 +90,65 @@
                     "alchanmi": {
                         "label": "Alchanmi"
                     },
-                    "riceWithRipeKimchiAndAbaloneInHotPot": {
-                        "label": "Rice with Ripe Kimchi and Abalone in Hot Pot"
-                    },
                     "riceForGimbap": {
                         "label": "Rice for Gimbap"
                     },
-                    "riceWithAssortedMushrommsInHotPot": {
-                        "label": "Rice with Assorted Mushromms in Hot Pot"
-                    },
                     "beef,ShiitakeMushroom,EggPorridge": {
                         "label": "Beef, Shiitake Mushroom, Egg Porridge"
                     },
-                    "stickyPlainRice": {
-                        "label": "Sticky Plain Rice"
-                    },
                     "frozenMixedGrain": {
                         "label": "Frozen Mixed Grain"
                     },
+                    "stickyPlainRice": {
+                        "label": "Sticky Plain Rice"
+                    },
                     "beef,Cabbage,WhiteMushroom,Jujube,SoftBoiledRice": {
                         "label": "Beef,Cabbage,White Mushroom,Jujube,Soft Boiled Rice"
                     },
                     "broccoliPorridge": {
                         "label": "Broccoli Porridge"
                     },
-                    "bakedEgg": {
-                        "label": "Baked Egg"
-                    },
-                    "chickpeaRice": {
-                        "label": "Chickpea Rice"
-                    },
-                    "pineNutPorridge": {
-                        "label": "Pine Nut Porridge"
-                    },
                     "riceWithBeans": {
                         "label": "Rice with Beans"
                     },
+                    "babyFood": {
+                        "label": "Baby Food"
+                    },
                     "barleyMixedGrainRice": {
                         "label": "Barley Mixed Grain Rice"
                     },
-                    "mixedGrainForSaladWithQuinoa(1Cup)": {
-                        "label": "Mixed Grain for Salad with Quinoa (1Cup)"
-                    },
                     "codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice": {
                         "label": "Cod Flesh, Sweet Pumpkin, Mung-Bean Sprouts, Black Sesame, Soft Boiled Rice"
                     },
-                    "babyFoodStep1": {
-                        "label": "Baby Food Step 1"
-                    },
-                    "babyFoodStep2": {
-                        "label": "Baby Food Step 2"
-                    },
                     "riceWithTruffledBulgogiInHotPot": {
                         "label": "Rice with Truffled Bulgogi in Hot Pot"
                     },
-                    "babyFoodStep3": {
-                        "label": "Baby Food Step 3"
-                    },
-                    "haedeul": {
-                        "label": "Haedeul"
-                    },
-                    "mixedGrainForSaladWithLentilBean(1Cup)": {
-                        "label": "Mixed Grain for Salad with Lentil Bean (1Cup)"
-                    },
-                    "brownRice100": {
-                        "label": "Brown Rice 100%"
-                    },
                     "riceWithAbaloneInHotPot": {
                         "label": "Rice with Abalone in Hot Pot"
                     },
-                    "konjacRice": {
-                        "label": "Konjac Rice"
-                    },
-                    "beef,Apple,BroccoliPorridge": {
-                        "label": "Beef, Apple, Broccoli Porridge"
-                    },
                     "chicken,SweetPumpkin,Cabbage,StickyRicePorridge": {
                         "label": "Chicken, Sweet Pumpkin, Cabbage, Sticky Rice Porridge"
                     },
                     "mixedGrainForSaladWithQuinoa(2Cup)": {
                         "label": "Mixed Grain for Salad with Quinoa (2Cup)"
                     },
-                    "mixedGrainForSaladWithOatRice": {
-                        "label": "Mixed Grain for Salad with Oat Rice"
-                    },
                     "mixedGrainForSalad": {
                         "label": "Mixed Grain for Salad"
                     },
-                    "quinoaRice": {
-                        "label": "Quinoa Rice"
-                    },
                     "steamedSweetPotato": {
                         "label": "Steamed Sweet Potato"
                     },
                     "mixedGrainForSaladWithLentilBean": {
                         "label": "Mixed Grain for Salad with Lentil Bean"
                     },
-                    "oatRice": {
-                        "label": "Oat Rice"
-                    },
                     "mixedGrainForSaladWithLentilBean(2Cup)": {
                         "label": "Mixed Grain For Salad with Lentil Bean (2 Cup)"
                     },
                     "mixedGrainForSaladWithBrownRice": {
                         "label": "Mixed Grain for Salad with Brown Rice"
                     },
-                    "abalonePorridge": {
-                        "label": "Abalone Porridge"
+                    "oatRice": {
+                        "label": "Oat Rice"
                     },
                     "riceWithBrackenAndSteakInHotPot": {
                         "label": "Rice with Bracken and Steak in Hot Pot"
@@ -218,27 +159,18 @@
                     "mixedGrainForSaladWithChickpea": {
                         "label": "Mixed Grain for Salad with Chickpea"
                     },
-                    "yakbab": {
-                        "label": "Yakbab"
+                    "highHeatMixedGrains": {
+                        "label": "High Heat Mixed Grains"
                     },
                     "riceWithSteakInHotPot": {
                         "label": "rice with Steak in Hot Pot"
                     },
-                    "mixedGrains": {
-                        "label": "Mixed Grains"
-                    },
-                    "riceWithBeefAndBeanSproutsInHotPot": {
-                        "label": "Rice with Beef and Bean Sprouts in Hot Pot"
-                    },
-                    "mixedGrainForSaladWithBrownRice(1Cup)": {
-                        "label": "Mixed Grain for Salad with Brown Rice (1 Cup)"
+                    "germinatedBrownRice": {
+                        "label": "Germinated Brown Rice"
                     },
                     "mixedGrainForSaladWithBarley": {
                         "label": "Mixed Grain for Salad with Barley"
                     },
-                    "cod-Meat,Vitamin,CarrotPorridge": {
-                        "label": "Cod-Meat, Vitamin, Carrot Porridge"
-                    },
                     "galbijjim": {
                         "label": "Galbijjim"
                     },
@@ -248,21 +180,132 @@
                     "riceWithWebfootOctopusAndSaussureaInHotPot": {
                         "label": "Rice with Webfoot Octopus and Saussurea in Hot Pot"
                     },
-                    "riceWithSpicyWebfootOctopusInHotPot": {
-                        "label": "Rice with Spicy Webfoot Octopus in Hot Pot"
-                    },
                     "mixedGrainForSaladWithQuinoa": {
                         "label": "Mixed Grain for Salad with Quinoa"
                     },
                     "mixedGrainForSaladWithBrownRice(2Cup)": {
                         "label": "Mixed Grain for Salad with Brown Rice (2 Cup)"
                     },
-                    "mixedGrainForSaladWithMillet": {
-                        "label": "Mixed Grain for Salad with Millet"
-                    },
                     "mixedGrainForVitality": {
                         "label": "Mixed Grain for Vitality"
                     },
+                    "plainQuick": {
+                        "label": "Plain Quick"
+                    },
+                    "mixedGrainForSaladWithChickpea(2Cup)": {
+                        "label": "Mixed Grain for Salad with Chickpea (2 Cup)"
+                    },
+                    "wellCookedPlainRice": {
+                        "label": "Well Cooked Plain Rice"
+                    },
+                    "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice": {
+                        "label": "Beef, Beet, Enoki Mushroom, Perilla Seeds, Soft Boiled Rice"
+                    },
+                    "vegetableRice": {
+                        "label": "Vegetable Rice"
+                    },
+                    "grains": {
+                        "label": "Grains"
+                    },
+                    "frozenPlainRice": {
+                        "label": "Frozen Plain Rice"
+                    },
+                    "mixedGrainForSlim": {
+                        "label": "Mixed Grain for Slim"
+                    },
+                    "steamedDish": {
+                        "label": "Steamed Dish"
+                    },
+                    "superGrains": {
+                        "label": "Super Grains"
+                    },
+                    "plainPorridge": {
+                        "label": "Plain Porridge"
+                    },
+                    "kamutRice": {
+                        "label": "Kamut Rice"
+                    },
+                    "mixedGrainForSaladWithKamut": {
+                        "label": "Mixed Grain for Salad with Kamut"
+                    },
+                    "sousVide": {
+                        "label": "Sous Vide"
+                    },
+                    "riceWithAssortedMushrommsInHotPot": {
+                        "label": "Rice with Assorted Mushromms in Hot Pot"
+                    },
+                    "bakedEgg": {
+                        "label": "Baked Egg"
+                    },
+                    "chickpeaRice": {
+                        "label": "Chickpea Rice"
+                    },
+                    "pineNutPorridge": {
+                        "label": "Pine Nut Porridge"
+                    },
+                    "mixedGrainForSaladWithQuinoa(1Cup)": {
+                        "label": "Mixed Grain for Salad with Quinoa (1Cup)"
+                    },
+                    "babyFoodStep1": {
+                        "label": "Baby Food Step 1"
+                    },
+                    "babyFoodStep2": {
+                        "label": "Baby Food Step 2"
+                    },
+                    "babyFoodStep3": {
+                        "label": "Baby Food Step 3"
+                    },
+                    "haedeul": {
+                        "label": "Haedeul"
+                    },
+                    "mixedGrainForSaladWithLentilBean(1Cup)": {
+                        "label": "Mixed Grain for Salad with Lentil Bean (1Cup)"
+                    },
+                    "brownRice100": {
+                        "label": "Brown Rice 100%"
+                    },
+                    "konjacRice": {
+                        "label": "Konjac Rice"
+                    },
+                    "beef,Apple,BroccoliPorridge": {
+                        "label": "Beef, Apple, Broccoli Porridge"
+                    },
+                    "mixedGrainForSaladWithOatRice": {
+                        "label": "Mixed Grain for Salad with Oat Rice"
+                    },
+                    "quinoaRice": {
+                        "label": "Quinoa Rice"
+                    },
+                    "abalonePorridge": {
+                        "label": "Abalone Porridge"
+                    },
+                    "whiteRice": {
+                        "label": "White Rice"
+                    },
+                    "yakbab": {
+                        "label": "Yakbab"
+                    },
+                    "mixedGrains": {
+                        "label": "Mixed Grains"
+                    },
+                    "riceWithBeefAndBeanSproutsInHotPot": {
+                        "label": "Rice with Beef and Bean Sprouts in Hot Pot"
+                    },
+                    "mixedGrainForSaladWithBrownRice(1Cup)": {
+                        "label": "Mixed Grain for Salad with Brown Rice (1 Cup)"
+                    },
+                    "cod-Meat,Vitamin,CarrotPorridge": {
+                        "label": "Cod-Meat, Vitamin, Carrot Porridge"
+                    },
+                    "quickMeal": {
+                        "label": "Quick Meal"
+                    },
+                    "riceWithSpicyWebfootOctopusInHotPot": {
+                        "label": "Rice with Spicy Webfoot Octopus in Hot Pot"
+                    },
+                    "mixedGrainForSaladWithMillet": {
+                        "label": "Mixed Grain for Salad with Millet"
+                    },
                     "scorchedRice": {
                         "label": "Scorched Rice"
                     },
@@ -278,41 +321,29 @@
                     "chicken,Zucchini,SweetPotato,StickyRicePorridge": {
                         "label": "Chicken, Zucchini, Sweet Potato, Sticky Rice Porridge"
                     },
-                    "plainQuick": {
-                        "label": "Plain Quick"
-                    },
                     "beef,KingTrumpetMushroom,BroccoliPorridge": {
                         "label": "Beef, King Trumpet Mushroom, Broccoli Porridge"
                     },
                     "nutritiousRiceInHotPot": {
                         "label": "Nutritious Rice in Hot Pot"
                     },
-                    "mixedGrainForSaladWithChickpea(2Cup)": {
-                        "label": "Mixed Grain for Salad with Chickpea (2 Cup)"
-                    },
                     "chicken,Cheese,Beet,Eggplant,SoftBoiledRice": {
                         "label": "Chicken, Cheese, Beet, Eggplant, Soft Boiled Rice"
                     },
-                    "wellCookedPlainRice": {
-                        "label": "Well Cooked Plain Rice"
+                    "noPressureSteaming": {
+                        "label": "No Pressure Steaming"
                     },
                     "chicken,SweetPotato,Beet,BeetPorridge": {
                         "label": "Chicken, Sweet Potato, Beet, Beet Porridge"
                     },
-                    "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice": {
-                        "label": "Beef, Beet, Enoki Mushroom, Perilla Seeds, Soft Boiled Rice"
-                    },
                     "beef,Zucchini,PearPorridge": {
                         "label": "Beef, Zucchini, Pear Porridge"
                     },
-                    "potatoCarrotPorridge": {
-                        "label": "Potato Carrot Porridge"
-                    },
                     "nutritiousPorridge": {
                         "label": "Nutritious Porridge"
                     },
-                    "frozenPlainRice": {
-                        "label": "Frozen Plain Rice"
+                    "potatoCarrotPorridge": {
+                        "label": "Potato Carrot Porridge"
                     },
                     "chicken,BeanSprouts,Jujube,StickyRicePorridge": {
                         "label": "Chicken, Bean Sprouts, Jujube, Sticky Rice Porridge"
@@ -323,18 +354,12 @@
                     "samgyetang": {
                         "label": "Samgyetang"
                     },
-                    "mixedGrainForSlim": {
-                        "label": "Mixed Grain for Slim"
-                    },
                     "boiledEgg": {
                         "label": "Boiled Egg"
                     },
                     "mixedGrainForSaladWithChickpea(1Cup)": {
                         "label": "Mixed Grain for Salad with Chickpea (1 Cup)"
                     },
-                    "steamedDish": {
-                        "label": "Steamed Dish"
-                    },
                     "lentilBeanRice": {
                         "label": "Lentil Bean Rice"
                     }
@@ -419,6 +444,9 @@
                     "barleyMixedGrainRice": {
                         "label": "Riz avec orge et mélange de céréales"
                     },
+                    "babyFood": {
+                        "label": "Nourriture pour bébé"
+                    },
                     "codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice": {
                         "label": "Cabillaud, citrouille douce, germes de haricot, riz cuit au sésame"
                     },
@@ -461,9 +489,15 @@
                     "mixedGrainForSaladWithChickpea": {
                         "label": "Mélange de céréales et pois chiches en salade"
                     },
+                    "highHeatMixedGrains": {
+                        "label": "Mélange de céréales à haute température"
+                    },
                     "riceWithSteakInHotPot": {
                         "label": "Riz cuit dans un pot en grès avec steak"
                     },
+                    "germinatedBrownRice": {
+                        "label": "Riz brun germé"
+                    },
                     "mixedGrainForSaladWithBarley": {
                         "label": "Mélange de céréales et orge en salade"
                     },
@@ -497,6 +531,12 @@
                     "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice": {
                         "label": "Bœuf, betterave, champignons enoki, riz cuit aux graines de pérille"
                     },
+                    "vegetableRice": {
+                        "label": "Riz et légumes"
+                    },
+                    "grains": {
+                        "label": "Graines"
+                    },
                     "frozenPlainRice": {
                         "label": "Riz blanc surgelé"
                     },
@@ -629,6 +669,9 @@
                     "abalonePorridge": {
                         "label": "Bouillie de riz à l'ormeau"
                     },
+                    "whiteRice": {
+                        "label": "Riz blanc"
+                    },
                     "yakbab": {
                         "label": "Yakbap"
                     },
@@ -644,6 +687,9 @@
                     "cod-Meat,Vitamin,CarrotPorridge": {
                         "label": "Cabillaud, vitamine, porridge carotte"
                     },
+                    "quickMeal": {
+                        "label": "Repas rapide"
+                    },
                     "riceWithSpicyWebfootOctopusInHotPot": {
                         "label": "Riz cuit dans un pot en grès avec poulpe ocellé"
                     },
@@ -674,6 +720,9 @@
                     "chicken,Cheese,Beet,Eggplant,SoftBoiledRice": {
                         "label": "Poulet, fromage, betterave, riz cuit aux aubergines"
                     },
+                    "noPressureSteaming": {
+                        "label": "Cuisson vapeur sans pression"
+                    },
                     "chicken,SweetPotato,Beet,BeetPorridge": {
                         "label": "Poulet, patate douce, betterave, porridge aux feuilles de betterave"
                     },
@@ -713,41 +762,23 @@
             "displayTemplate": "{{device.label}} {{attribute}} are {{value}}",
             "i18n": {
                 "value": {
-                    "superGrains": {
-                        "label": "Super Grains"
-                    },
-                    "plainPorridge": {
-                        "label": "Plain Porridge"
-                    },
                     "mixedGrainForSaladWithAdlay": {
                         "label": "Mixed Grain for Salad with Adlay"
                     },
                     "scorchedRiceTea": {
                         "label": "Scorched Rice Tea"
                     },
-                    "kamutRice": {
-                        "label": "Kamut Rice"
-                    },
-                    "mixedGrainForSaladWithKamut": {
-                        "label": "Mixed Grain for Salad with Kamut"
-                    },
                     "odaemi": {
                         "label": "Odaemi"
                     },
-                    "sousVide": {
-                        "label": "Sous Vide"
-                    },
-                    "riceWithRipeKimchiAndAbaloneInHotPot": {
-                        "label": "Rice with Ripe Kimchi and Abalone in Hot Pot"
-                    },
                     "mixedGrainsQuick": {
                         "label": "Mixed Grains Quick"
                     },
                     "alchanmi": {
                         "label": "Alchanmi"
                     },
-                    "riceWithAssortedMushrommsInHotPot": {
-                        "label": "Rice with Assorted Mushromms in Hot Pot"
+                    "riceWithRipeKimchiAndAbaloneInHotPot": {
+                        "label": "Rice with Ripe Kimchi and Abalone in Hot Pot"
                     },
                     "riceForGimbap": {
                         "label": "Rice for Gimbap"
@@ -755,32 +786,23 @@
                     "beef,ShiitakeMushroom,EggPorridge": {
                         "label": "Beef, Shiitake Mushroom, Egg Porridge"
                     },
-                    "stickyPlainRice": {
-                        "label": "Sticky Plain Rice"
-                    },
                     "frozenMixedGrain": {
                         "label": "Frozen Mixed Grain"
                     },
+                    "stickyPlainRice": {
+                        "label": "Sticky Plain Rice"
+                    },
                     "beef,Cabbage,WhiteMushroom,Jujube,SoftBoiledRice": {
                         "label": "Beef,Cabbage,White Mushroom,Jujube,Soft Boiled Rice"
                     },
                     "broccoliPorridge": {
                         "label": "Broccoli Porridge"
                     },
-                    "chickpeaRice": {
-                        "label": "Chickpea Rice"
-                    },
-                    "bakedEgg": {
-                        "label": "Baked Egg"
-                    },
-                    "pineNutPorridge": {
-                        "label": "Pine Nut Porridge"
-                    },
                     "riceWithBeans": {
                         "label": "Rice with Beans"
                     },
-                    "mixedGrainForSaladWithQuinoa(1Cup)": {
-                        "label": "Mixed Grain for Salad with Quinoa (1Cup)"
+                    "babyFood": {
+                        "label": "Baby Food"
                     },
                     "barleyMixedGrainRice": {
                         "label": "Barley Mixed Grain Rice"
@@ -788,54 +810,24 @@
                     "codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice": {
                         "label": "Cod Flesh, Sweet Pumpkin, Mung-Bean Sprouts, Black Sesame, Soft Boiled Rice"
                     },
-                    "babyFoodStep1": {
-                        "label": "Baby Food Step 1"
-                    },
-                    "babyFoodStep2": {
-                        "label": "Baby Food Step 2"
-                    },
-                    "babyFoodStep3": {
-                        "label": "Baby Food Step 3"
-                    },
                     "riceWithTruffledBulgogiInHotPot": {
                         "label": "Rice with Truffled Bulgogi in Hot Pot"
                     },
-                    "haedeul": {
-                        "label": "Haedeul"
-                    },
-                    "mixedGrainForSaladWithLentilBean(1Cup)": {
-                        "label": "Mixed Grain for Salad with Lentil Bean (1Cup)"
-                    },
-                    "brownRice100": {
-                        "label": "Brown Rice 100%"
-                    },
                     "riceWithAbaloneInHotPot": {
                         "label": "Rice with Abalone in Hot Pot"
                     },
-                    "konjacRice": {
-                        "label": "Konjac Rice"
-                    },
-                    "chicken,SweetPumpkin,Cabbage,StickyRicePorridge": {
-                        "label": "Chicken, Sweet Pumpkin, Cabbage, Sticky Rice Porridge"
-                    },
-                    "mixedGrainForSaladWithOatRice": {
-                        "label": "Mixed Grain for Salad with Oat Rice"
-                    },
                     "mixedGrainForSalad": {
                         "label": "Mixed Grain for Salad"
                     },
-                    "beef,Apple,BroccoliPorridge": {
-                        "label": "Beef, Apple, Broccoli Porridge"
-                    },
                     "mixedGrainForSaladWithQuinoa(2Cup)": {
                         "label": "Mixed Grain for Salad with Quinoa (2Cup)"
                     },
+                    "chicken,SweetPumpkin,Cabbage,StickyRicePorridge": {
+                        "label": "Chicken, Sweet Pumpkin, Cabbage, Sticky Rice Porridge"
+                    },
                     "steamedSweetPotato": {
                         "label": "Steamed Sweet Potato"
                     },
-                    "quinoaRice": {
-                        "label": "Quinoa Rice"
-                    },
                     "mixedGrainForSaladWithLentilBean": {
                         "label": "Mixed Grain for Salad with Lentil Bean"
                     },
@@ -848,9 +840,6 @@
                     "mixedGrainForSaladWithLentilBean(2Cup)": {
                         "label": "Mixed Grain For Salad with Lentil Bean (2 Cup)"
                     },
-                    "abalonePorridge": {
-                        "label": "Abalone Porridge"
-                    },
                     "riceWithBrackenAndSteakInHotPot": {
                         "label": "Rice with Bracken and Steak in Hot Pot"
                     },
@@ -860,12 +849,132 @@
                     "mixedGrainForSaladWithChickpea": {
                         "label": "Mixed Grain for Salad with Chickpea"
                     },
-                    "yakbab": {
-                        "label": "Yakbab"
+                    "highHeatMixedGrains": {
+                        "label": "High Heat Mixed Grains"
+                    },
+                    "germinatedBrownRice": {
+                        "label": "Germinated Brown Rice"
                     },
                     "riceWithSteakInHotPot": {
                         "label": "rice with Steak in Hot Pot"
                     },
+                    "mixedGrainForSaladWithBarley": {
+                        "label": "Mixed Grain for Salad with Barley"
+                    },
+                    "riceWithSeasonedVegetablesInHotPot": {
+                        "label": "Rice with Seasoned Vegetables in Hot Pot"
+                    },
+                    "galbijjim": {
+                        "label": "Galbijjim"
+                    },
+                    "riceWithWebfootOctopusAndSaussureaInHotPot": {
+                        "label": "Rice with Webfoot Octopus and Saussurea in Hot Pot"
+                    },
+                    "mixedGrainForSaladWithQuinoa": {
+                        "label": "Mixed Grain for Salad with Quinoa"
+                    },
+                    "mixedGrainForSaladWithBrownRice(2Cup)": {
+                        "label": "Mixed Grain for Salad with Brown Rice (2 Cup)"
+                    },
+                    "mixedGrainForVitality": {
+                        "label": "Mixed Grain for Vitality"
+                    },
+                    "plainQuick": {
+                        "label": "Plain Quick"
+                    },
+                    "mixedGrainForSaladWithChickpea(2Cup)": {
+                        "label": "Mixed Grain for Salad with Chickpea (2 Cup)"
+                    },
+                    "wellCookedPlainRice": {
+                        "label": "Well Cooked Plain Rice"
+                    },
+                    "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice": {
+                        "label": "Beef, Beet, Enoki Mushroom, Perilla Seeds, Soft Boiled Rice"
+                    },
+                    "vegetableRice": {
+                        "label": "Vegetable Rice"
+                    },
+                    "grains": {
+                        "label": "Grains"
+                    },
+                    "frozenPlainRice": {
+                        "label": "Frozen Plain Rice"
+                    },
+                    "mixedGrainForSlim": {
+                        "label": "Mixed Grain for Slim"
+                    },
+                    "steamedDish": {
+                        "label": "Steamed Dish"
+                    },
+                    "superGrains": {
+                        "label": "Super Grains"
+                    },
+                    "plainPorridge": {
+                        "label": "Plain Porridge"
+                    },
+                    "kamutRice": {
+                        "label": "Kamut Rice"
+                    },
+                    "mixedGrainForSaladWithKamut": {
+                        "label": "Mixed Grain for Salad with Kamut"
+                    },
+                    "sousVide": {
+                        "label": "Sous Vide"
+                    },
+                    "riceWithAssortedMushrommsInHotPot": {
+                        "label": "Rice with Assorted Mushromms in Hot Pot"
+                    },
+                    "pineNutPorridge": {
+                        "label": "Pine Nut Porridge"
+                    },
+                    "chickpeaRice": {
+                        "label": "Chickpea Rice"
+                    },
+                    "bakedEgg": {
+                        "label": "Baked Egg"
+                    },
+                    "mixedGrainForSaladWithQuinoa(1Cup)": {
+                        "label": "Mixed Grain for Salad with Quinoa (1Cup)"
+                    },
+                    "babyFoodStep1": {
+                        "label": "Baby Food Step 1"
+                    },
+                    "babyFoodStep2": {
+                        "label": "Baby Food Step 2"
+                    },
+                    "babyFoodStep3": {
+                        "label": "Baby Food Step 3"
+                    },
+                    "haedeul": {
+                        "label": "Haedeul"
+                    },
+                    "mixedGrainForSaladWithLentilBean(1Cup)": {
+                        "label": "Mixed Grain for Salad with Lentil Bean (1Cup)"
+                    },
+                    "brownRice100": {
+                        "label": "Brown Rice 100%"
+                    },
+                    "konjacRice": {
+                        "label": "Konjac Rice"
+                    },
+                    "mixedGrainForSaladWithOatRice": {
+                        "label": "Mixed Grain for Salad with Oat Rice"
+                    },
+                    "beef,Apple,BroccoliPorridge": {
+                        "label": "Beef, Apple, Broccoli Porridge"
+                    },
+                    "quinoaRice": {
+                        "label": "Quinoa Rice"
+                    },
+                    "abalonePorridge": {
+                        "label": "Abalone Porridge"
+                    },
+                    "whiteRice": {
+                        "label": "White Rice"
+                    },
+                    "yakbab": {
+                        "label": "Yakbab"
+                    },
                     "mixedGrains": {
                         "label": "Mixed Grains"
                     },
@@ -878,51 +987,30 @@
                     "cod-Meat,Vitamin,CarrotPorridge": {
                         "label": "Cod-Meat, Vitamin, Carrot Porridge"
                     },
-                    "mixedGrainForSaladWithBarley": {
-                        "label": "Mixed Grain for Salad with Barley"
-                    },
-                    "galbijjim": {
-                        "label": "Galbijjim"
-                    },
-                    "riceWithSeasonedVegetablesInHotPot": {
-                        "label": "Rice with Seasoned Vegetables in Hot Pot"
-                    },
-                    "riceWithWebfootOctopusAndSaussureaInHotPot": {
-                        "label": "Rice with Webfoot Octopus and Saussurea in Hot Pot"
+                    "quickMeal": {
+                        "label": "Quick Meal"
                     },
                     "riceWithSpicyWebfootOctopusInHotPot": {
                         "label": "Rice with Spicy Webfoot Octopus in Hot Pot"
                     },
-                    "mixedGrainForSaladWithQuinoa": {
-                        "label": "Mixed Grain for Salad with Quinoa"
-                    },
-                    "mixedGrainForSaladWithBrownRice(2Cup)": {
-                        "label": "Mixed Grain for Salad with Brown Rice (2 Cup)"
-                    },
                     "mixedGrainForSaladWithMillet": {
                         "label": "Mixed Grain for Salad with Millet"
                     },
-                    "mixedGrainForVitality": {
-                        "label": "Mixed Grain for Vitality"
-                    },
                     "scorchedRice": {
                         "label": "Scorched Rice"
                     },
                     "steamedPotato": {
                         "label": "Steamed Potato"
                     },
-                    "riceWithBeefAndAssortedMushroomsInHotPot": {
-                        "label": "Rice with Beef and Assorted Mushrooms in Hot Pot"
-                    },
                     "chicken,PineNut,Chestnut,Spinach,SoftBoiledRice": {
                         "label": "Chicken, Pine Nut, Chestnut, Spinach, Soft Boiled Rice"
                     },
+                    "riceWithBeefAndAssortedMushroomsInHotPot": {
+                        "label": "Rice with Beef and Assorted Mushrooms in Hot Pot"
+                    },
                     "chicken,Zucchini,SweetPotato,StickyRicePorridge": {
                         "label": "Chicken, Zucchini, Sweet Potato, Sticky Rice Porridge"
                     },
-                    "plainQuick": {
-                        "label": "Plain Quick"
-                    },
                     "beef,KingTrumpetMushroom,BroccoliPorridge": {
                         "label": "Beef, King Trumpet Mushroom, Broccoli Porridge"
                     },
@@ -932,18 +1020,12 @@
                     "nutritiousRiceInHotPot": {
                         "label": "Nutritious Rice in Hot Pot"
                     },
-                    "mixedGrainForSaladWithChickpea(2Cup)": {
-                        "label": "Mixed Grain for Salad with Chickpea (2 Cup)"
-                    },
-                    "wellCookedPlainRice": {
-                        "label": "Well Cooked Plain Rice"
+                    "noPressureSteaming": {
+                        "label": "No Pressure Steaming"
                     },
                     "chicken,SweetPotato,Beet,BeetPorridge": {
                         "label": "Chicken, Sweet Potato, Beet, Beet Porridge"
                     },
-                    "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice": {
-                        "label": "Beef, Beet, Enoki Mushroom, Perilla Seeds, Soft Boiled Rice"
-                    },
                     "beef,Zucchini,PearPorridge": {
                         "label": "Beef, Zucchini, Pear Porridge"
                     },
@@ -953,30 +1035,21 @@
                     "nutritiousPorridge": {
                         "label": "Nutritious Porridge"
                     },
-                    "chicken,BeanSprouts,Jujube,StickyRicePorridge": {
-                        "label": "Chicken, Bean Sprouts, Jujube, Sticky Rice Porridge"
-                    },
                     "chicken,BokChoy,BananaPorridge": {
                         "label": "Chicken, BokChoy, Banana Porridge"
                     },
-                    "frozenPlainRice": {
-                        "label": "Frozen Plain Rice"
+                    "chicken,BeanSprouts,Jujube,StickyRicePorridge": {
+                        "label": "Chicken, Bean Sprouts, Jujube, Sticky Rice Porridge"
                     },
                     "samgyetang": {
                         "label": "Samgyetang"
                     },
-                    "mixedGrainForSlim": {
-                        "label": "Mixed Grain for Slim"
-                    },
                     "boiledEgg": {
                         "label": "Boiled Egg"
                     },
                     "mixedGrainForSaladWithChickpea(1Cup)": {
                         "label": "Mixed Grain for Salad with Chickpea (1 Cup)"
                     },
-                    "steamedDish": {
-                        "label": "Steamed Dish"
-                    },
                     "lentilBeanRice": {
                         "label": "Lentil Bean Rice"
                     }
diff --git a/json/riceCookerPresentation.json b/json/riceCookerPresentation.json
index ec151240..b229c1dc 100755
--- a/json/riceCookerPresentation.json
+++ b/json/riceCookerPresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.cookerState.i18n.value.ready.label}}",
+                        "value": "Ready",
                         "type": "active"
                     },
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.cookerState.i18n.value.running.label}}",
+                        "value": "Running",
                         "type": "active"
                     },
                     {
                         "key": "scheduled",
-                        "value": "{{i18n.attributes.cookerState.i18n.value.scheduled.label}}",
+                        "value": "Cooking scheduled",
                         "type": "active"
                     },
                     {
                         "key": "error",
-                        "value": "{{i18n.attributes.cookerState.i18n.value.error.label}}",
+                        "value": "Something's wrong",
                         "type": "active"
                     }
                 ]
@@ -31,27 +31,27 @@
                 "alternatives": [
                     {
                         "key": "cooking",
-                        "value": "{{i18n.attributes.cookerMode.i18n.value.cooking.label}}",
+                        "value": "Cook",
                         "type": "active"
                     },
                     {
                         "key": "keepWarm",
-                        "value": "{{i18n.attributes.cookerMode.i18n.value.keepWarm.label}}",
+                        "value": "Warm",
                         "type": "active"
                     },
                     {
                         "key": "reheating",
-                        "value": "{{i18n.attributes.cookerMode.i18n.value.reheating.label}}",
+                        "value": "Reheat",
                         "type": "active"
                     },
                     {
                         "key": "autoClean",
-                        "value": "{{i18n.attributes.cookerMode.i18n.value.autoClean.label}}",
+                        "value": "Auto clean",
                         "type": "active"
                     },
                     {
                         "key": "soakInnerPot",
-                        "value": "{{i18n.attributes.cookerMode.i18n.value.soakInnerPot.label}}",
+                        "value": "Soak inner pot",
                         "type": "active"
                     }
                 ]
@@ -78,36 +78,36 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.cookerState.label}}",
+            "label": "Cooker status",
             "displayType": "state",
             "state": {
                 "label": "{{cookerState.value}}",
                 "alternatives": [
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.cookerState.i18n.value.ready.label}}",
+                        "value": "Ready",
                         "type": "active"
                     },
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.cookerState.i18n.value.running.label}}",
+                        "value": "Running",
                         "type": "active"
                     },
                     {
                         "key": "scheduled",
-                        "value": "{{i18n.attributes.cookerState.i18n.value.scheduled.label}}",
+                        "value": "Cooking scheduled",
                         "type": "active"
                     },
                     {
                         "key": "error",
-                        "value": "{{i18n.attributes.cookerState.i18n.value.error.label}}",
+                        "value": "Something's wrong",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.cookerMode.label}}",
+            "label": "Mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -115,22 +115,22 @@
                     "alternatives": [
                         {
                             "key": "keepWarm",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.keepWarm.label}}",
+                            "value": "Warm",
                             "type": "active"
                         },
                         {
                             "key": "reheating",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.reheating.label}}",
+                            "value": "Reheat",
                             "type": "active"
                         },
                         {
                             "key": "autoClean",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.autoClean.label}}",
+                            "value": "Auto clean",
                             "type": "active"
                         },
                         {
                             "key": "soakInnerPot",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.soakInnerPot.label}}",
+                            "value": "Soak inner pot",
                             "type": "active"
                         }
                     ],
@@ -143,27 +143,27 @@
                     "alternatives": [
                         {
                             "key": "cooking",
-                            "value": "{{i18n.attributes.cookerMode.i18n.value.cooking.label}}",
+                            "value": "Cook",
                             "type": "active"
                         },
                         {
                             "key": "keepWarm",
-                            "value": "{{i18n.attributes.cookerMode.i18n.value.keepWarm.label}}",
+                            "value": "Warm",
                             "type": "active"
                         },
                         {
                             "key": "reheating",
-                            "value": "{{i18n.attributes.cookerMode.i18n.value.reheating.label}}",
+                            "value": "Reheat",
                             "type": "active"
                         },
                         {
                             "key": "autoClean",
-                            "value": "{{i18n.attributes.cookerMode.i18n.value.autoClean.label}}",
+                            "value": "Auto clean",
                             "type": "active"
                         },
                         {
                             "key": "soakInnerPot",
-                            "value": "{{i18n.attributes.cookerMode.i18n.value.soakInnerPot.label}}",
+                            "value": "Soak inner pot",
                             "type": "active"
                         }
                     ]
@@ -171,7 +171,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.menu.label}}",
+            "label": "Menu",
             "displayType": "list",
             "list": {
                 "command": {
@@ -179,547 +179,587 @@
                     "alternatives": [
                         {
                             "key": "stickyPlainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.stickyPlainRice.label}}",
+                            "value": "Sticky white rice",
                             "type": "active"
                         },
                         {
                             "key": "wellCookedPlainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.wellCookedPlainRice.label}}",
+                            "value": "Well-cooked white rice",
                             "type": "active"
                         },
                         {
                             "key": "frozenPlainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.frozenPlainRice.label}}",
+                            "value": "Frozen white rice",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrains",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrains.label}}",
+                            "value": "Mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "brownRice100",
-                            "value": "{{i18n.attributes.menu.i18n.value.brownRice100.label}}",
+                            "value": "100% brown rice",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBeans",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBeans.label}}",
+                            "value": "Rice with beans",
                             "type": "active"
                         },
                         {
                             "key": "barleyMixedGrainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.barleyMixedGrainRice.label}}",
+                            "value": "Rice with barley and mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "superGrains",
-                            "value": "{{i18n.attributes.menu.i18n.value.superGrains.label}}",
+                            "value": "Rice with super grains",
                             "type": "active"
                         },
                         {
                             "key": "frozenMixedGrain",
-                            "value": "{{i18n.attributes.menu.i18n.value.frozenMixedGrain.label}}",
+                            "value": "Frozen mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "cauldronRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.cauldronRice.label}}",
+                            "value": "Stone pot-style rice",
                             "type": "active"
                         },
                         {
                             "key": "riceForGimbap",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceForGimbap.label}}",
+                            "value": "Rice for gimbap",
                             "type": "active"
                         },
                         {
                             "key": "plainQuick",
-                            "value": "{{i18n.attributes.menu.i18n.value.plainQuick.label}}",
+                            "value": "Quick white rice",
                             "type": "active"
                         },
                         {
                             "key": "konjacRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.konjacRice.label}}",
+                            "value": "Konjac rice",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSalad",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSalad.label}}",
+                            "value": "Mixed grains for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainsQuick",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainsQuick.label}}",
+                            "value": "Quick mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "nutritiousRiceInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.nutritiousRiceInHotPot.label}}",
+                            "value": "Nutritious stone pot-style rice",
                             "type": "active"
                         },
                         {
                             "key": "steamedDish",
-                            "value": "{{i18n.attributes.menu.i18n.value.steamedDish.label}}",
+                            "value": "Steamed dish",
                             "type": "active"
                         },
                         {
                             "key": "nutritiousPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.nutritiousPorridge.label}}",
+                            "value": "Nutritious porridge",
                             "type": "active"
                         },
                         {
                             "key": "scorchedRiceTea",
-                            "value": "{{i18n.attributes.menu.i18n.value.scorchedRiceTea.label}}",
+                            "value": "Scorched rice tea",
                             "type": "active"
                         },
                         {
                             "key": "bakedEgg",
-                            "value": "{{i18n.attributes.menu.i18n.value.bakedEgg.label}}",
+                            "value": "Baked eggs",
                             "type": "active"
                         },
                         {
                             "key": "sousVide",
-                            "value": "{{i18n.attributes.menu.i18n.value.sousVide.label}}",
+                            "value": "Sous vide",
                             "type": "active"
                         },
                         {
                             "key": "scorchedRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.scorchedRice.label}}",
+                            "value": "Scorched rice",
                             "type": "active"
                         },
                         {
                             "key": "babyFoodStep1",
-                            "value": "{{i18n.attributes.menu.i18n.value.babyFoodStep1.label}}",
+                            "value": "Baby food step 1",
                             "type": "active"
                         },
                         {
                             "key": "babyFoodStep2",
-                            "value": "{{i18n.attributes.menu.i18n.value.babyFoodStep2.label}}",
+                            "value": "Baby food step 2",
                             "type": "active"
                         },
                         {
                             "key": "babyFoodStep3",
-                            "value": "{{i18n.attributes.menu.i18n.value.babyFoodStep3.label}}",
+                            "value": "Baby food step 3",
                             "type": "active"
                         },
                         {
                             "key": "riceWithSeasonedVegetablesInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithSeasonedVegetablesInHotPot.label}}",
+                            "value": "Stone pot-style rice with seasoned vegetables",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSlim",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSlim.label}}",
+                            "value": "Mixed grains for slim diet",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForVitality",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForVitality.label}}",
+                            "value": "Mixed grains for vitality",
                             "type": "active"
                         },
                         {
                             "key": "haedeul",
-                            "value": "{{i18n.attributes.menu.i18n.value.haedeul.label}}",
+                            "value": "Haedeul",
                             "type": "active"
                         },
                         {
                             "key": "alchanmi",
-                            "value": "{{i18n.attributes.menu.i18n.value.alchanmi.label}}",
+                            "value": "Alchanmi",
                             "type": "active"
                         },
                         {
                             "key": "odaemi",
-                            "value": "{{i18n.attributes.menu.i18n.value.odaemi.label}}",
+                            "value": "Odaemi",
                             "type": "active"
                         },
                         {
                             "key": "oatRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.oatRice.label}}",
+                            "value": "Rice with oats",
                             "type": "active"
                         },
                         {
                             "key": "chickpeaRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.chickpeaRice.label}}",
+                            "value": "Rice with chickpeas",
                             "type": "active"
                         },
                         {
                             "key": "quinoaRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.quinoaRice.label}}",
+                            "value": "Rice with quinoa",
                             "type": "active"
                         },
                         {
                             "key": "lentilBeanRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.lentilBeanRice.label}}",
+                            "value": "Rice with lentils",
                             "type": "active"
                         },
                         {
                             "key": "steamedSweetPotato",
-                            "value": "{{i18n.attributes.menu.i18n.value.steamedSweetPotato.label}}",
+                            "value": "Steamed sweet potato",
                             "type": "active"
                         },
                         {
                             "key": "galbijjim",
-                            "value": "{{i18n.attributes.menu.i18n.value.galbijjim.label}}",
+                            "value": "Galbijjim",
                             "type": "active"
                         },
                         {
                             "key": "samgyetang",
-                            "value": "{{i18n.attributes.menu.i18n.value.samgyetang.label}}",
+                            "value": "Samgyetang",
                             "type": "active"
                         },
                         {
                             "key": "riceWithWebfootOctopusAndSaussureaInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithWebfootOctopusAndSaussureaInHotPot.label}}",
+                            "value": "Stone pot-style rice with webfoot octopus and saussurea",
                             "type": "active"
                         },
                         {
                             "key": "riceWithAbaloneInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithAbaloneInHotPot.label}}",
+                            "value": "Stone pot-style rice with abalone",
                             "type": "active"
                         },
                         {
                             "key": "riceWithTruffledBulgogiInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithTruffledBulgogiInHotPot.label}}",
+                            "value": "Stone pot-style rice with steak",
                             "type": "active"
                         },
                         {
                             "key": "riceWithSteakInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithSteakInHotPot.label}}",
+                            "value": "Stone pot-style rice with steak",
                             "type": "active"
                         },
                         {
                             "key": "riceWithRipeKimchiAndAbaloneInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithRipeKimchiAndAbaloneInHotPot.label}}",
+                            "value": "Stone pot-style rice with abalone and ripe kimchi",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBeefAndBeanSproutsInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBeefAndBeanSproutsInHotPot.label}}",
+                            "value": "Stone pot-style rice with beef and bean sprouts",
                             "type": "active"
                         },
                         {
                             "key": "riceWithAssortedMushrommsInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithAssortedMushrommsInHotPot.label}}",
+                            "value": "Stone pot-style rice with assorted mushrooms",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBrackenAndSteakInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBrackenAndSteakInHotPot.label}}",
+                            "value": "Stone pot-style rice with steak and bracken",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBeefAndAssortedMushroomsInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBeefAndAssortedMushroomsInHotPot.label}}",
+                            "value": "Stone pot-style rice with beef and assorted mushrooms",
                             "type": "active"
                         },
                         {
                             "key": "riceWithSpicyWebfootOctopusInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithSpicyWebfootOctopusInHotPot.label}}",
+                            "value": "Stone pot-style rice with webfoot octopus",
                             "type": "active"
                         },
                         {
                             "key": "kamutRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.kamutRice.label}}",
+                            "value": "Rice with kamut",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithLentilBean",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithLentilBean.label}}",
+                            "value": "Mixed grains and lentils for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithChickpea(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithChickpea(1Cup).label}}",
+                            "value": "Mixed grains and chickpeas for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithQuinoa",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithQuinoa.label}}",
+                            "value": "Mixed grains and quinoa for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithMillet",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithMillet.label}}",
+                            "value": "Mixed grains and millet for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithChickpea(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithChickpea(2Cup).label}}",
+                            "value": "Mixed grains and chickpeas for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBarley",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBarley.label}}",
+                            "value": "Mixed grains and barley for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBrownRice(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBrownRice(1Cup).label}}",
+                            "value": "Mixed grains and brown rice for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithOatRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithOatRice.label}}",
+                            "value": "Mixed grains and oats for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBrownRice(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBrownRice(2Cup).label}}",
+                            "value": "Mixed grains and brown rice for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithKamut",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithKamut.label}}",
+                            "value": "Mixed grains and kamut for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBrownRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBrownRice.label}}",
+                            "value": "Mixed grains and brown rice for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithQuinoa(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithQuinoa(1Cup).label}}",
+                            "value": "Mixed grains and quinoa for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithChickpea",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithChickpea.label}}",
+                            "value": "Mixed grains and chickpeas for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithQuinoa(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithQuinoa(2Cup).label}}",
+                            "value": "Mixed grains and quinoa for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithAdlay",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithAdlay.label}}",
+                            "value": "Mixed grains with adlay for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithLentilBean(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithLentilBean(1Cup).label}}",
+                            "value": "Mixed grains with lentils for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "plainPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.plainPorridge.label}}",
+                            "value": "Plain porridge",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithLentilBean(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithLentilBean(2Cup).label}}",
+                            "value": "Mixed grains with lentils for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "abalonePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.abalonePorridge.label}}",
+                            "value": "Abalone porridge",
                             "type": "active"
                         },
                         {
                             "key": "pineNutPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.pineNutPorridge.label}}",
+                            "value": "Pine nut porridge",
                             "type": "active"
                         },
                         {
                             "key": "boiledEgg",
-                            "value": "{{i18n.attributes.menu.i18n.value.boiledEgg.label}}",
+                            "value": "Boiled eggs",
                             "type": "active"
                         },
                         {
                             "key": "chicken,SweetPumpkin,Cabbage,StickyRicePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,SweetPumpkin,Cabbage,StickyRicePorridge.label}}",
+                            "value": "Chicken, sweet pumpkin, cabbage, sticky rice porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,Zucchini,SweetPotato,StickyRicePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,Zucchini,SweetPotato,StickyRicePorridge.label}}",
+                            "value": "Chicken, courgette, sweet potato, sticky rice porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,Apple,BroccoliPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Apple,BroccoliPorridge.label}}",
+                            "value": "Beef, apple, broccoli porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,BokChoy,BananaPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,BokChoy,BananaPorridge.label}}",
+                            "value": "Chicken, bok choy, banana porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,Zucchini,PearPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Zucchini,PearPorridge.label}}",
+                            "value": "Beef, courgette, pear porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,ShiitakeMushroom,EggPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,ShiitakeMushroom,EggPorridge.label}}",
+                            "value": "Beef, shiitake mushroom, egg porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,KingTrumpetMushroom,BroccoliPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,KingTrumpetMushroom,BroccoliPorridge.label}}",
+                            "value": "Beef, king trumpet mushroom, broccoli porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,BeanSprouts,Jujube,StickyRicePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,BeanSprouts,Jujube,StickyRicePorridge.label}}",
+                            "value": "Chicken, bean sprouts, jujube, sticky rice porridge",
                             "type": "active"
                         },
                         {
                             "key": "cod-Meat,Vitamin,CarrotPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.cod-Meat,Vitamin,CarrotPorridge.label}}",
+                            "value": "Cod, vitamin, carrot porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,SweetPotato,Beet,BeetPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,SweetPotato,Beet,BeetPorridge.label}}",
+                            "value": "Chicken, sweet potato, beetroot, beet green porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,PineNut,Chestnut,Spinach,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,PineNut,Chestnut,Spinach,SoftBoiledRice.label}}",
+                            "value": "Chicken, pine nut, chestnut, spinach soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice.label}}",
+                            "value": "Beef, beet, enoki mushroom, perilla seed soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "chicken,Cheese,Beet,Eggplant,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,Cheese,Beet,Eggplant,SoftBoiledRice.label}}",
+                            "value": "Chicken, cheese, beet, aubergine soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice.label}}",
+                            "value": "Cod, sweet pumpkin, mung bean sprout, black sesame soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "beef,Cabbage,WhiteMushroom,Jujube,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Cabbage,WhiteMushroom,Jujube,SoftBoiledRice.label}}",
+                            "value": "Beef, cabbage, white mushroom, jujube soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "broccoliPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.broccoliPorridge.label}}",
+                            "value": "Broccoli porridge",
                             "type": "active"
                         },
                         {
                             "key": "potatoCarrotPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.potatoCarrotPorridge.label}}",
+                            "value": "Potato carrot porridge",
                             "type": "active"
                         },
                         {
                             "key": "yakbab",
-                            "value": "{{i18n.attributes.menu.i18n.value.yakbab.label}}",
+                            "value": "Yakbap",
                             "type": "active"
                         },
                         {
                             "key": "steamedPotato",
-                            "value": "{{i18n.attributes.menu.i18n.value.steamedPotato.label}}",
+                            "value": "Steamed potato",
+                            "type": "active"
+                        },
+                        {
+                            "key": "babyFood",
+                            "value": "Baby food",
+                            "type": "active"
+                        },
+                        {
+                            "key": "quickMeal",
+                            "value": "Quick meal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "noPressureSteaming",
+                            "value": "No pressure steaming",
+                            "type": "active"
+                        },
+                        {
+                            "key": "germinatedBrownRice",
+                            "value": "Germinated brown rice",
+                            "type": "active"
+                        },
+                        {
+                            "key": "vegetableRice",
+                            "value": "Rice with vegetables",
+                            "type": "active"
+                        },
+                        {
+                            "key": "highHeatMixedGrains",
+                            "value": "High heat mixed grains",
+                            "type": "active"
+                        },
+                        {
+                            "key": "whiteRice",
+                            "value": "White rice",
+                            "type": "active"
+                        },
+                        {
+                            "key": "grains",
+                            "value": "Grains",
                             "type": "active"
                         },
                         {
                             "key": "customMenu01",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu01.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU01",
                             "type": "active"
                         },
                         {
                             "key": "customMenu02",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu02.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU02",
                             "type": "active"
                         },
                         {
                             "key": "customMenu03",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu03.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU03",
                             "type": "active"
                         },
                         {
                             "key": "customMenu04",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu04.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU04",
                             "type": "active"
                         },
                         {
                             "key": "customMenu05",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu05.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU05",
                             "type": "active"
                         },
                         {
                             "key": "customMenu06",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu06.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU06",
                             "type": "active"
                         },
                         {
                             "key": "customMenu07",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu07.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU07",
                             "type": "active"
                         },
                         {
                             "key": "customMenu08",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu08.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU08",
                             "type": "active"
                         },
                         {
                             "key": "customMenu09",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu09.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU09",
                             "type": "active"
                         },
                         {
                             "key": "customMenu10",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu10.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU10",
                             "type": "active"
                         },
                         {
                             "key": "customMenu11",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu11.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU11",
                             "type": "active"
                         },
                         {
                             "key": "customMenu12",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu12.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU12",
                             "type": "active"
                         },
                         {
                             "key": "customMenu13",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu13.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU13",
                             "type": "active"
                         },
                         {
                             "key": "customMenu14",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu14.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU14",
                             "type": "active"
                         },
                         {
                             "key": "customMenu15",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu15.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU15",
                             "type": "active"
                         },
                         {
                             "key": "customMenu16",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu16.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU16",
                             "type": "active"
                         },
                         {
                             "key": "customMenu17",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu17.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU17",
                             "type": "active"
                         },
                         {
                             "key": "customMenu18",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu18.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU18",
                             "type": "active"
                         },
                         {
                             "key": "customMenu19",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu19.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU19",
                             "type": "active"
                         },
                         {
                             "key": "customMenu20",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu20.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU20",
                             "type": "active"
                         }
                     ],
@@ -732,547 +772,587 @@
                     "alternatives": [
                         {
                             "key": "stickyPlainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.stickyPlainRice.label}}",
+                            "value": "Sticky white rice",
                             "type": "active"
                         },
                         {
                             "key": "wellCookedPlainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.wellCookedPlainRice.label}}",
+                            "value": "Well-cooked white rice",
                             "type": "active"
                         },
                         {
                             "key": "frozenPlainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.frozenPlainRice.label}}",
+                            "value": "Frozen white rice",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrains",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrains.label}}",
+                            "value": "Mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "brownRice100",
-                            "value": "{{i18n.attributes.menu.i18n.value.brownRice100.label}}",
+                            "value": "100% brown rice",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBeans",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBeans.label}}",
+                            "value": "Rice with beans",
                             "type": "active"
                         },
                         {
                             "key": "barleyMixedGrainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.barleyMixedGrainRice.label}}",
+                            "value": "Rice with barley and mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "superGrains",
-                            "value": "{{i18n.attributes.menu.i18n.value.superGrains.label}}",
+                            "value": "Rice with super grains",
                             "type": "active"
                         },
                         {
                             "key": "frozenMixedGrain",
-                            "value": "{{i18n.attributes.menu.i18n.value.frozenMixedGrain.label}}",
+                            "value": "Frozen mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "cauldronRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.cauldronRice.label}}",
+                            "value": "Stone pot-style rice",
                             "type": "active"
                         },
                         {
                             "key": "riceForGimbap",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceForGimbap.label}}",
+                            "value": "Rice for gimbap",
                             "type": "active"
                         },
                         {
                             "key": "plainQuick",
-                            "value": "{{i18n.attributes.menu.i18n.value.plainQuick.label}}",
+                            "value": "Quick white rice",
                             "type": "active"
                         },
                         {
                             "key": "konjacRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.konjacRice.label}}",
+                            "value": "Konjac rice",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSalad",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSalad.label}}",
+                            "value": "Mixed grains for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainsQuick",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainsQuick.label}}",
+                            "value": "Quick mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "nutritiousRiceInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.nutritiousRiceInHotPot.label}}",
+                            "value": "Nutritious stone pot-style rice",
                             "type": "active"
                         },
                         {
                             "key": "steamedDish",
-                            "value": "{{i18n.attributes.menu.i18n.value.steamedDish.label}}",
+                            "value": "Steamed dish",
                             "type": "active"
                         },
                         {
                             "key": "nutritiousPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.nutritiousPorridge.label}}",
+                            "value": "Nutritious porridge",
                             "type": "active"
                         },
                         {
                             "key": "scorchedRiceTea",
-                            "value": "{{i18n.attributes.menu.i18n.value.scorchedRiceTea.label}}",
+                            "value": "Scorched rice tea",
                             "type": "active"
                         },
                         {
                             "key": "bakedEgg",
-                            "value": "{{i18n.attributes.menu.i18n.value.bakedEgg.label}}",
+                            "value": "Baked eggs",
                             "type": "active"
                         },
                         {
                             "key": "sousVide",
-                            "value": "{{i18n.attributes.menu.i18n.value.sousVide.label}}",
+                            "value": "Sous vide",
                             "type": "active"
                         },
                         {
                             "key": "scorchedRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.scorchedRice.label}}",
+                            "value": "Scorched rice",
                             "type": "active"
                         },
                         {
                             "key": "babyFoodStep1",
-                            "value": "{{i18n.attributes.menu.i18n.value.babyFoodStep1.label}}",
+                            "value": "Baby food step 1",
                             "type": "active"
                         },
                         {
                             "key": "babyFoodStep2",
-                            "value": "{{i18n.attributes.menu.i18n.value.babyFoodStep2.label}}",
+                            "value": "Baby food step 2",
                             "type": "active"
                         },
                         {
                             "key": "babyFoodStep3",
-                            "value": "{{i18n.attributes.menu.i18n.value.babyFoodStep3.label}}",
+                            "value": "Baby food step 3",
                             "type": "active"
                         },
                         {
                             "key": "riceWithSeasonedVegetablesInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithSeasonedVegetablesInHotPot.label}}",
+                            "value": "Stone pot-style rice with seasoned vegetables",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSlim",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSlim.label}}",
+                            "value": "Mixed grains for slim diet",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForVitality",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForVitality.label}}",
+                            "value": "Mixed grains for vitality",
                             "type": "active"
                         },
                         {
                             "key": "haedeul",
-                            "value": "{{i18n.attributes.menu.i18n.value.haedeul.label}}",
+                            "value": "Haedeul",
                             "type": "active"
                         },
                         {
                             "key": "alchanmi",
-                            "value": "{{i18n.attributes.menu.i18n.value.alchanmi.label}}",
+                            "value": "Alchanmi",
                             "type": "active"
                         },
                         {
                             "key": "odaemi",
-                            "value": "{{i18n.attributes.menu.i18n.value.odaemi.label}}",
+                            "value": "Odaemi",
                             "type": "active"
                         },
                         {
                             "key": "oatRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.oatRice.label}}",
+                            "value": "Rice with oats",
                             "type": "active"
                         },
                         {
                             "key": "chickpeaRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.chickpeaRice.label}}",
+                            "value": "Rice with chickpeas",
                             "type": "active"
                         },
                         {
                             "key": "quinoaRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.quinoaRice.label}}",
+                            "value": "Rice with quinoa",
                             "type": "active"
                         },
                         {
                             "key": "lentilBeanRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.lentilBeanRice.label}}",
+                            "value": "Rice with lentils",
                             "type": "active"
                         },
                         {
                             "key": "steamedSweetPotato",
-                            "value": "{{i18n.attributes.menu.i18n.value.steamedSweetPotato.label}}",
+                            "value": "Steamed sweet potato",
                             "type": "active"
                         },
                         {
                             "key": "galbijjim",
-                            "value": "{{i18n.attributes.menu.i18n.value.galbijjim.label}}",
+                            "value": "Galbijjim",
                             "type": "active"
                         },
                         {
                             "key": "samgyetang",
-                            "value": "{{i18n.attributes.menu.i18n.value.samgyetang.label}}",
+                            "value": "Samgyetang",
                             "type": "active"
                         },
                         {
                             "key": "riceWithWebfootOctopusAndSaussureaInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithWebfootOctopusAndSaussureaInHotPot.label}}",
+                            "value": "Stone pot-style rice with webfoot octopus and saussurea",
                             "type": "active"
                         },
                         {
                             "key": "riceWithAbaloneInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithAbaloneInHotPot.label}}",
+                            "value": "Stone pot-style rice with abalone",
                             "type": "active"
                         },
                         {
                             "key": "riceWithTruffledBulgogiInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithTruffledBulgogiInHotPot.label}}",
+                            "value": "Stone pot-style rice with steak",
                             "type": "active"
                         },
                         {
                             "key": "riceWithSteakInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithSteakInHotPot.label}}",
+                            "value": "Stone pot-style rice with steak",
                             "type": "active"
                         },
                         {
                             "key": "riceWithRipeKimchiAndAbaloneInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithRipeKimchiAndAbaloneInHotPot.label}}",
+                            "value": "Stone pot-style rice with abalone and ripe kimchi",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBeefAndBeanSproutsInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBeefAndBeanSproutsInHotPot.label}}",
+                            "value": "Stone pot-style rice with beef and bean sprouts",
                             "type": "active"
                         },
                         {
                             "key": "riceWithAssortedMushrommsInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithAssortedMushrommsInHotPot.label}}",
+                            "value": "Stone pot-style rice with assorted mushrooms",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBrackenAndSteakInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBrackenAndSteakInHotPot.label}}",
+                            "value": "Stone pot-style rice with steak and bracken",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBeefAndAssortedMushroomsInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBeefAndAssortedMushroomsInHotPot.label}}",
+                            "value": "Stone pot-style rice with beef and assorted mushrooms",
                             "type": "active"
                         },
                         {
                             "key": "riceWithSpicyWebfootOctopusInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithSpicyWebfootOctopusInHotPot.label}}",
+                            "value": "Stone pot-style rice with webfoot octopus",
                             "type": "active"
                         },
                         {
                             "key": "kamutRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.kamutRice.label}}",
+                            "value": "Rice with kamut",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithLentilBean",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithLentilBean.label}}",
+                            "value": "Mixed grains and lentils for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithChickpea(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithChickpea(1Cup).label}}",
+                            "value": "Mixed grains and chickpeas for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithQuinoa",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithQuinoa.label}}",
+                            "value": "Mixed grains and quinoa for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithMillet",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithMillet.label}}",
+                            "value": "Mixed grains and millet for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithChickpea(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithChickpea(2Cup).label}}",
+                            "value": "Mixed grains and chickpeas for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBarley",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBarley.label}}",
+                            "value": "Mixed grains and barley for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBrownRice(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBrownRice(1Cup).label}}",
+                            "value": "Mixed grains and brown rice for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithOatRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithOatRice.label}}",
+                            "value": "Mixed grains and oats for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBrownRice(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBrownRice(2Cup).label}}",
+                            "value": "Mixed grains and brown rice for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithKamut",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithKamut.label}}",
+                            "value": "Mixed grains and kamut for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBrownRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBrownRice.label}}",
+                            "value": "Mixed grains and brown rice for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithQuinoa(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithQuinoa(1Cup).label}}",
+                            "value": "Mixed grains and quinoa for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithChickpea",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithChickpea.label}}",
+                            "value": "Mixed grains and chickpeas for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithQuinoa(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithQuinoa(2Cup).label}}",
+                            "value": "Mixed grains and quinoa for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithAdlay",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithAdlay.label}}",
+                            "value": "Mixed grains with adlay for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithLentilBean(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithLentilBean(1Cup).label}}",
+                            "value": "Mixed grains with lentils for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "plainPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.plainPorridge.label}}",
+                            "value": "Plain porridge",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithLentilBean(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithLentilBean(2Cup).label}}",
+                            "value": "Mixed grains with lentils for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "abalonePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.abalonePorridge.label}}",
+                            "value": "Abalone porridge",
                             "type": "active"
                         },
                         {
                             "key": "pineNutPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.pineNutPorridge.label}}",
+                            "value": "Pine nut porridge",
                             "type": "active"
                         },
                         {
                             "key": "boiledEgg",
-                            "value": "{{i18n.attributes.menu.i18n.value.boiledEgg.label}}",
+                            "value": "Boiled eggs",
                             "type": "active"
                         },
                         {
                             "key": "chicken,SweetPumpkin,Cabbage,StickyRicePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,SweetPumpkin,Cabbage,StickyRicePorridge.label}}",
+                            "value": "Chicken, sweet pumpkin, cabbage, sticky rice porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,Zucchini,SweetPotato,StickyRicePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,Zucchini,SweetPotato,StickyRicePorridge.label}}",
+                            "value": "Chicken, courgette, sweet potato, sticky rice porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,Apple,BroccoliPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Apple,BroccoliPorridge.label}}",
+                            "value": "Beef, apple, broccoli porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,BokChoy,BananaPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,BokChoy,BananaPorridge.label}}",
+                            "value": "Chicken, bok choy, banana porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,Zucchini,PearPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Zucchini,PearPorridge.label}}",
+                            "value": "Beef, courgette, pear porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,ShiitakeMushroom,EggPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,ShiitakeMushroom,EggPorridge.label}}",
+                            "value": "Beef, shiitake mushroom, egg porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,KingTrumpetMushroom,BroccoliPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,KingTrumpetMushroom,BroccoliPorridge.label}}",
+                            "value": "Beef, king trumpet mushroom, broccoli porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,BeanSprouts,Jujube,StickyRicePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,BeanSprouts,Jujube,StickyRicePorridge.label}}",
+                            "value": "Chicken, bean sprouts, jujube, sticky rice porridge",
                             "type": "active"
                         },
                         {
                             "key": "cod-Meat,Vitamin,CarrotPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.cod-Meat,Vitamin,CarrotPorridge.label}}",
+                            "value": "Cod, vitamin, carrot porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,SweetPotato,Beet,BeetPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,SweetPotato,Beet,BeetPorridge.label}}",
+                            "value": "Chicken, sweet potato, beetroot, beet green porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,PineNut,Chestnut,Spinach,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,PineNut,Chestnut,Spinach,SoftBoiledRice.label}}",
+                            "value": "Chicken, pine nut, chestnut, spinach soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice.label}}",
+                            "value": "Beef, beet, enoki mushroom, perilla seed soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "chicken,Cheese,Beet,Eggplant,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,Cheese,Beet,Eggplant,SoftBoiledRice.label}}",
+                            "value": "Chicken, cheese, beet, aubergine soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice.label}}",
+                            "value": "Cod, sweet pumpkin, mung bean sprout, black sesame soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "beef,Cabbage,WhiteMushroom,Jujube,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Cabbage,WhiteMushroom,Jujube,SoftBoiledRice.label}}",
+                            "value": "Beef, cabbage, white mushroom, jujube soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "broccoliPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.broccoliPorridge.label}}",
+                            "value": "Broccoli porridge",
                             "type": "active"
                         },
                         {
                             "key": "potatoCarrotPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.potatoCarrotPorridge.label}}",
+                            "value": "Potato carrot porridge",
                             "type": "active"
                         },
                         {
                             "key": "yakbab",
-                            "value": "{{i18n.attributes.menu.i18n.value.yakbab.label}}",
+                            "value": "Yakbap",
                             "type": "active"
                         },
                         {
                             "key": "steamedPotato",
-                            "value": "{{i18n.attributes.menu.i18n.value.steamedPotato.label}}",
+                            "value": "Steamed potato",
+                            "type": "active"
+                        },
+                        {
+                            "key": "babyFood",
+                            "value": "Baby food",
+                            "type": "active"
+                        },
+                        {
+                            "key": "quickMeal",
+                            "value": "Quick meal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "noPressureSteaming",
+                            "value": "No pressure steaming",
+                            "type": "active"
+                        },
+                        {
+                            "key": "germinatedBrownRice",
+                            "value": "Germinated brown rice",
+                            "type": "active"
+                        },
+                        {
+                            "key": "vegetableRice",
+                            "value": "Rice with vegetables",
+                            "type": "active"
+                        },
+                        {
+                            "key": "highHeatMixedGrains",
+                            "value": "High heat mixed grains",
+                            "type": "active"
+                        },
+                        {
+                            "key": "whiteRice",
+                            "value": "White rice",
+                            "type": "active"
+                        },
+                        {
+                            "key": "grains",
+                            "value": "Grains",
                             "type": "active"
                         },
                         {
                             "key": "customMenu01",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu01.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU01",
                             "type": "active"
                         },
                         {
                             "key": "customMenu02",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu02.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU02",
                             "type": "active"
                         },
                         {
                             "key": "customMenu03",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu03.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU03",
                             "type": "active"
                         },
                         {
                             "key": "customMenu04",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu04.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU04",
                             "type": "active"
                         },
                         {
                             "key": "customMenu05",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu05.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU05",
                             "type": "active"
                         },
                         {
                             "key": "customMenu06",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu06.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU06",
                             "type": "active"
                         },
                         {
                             "key": "customMenu07",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu07.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU07",
                             "type": "active"
                         },
                         {
                             "key": "customMenu08",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu08.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU08",
                             "type": "active"
                         },
                         {
                             "key": "customMenu09",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu09.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU09",
                             "type": "active"
                         },
                         {
                             "key": "customMenu10",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu10.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU10",
                             "type": "active"
                         },
                         {
                             "key": "customMenu11",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu11.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU11",
                             "type": "active"
                         },
                         {
                             "key": "customMenu12",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu12.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU12",
                             "type": "active"
                         },
                         {
                             "key": "customMenu13",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu13.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU13",
                             "type": "active"
                         },
                         {
                             "key": "customMenu14",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu14.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU14",
                             "type": "active"
                         },
                         {
                             "key": "customMenu15",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu15.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU15",
                             "type": "active"
                         },
                         {
                             "key": "customMenu16",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu16.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU16",
                             "type": "active"
                         },
                         {
                             "key": "customMenu17",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu17.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU17",
                             "type": "active"
                         },
                         {
                             "key": "customMenu18",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu18.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU18",
                             "type": "active"
                         },
                         {
                             "key": "customMenu19",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu19.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU19",
                             "type": "active"
                         },
                         {
                             "key": "customMenu20",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu20.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU20",
                             "type": "active"
                         }
                     ]
@@ -1280,67 +1360,67 @@
             }
         },
         {
-            "label": "{{i18n.attributes.event.label}}",
+            "label": "Progress",
             "displayType": "state",
             "state": {
                 "label": "{{event.value}}",
                 "alternatives": [
                     {
                         "key": "cookingComplete",
-                        "value": "{{i18n.attributes.event.i18n.value.cookingComplete.label}}",
+                        "value": "Cooking complete",
                         "type": "active"
                     },
                     {
                         "key": "keepWarmComplete",
-                        "value": "{{i18n.attributes.event.i18n.value.keepWarmComplete.label}}",
+                        "value": "Stopped keeping warm",
                         "type": "active"
                     },
                     {
                         "key": "reheatingComplete",
-                        "value": "{{i18n.attributes.event.i18n.value.reheatingComplete.label}}",
+                        "value": "Reheating complete",
                         "type": "active"
                     },
                     {
                         "key": "autoCleanComplete",
-                        "value": "{{i18n.attributes.event.i18n.value.autoCleanComplete.label}}",
+                        "value": "Auto cleaning complete",
                         "type": "active"
                     },
                     {
                         "key": "soakInnerPotComplete",
-                        "value": "{{i18n.attributes.event.i18n.value.soakInnerPotComplete.label}}",
+                        "value": "Soaking inner pot complete",
                         "type": "active"
                     },
                     {
                         "key": "steamEmission",
-                        "value": "{{i18n.attributes.event.i18n.value.steamEmission.label}}",
+                        "value": "Steam release",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.startTime.label}}",
+            "label": "Warm time",
             "displayType": "state",
             "state": {
                 "label": "{{startTime.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.completionTime.label}}",
+            "label": "Remaining time",
             "displayType": "state",
             "state": {
                 "label": "{{completionTime.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.schedulingEnabled.label}}",
+            "label": "Schedule",
             "displayType": "state",
             "state": {
                 "label": "{{schedulingEnabled.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.scheduledTime.label}}",
+            "label": "Scheduled end time",
             "displayType": "textField",
             "textField": {
                 "command": "scheduleCooking",
@@ -1357,33 +1437,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.cookerMode.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "cooking",
-                            "value": "{{i18n.attributes.cookerMode.i18n.value.cooking.label}}",
+                            "value": "Cook",
                             "type": "active"
                         },
                         {
                             "key": "keepWarm",
-                            "value": "{{i18n.attributes.cookerMode.i18n.value.keepWarm.label}}",
+                            "value": "Warm",
                             "type": "active"
                         },
                         {
                             "key": "reheating",
-                            "value": "{{i18n.attributes.cookerMode.i18n.value.reheating.label}}",
+                            "value": "Reheat",
                             "type": "active"
                         },
                         {
                             "key": "autoClean",
-                            "value": "{{i18n.attributes.cookerMode.i18n.value.autoClean.label}}",
+                            "value": "Auto clean",
                             "type": "active"
                         },
                         {
                             "key": "soakInnerPot",
-                            "value": "{{i18n.attributes.cookerMode.i18n.value.soakInnerPot.label}}",
+                            "value": "Soak inner pot",
                             "type": "active"
                         }
                     ],
@@ -1394,38 +1474,38 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.event.label}}",
+                "label": "Progress",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "cookingComplete",
-                            "value": "{{i18n.attributes.event.i18n.value.cookingComplete.label}}",
+                            "value": "Cooking complete",
                             "type": "active"
                         },
                         {
                             "key": "keepWarmComplete",
-                            "value": "{{i18n.attributes.event.i18n.value.keepWarmComplete.label}}",
+                            "value": "Stopped keeping warm",
                             "type": "active"
                         },
                         {
                             "key": "reheatingComplete",
-                            "value": "{{i18n.attributes.event.i18n.value.reheatingComplete.label}}",
+                            "value": "Reheating complete",
                             "type": "active"
                         },
                         {
                             "key": "autoCleanComplete",
-                            "value": "{{i18n.attributes.event.i18n.value.autoCleanComplete.label}}",
+                            "value": "Auto cleaning complete",
                             "type": "active"
                         },
                         {
                             "key": "soakInnerPotComplete",
-                            "value": "{{i18n.attributes.event.i18n.value.soakInnerPotComplete.label}}",
+                            "value": "Soaking inner pot complete",
                             "type": "active"
                         },
                         {
                             "key": "steamEmission",
-                            "value": "{{i18n.attributes.event.i18n.value.steamEmission.label}}",
+                            "value": "Steam release",
                             "type": "active"
                         }
                     ],
@@ -1438,553 +1518,593 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.commands.startCooking.label}}",
+                "label": "Start",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "stickyPlainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.stickyPlainRice.label}}",
+                            "value": "Sticky white rice",
                             "type": "active"
                         },
                         {
                             "key": "wellCookedPlainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.wellCookedPlainRice.label}}",
+                            "value": "Well-cooked white rice",
                             "type": "active"
                         },
                         {
                             "key": "frozenPlainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.frozenPlainRice.label}}",
+                            "value": "Frozen white rice",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrains",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrains.label}}",
+                            "value": "Mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "brownRice100",
-                            "value": "{{i18n.attributes.menu.i18n.value.brownRice100.label}}",
+                            "value": "100% brown rice",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBeans",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBeans.label}}",
+                            "value": "Rice with beans",
                             "type": "active"
                         },
                         {
                             "key": "barleyMixedGrainRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.barleyMixedGrainRice.label}}",
+                            "value": "Rice with barley and mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "superGrains",
-                            "value": "{{i18n.attributes.menu.i18n.value.superGrains.label}}",
+                            "value": "Rice with super grains",
                             "type": "active"
                         },
                         {
                             "key": "frozenMixedGrain",
-                            "value": "{{i18n.attributes.menu.i18n.value.frozenMixedGrain.label}}",
+                            "value": "Frozen mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "cauldronRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.cauldronRice.label}}",
+                            "value": "Stone pot-style rice",
                             "type": "active"
                         },
                         {
                             "key": "riceForGimbap",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceForGimbap.label}}",
+                            "value": "Rice for gimbap",
                             "type": "active"
                         },
                         {
                             "key": "plainQuick",
-                            "value": "{{i18n.attributes.menu.i18n.value.plainQuick.label}}",
+                            "value": "Quick white rice",
                             "type": "active"
                         },
                         {
                             "key": "konjacRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.konjacRice.label}}",
+                            "value": "Konjac rice",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSalad",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSalad.label}}",
+                            "value": "Mixed grains for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainsQuick",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainsQuick.label}}",
+                            "value": "Quick mixed grains",
                             "type": "active"
                         },
                         {
                             "key": "nutritiousRiceInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.nutritiousRiceInHotPot.label}}",
+                            "value": "Nutritious stone pot-style rice",
                             "type": "active"
                         },
                         {
                             "key": "steamedDish",
-                            "value": "{{i18n.attributes.menu.i18n.value.steamedDish.label}}",
+                            "value": "Steamed dish",
                             "type": "active"
                         },
                         {
                             "key": "nutritiousPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.nutritiousPorridge.label}}",
+                            "value": "Nutritious porridge",
                             "type": "active"
                         },
                         {
                             "key": "scorchedRiceTea",
-                            "value": "{{i18n.attributes.menu.i18n.value.scorchedRiceTea.label}}",
+                            "value": "Scorched rice tea",
                             "type": "active"
                         },
                         {
                             "key": "bakedEgg",
-                            "value": "{{i18n.attributes.menu.i18n.value.bakedEgg.label}}",
+                            "value": "Baked eggs",
                             "type": "active"
                         },
                         {
                             "key": "sousVide",
-                            "value": "{{i18n.attributes.menu.i18n.value.sousVide.label}}",
+                            "value": "Sous vide",
                             "type": "active"
                         },
                         {
                             "key": "scorchedRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.scorchedRice.label}}",
+                            "value": "Scorched rice",
                             "type": "active"
                         },
                         {
                             "key": "babyFoodStep1",
-                            "value": "{{i18n.attributes.menu.i18n.value.babyFoodStep1.label}}",
+                            "value": "Baby food step 1",
                             "type": "active"
                         },
                         {
                             "key": "babyFoodStep2",
-                            "value": "{{i18n.attributes.menu.i18n.value.babyFoodStep2.label}}",
+                            "value": "Baby food step 2",
                             "type": "active"
                         },
                         {
                             "key": "babyFoodStep3",
-                            "value": "{{i18n.attributes.menu.i18n.value.babyFoodStep3.label}}",
+                            "value": "Baby food step 3",
                             "type": "active"
                         },
                         {
                             "key": "riceWithSeasonedVegetablesInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithSeasonedVegetablesInHotPot.label}}",
+                            "value": "Stone pot-style rice with seasoned vegetables",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSlim",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSlim.label}}",
+                            "value": "Mixed grains for slim diet",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForVitality",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForVitality.label}}",
+                            "value": "Mixed grains for vitality",
                             "type": "active"
                         },
                         {
                             "key": "haedeul",
-                            "value": "{{i18n.attributes.menu.i18n.value.haedeul.label}}",
+                            "value": "Haedeul",
                             "type": "active"
                         },
                         {
                             "key": "alchanmi",
-                            "value": "{{i18n.attributes.menu.i18n.value.alchanmi.label}}",
+                            "value": "Alchanmi",
                             "type": "active"
                         },
                         {
                             "key": "odaemi",
-                            "value": "{{i18n.attributes.menu.i18n.value.odaemi.label}}",
+                            "value": "Odaemi",
                             "type": "active"
                         },
                         {
                             "key": "oatRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.oatRice.label}}",
+                            "value": "Rice with oats",
                             "type": "active"
                         },
                         {
                             "key": "chickpeaRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.chickpeaRice.label}}",
+                            "value": "Rice with chickpeas",
                             "type": "active"
                         },
                         {
                             "key": "quinoaRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.quinoaRice.label}}",
+                            "value": "Rice with quinoa",
                             "type": "active"
                         },
                         {
                             "key": "lentilBeanRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.lentilBeanRice.label}}",
+                            "value": "Rice with lentils",
                             "type": "active"
                         },
                         {
                             "key": "steamedSweetPotato",
-                            "value": "{{i18n.attributes.menu.i18n.value.steamedSweetPotato.label}}",
+                            "value": "Steamed sweet potato",
                             "type": "active"
                         },
                         {
                             "key": "galbijjim",
-                            "value": "{{i18n.attributes.menu.i18n.value.galbijjim.label}}",
+                            "value": "Galbijjim",
                             "type": "active"
                         },
                         {
                             "key": "samgyetang",
-                            "value": "{{i18n.attributes.menu.i18n.value.samgyetang.label}}",
+                            "value": "Samgyetang",
                             "type": "active"
                         },
                         {
                             "key": "riceWithWebfootOctopusAndSaussureaInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithWebfootOctopusAndSaussureaInHotPot.label}}",
+                            "value": "Stone pot-style rice with webfoot octopus and saussurea",
                             "type": "active"
                         },
                         {
                             "key": "riceWithAbaloneInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithAbaloneInHotPot.label}}",
+                            "value": "Stone pot-style rice with abalone",
                             "type": "active"
                         },
                         {
                             "key": "riceWithTruffledBulgogiInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithTruffledBulgogiInHotPot.label}}",
+                            "value": "Stone pot-style rice with steak",
                             "type": "active"
                         },
                         {
                             "key": "riceWithSteakInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithSteakInHotPot.label}}",
+                            "value": "Stone pot-style rice with steak",
                             "type": "active"
                         },
                         {
                             "key": "riceWithRipeKimchiAndAbaloneInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithRipeKimchiAndAbaloneInHotPot.label}}",
+                            "value": "Stone pot-style rice with abalone and ripe kimchi",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBeefAndBeanSproutsInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBeefAndBeanSproutsInHotPot.label}}",
+                            "value": "Stone pot-style rice with beef and bean sprouts",
                             "type": "active"
                         },
                         {
                             "key": "riceWithAssortedMushrommsInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithAssortedMushrommsInHotPot.label}}",
+                            "value": "Stone pot-style rice with assorted mushrooms",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBrackenAndSteakInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBrackenAndSteakInHotPot.label}}",
+                            "value": "Stone pot-style rice with steak and bracken",
                             "type": "active"
                         },
                         {
                             "key": "riceWithBeefAndAssortedMushroomsInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithBeefAndAssortedMushroomsInHotPot.label}}",
+                            "value": "Stone pot-style rice with beef and assorted mushrooms",
                             "type": "active"
                         },
                         {
                             "key": "riceWithSpicyWebfootOctopusInHotPot",
-                            "value": "{{i18n.attributes.menu.i18n.value.riceWithSpicyWebfootOctopusInHotPot.label}}",
+                            "value": "Stone pot-style rice with webfoot octopus",
                             "type": "active"
                         },
                         {
                             "key": "kamutRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.kamutRice.label}}",
+                            "value": "Rice with kamut",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithLentilBean",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithLentilBean.label}}",
+                            "value": "Mixed grains and lentils for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithChickpea(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithChickpea(1Cup).label}}",
+                            "value": "Mixed grains and chickpeas for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithQuinoa",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithQuinoa.label}}",
+                            "value": "Mixed grains and quinoa for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithMillet",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithMillet.label}}",
+                            "value": "Mixed grains and millet for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithChickpea(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithChickpea(2Cup).label}}",
+                            "value": "Mixed grains and chickpeas for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBarley",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBarley.label}}",
+                            "value": "Mixed grains and barley for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBrownRice(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBrownRice(1Cup).label}}",
+                            "value": "Mixed grains and brown rice for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithOatRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithOatRice.label}}",
+                            "value": "Mixed grains and oats for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBrownRice(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBrownRice(2Cup).label}}",
+                            "value": "Mixed grains and brown rice for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithKamut",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithKamut.label}}",
+                            "value": "Mixed grains and kamut for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithBrownRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithBrownRice.label}}",
+                            "value": "Mixed grains and brown rice for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithQuinoa(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithQuinoa(1Cup).label}}",
+                            "value": "Mixed grains and quinoa for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithChickpea",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithChickpea.label}}",
+                            "value": "Mixed grains and chickpeas for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithQuinoa(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithQuinoa(2Cup).label}}",
+                            "value": "Mixed grains and quinoa for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithAdlay",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithAdlay.label}}",
+                            "value": "Mixed grains with adlay for salad",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithLentilBean(1Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithLentilBean(1Cup).label}}",
+                            "value": "Mixed grains with lentils for salad (1 cup)",
                             "type": "active"
                         },
                         {
                             "key": "plainPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.plainPorridge.label}}",
+                            "value": "Plain porridge",
                             "type": "active"
                         },
                         {
                             "key": "mixedGrainForSaladWithLentilBean(2Cup)",
-                            "value": "{{i18n.attributes.menu.i18n.value.mixedGrainForSaladWithLentilBean(2Cup).label}}",
+                            "value": "Mixed grains with lentils for salad (2 cups)",
                             "type": "active"
                         },
                         {
                             "key": "abalonePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.abalonePorridge.label}}",
+                            "value": "Abalone porridge",
                             "type": "active"
                         },
                         {
                             "key": "pineNutPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.pineNutPorridge.label}}",
+                            "value": "Pine nut porridge",
                             "type": "active"
                         },
                         {
                             "key": "boiledEgg",
-                            "value": "{{i18n.attributes.menu.i18n.value.boiledEgg.label}}",
+                            "value": "Boiled eggs",
                             "type": "active"
                         },
                         {
                             "key": "chicken,SweetPumpkin,Cabbage,StickyRicePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,SweetPumpkin,Cabbage,StickyRicePorridge.label}}",
+                            "value": "Chicken, sweet pumpkin, cabbage, sticky rice porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,Zucchini,SweetPotato,StickyRicePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,Zucchini,SweetPotato,StickyRicePorridge.label}}",
+                            "value": "Chicken, courgette, sweet potato, sticky rice porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,Apple,BroccoliPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Apple,BroccoliPorridge.label}}",
+                            "value": "Beef, apple, broccoli porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,BokChoy,BananaPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,BokChoy,BananaPorridge.label}}",
+                            "value": "Chicken, bok choy, banana porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,Zucchini,PearPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Zucchini,PearPorridge.label}}",
+                            "value": "Beef, courgette, pear porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,ShiitakeMushroom,EggPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,ShiitakeMushroom,EggPorridge.label}}",
+                            "value": "Beef, shiitake mushroom, egg porridge",
                             "type": "active"
                         },
                         {
                             "key": "beef,KingTrumpetMushroom,BroccoliPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,KingTrumpetMushroom,BroccoliPorridge.label}}",
+                            "value": "Beef, king trumpet mushroom, broccoli porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,BeanSprouts,Jujube,StickyRicePorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,BeanSprouts,Jujube,StickyRicePorridge.label}}",
+                            "value": "Chicken, bean sprouts, jujube, sticky rice porridge",
                             "type": "active"
                         },
                         {
                             "key": "cod-Meat,Vitamin,CarrotPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.cod-Meat,Vitamin,CarrotPorridge.label}}",
+                            "value": "Cod, vitamin, carrot porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,SweetPotato,Beet,BeetPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,SweetPotato,Beet,BeetPorridge.label}}",
+                            "value": "Chicken, sweet potato, beetroot, beet green porridge",
                             "type": "active"
                         },
                         {
                             "key": "chicken,PineNut,Chestnut,Spinach,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,PineNut,Chestnut,Spinach,SoftBoiledRice.label}}",
+                            "value": "Chicken, pine nut, chestnut, spinach soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Beet,EnokiMushroom,PerillaSeeds,SoftBoiledRice.label}}",
+                            "value": "Beef, beet, enoki mushroom, perilla seed soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "chicken,Cheese,Beet,Eggplant,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.chicken,Cheese,Beet,Eggplant,SoftBoiledRice.label}}",
+                            "value": "Chicken, cheese, beet, aubergine soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.codFlesh,SweetPumpkin,Mung-BeanSprouts,BlackSesame,SoftBoiledRice.label}}",
+                            "value": "Cod, sweet pumpkin, mung bean sprout, black sesame soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "beef,Cabbage,WhiteMushroom,Jujube,SoftBoiledRice",
-                            "value": "{{i18n.attributes.menu.i18n.value.beef,Cabbage,WhiteMushroom,Jujube,SoftBoiledRice.label}}",
+                            "value": "Beef, cabbage, white mushroom, jujube soft-boiled rice",
                             "type": "active"
                         },
                         {
                             "key": "broccoliPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.broccoliPorridge.label}}",
+                            "value": "Broccoli porridge",
                             "type": "active"
                         },
                         {
                             "key": "potatoCarrotPorridge",
-                            "value": "{{i18n.attributes.menu.i18n.value.potatoCarrotPorridge.label}}",
+                            "value": "Potato carrot porridge",
                             "type": "active"
                         },
                         {
                             "key": "yakbab",
-                            "value": "{{i18n.attributes.menu.i18n.value.yakbab.label}}",
+                            "value": "Yakbap",
                             "type": "active"
                         },
                         {
                             "key": "steamedPotato",
-                            "value": "{{i18n.attributes.menu.i18n.value.steamedPotato.label}}",
+                            "value": "Steamed potato",
+                            "type": "active"
+                        },
+                        {
+                            "key": "babyFood",
+                            "value": "Baby food",
+                            "type": "active"
+                        },
+                        {
+                            "key": "quickMeal",
+                            "value": "Quick meal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "noPressureSteaming",
+                            "value": "No pressure steaming",
+                            "type": "active"
+                        },
+                        {
+                            "key": "germinatedBrownRice",
+                            "value": "Germinated brown rice",
+                            "type": "active"
+                        },
+                        {
+                            "key": "vegetableRice",
+                            "value": "Rice with vegetables",
+                            "type": "active"
+                        },
+                        {
+                            "key": "highHeatMixedGrains",
+                            "value": "High heat mixed grains",
+                            "type": "active"
+                        },
+                        {
+                            "key": "whiteRice",
+                            "value": "White rice",
+                            "type": "active"
+                        },
+                        {
+                            "key": "grains",
+                            "value": "Grains",
                             "type": "active"
                         },
                         {
                             "key": "customMenu01",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu01.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU01",
                             "type": "active"
                         },
                         {
                             "key": "customMenu02",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu02.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU02",
                             "type": "active"
                         },
                         {
                             "key": "customMenu03",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu03.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU03",
                             "type": "active"
                         },
                         {
                             "key": "customMenu04",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu04.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU04",
                             "type": "active"
                         },
                         {
                             "key": "customMenu05",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu05.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU05",
                             "type": "active"
                         },
                         {
                             "key": "customMenu06",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu06.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU06",
                             "type": "active"
                         },
                         {
                             "key": "customMenu07",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu07.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU07",
                             "type": "active"
                         },
                         {
                             "key": "customMenu08",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu08.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU08",
                             "type": "active"
                         },
                         {
                             "key": "customMenu09",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu09.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU09",
                             "type": "active"
                         },
                         {
                             "key": "customMenu10",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu10.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU10",
                             "type": "active"
                         },
                         {
                             "key": "customMenu11",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu11.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU11",
                             "type": "active"
                         },
                         {
                             "key": "customMenu12",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu12.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU12",
                             "type": "active"
                         },
                         {
                             "key": "customMenu13",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu13.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU13",
                             "type": "active"
                         },
                         {
                             "key": "customMenu14",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu14.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU14",
                             "type": "active"
                         },
                         {
                             "key": "customMenu15",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu15.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU15",
                             "type": "active"
                         },
                         {
                             "key": "customMenu16",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu16.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU16",
                             "type": "active"
                         },
                         {
                             "key": "customMenu17",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu17.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU17",
                             "type": "active"
                         },
                         {
                             "key": "customMenu18",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu18.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU18",
                             "type": "active"
                         },
                         {
                             "key": "customMenu19",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu19.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU19",
                             "type": "active"
                         },
                         {
                             "key": "customMenu20",
-                            "value": "{{i18n.attributes.menu.i18n.value.customMenu20.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.RICECOOKER_DEFAULT_ATTRIBUTES_MENU_CUSTOMMENU20",
                             "type": "active"
                         }
                     ],
@@ -1994,28 +2114,28 @@
                 }
             },
             {
-                "label": "{{i18n.commands.setMode.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "keepWarm",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.keepWarm.label}}",
+                            "value": "Warm",
                             "type": "active"
                         },
                         {
                             "key": "reheating",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.reheating.label}}",
+                            "value": "Reheat",
                             "type": "active"
                         },
                         {
                             "key": "autoClean",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.autoClean.label}}",
+                            "value": "Auto clean",
                             "type": "active"
                         },
                         {
                             "key": "soakInnerPot",
-                            "value": "{{i18n.commands.setMode.arguments.mode.i18n.soakInnerPot.label}}",
+                            "value": "Soak inner pot",
                             "type": "active"
                         }
                     ],
diff --git a/json/robotCleanerCleaningModePresentation.json b/json/robotCleanerCleaningModePresentation.json
index afa9c70f..c7a51391 100755
--- a/json/robotCleanerCleaningModePresentation.json
+++ b/json/robotCleanerCleaningModePresentation.json
@@ -6,32 +6,32 @@
                 "alternatives": [
                     {
                         "key": "auto",
-                        "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.auto.label}}",
+                        "value": "Auto",
                         "type": "active"
                     },
                     {
                         "key": "part",
-                        "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.part.label}}",
+                        "value": "Spot",
                         "type": "active"
                     },
                     {
                         "key": "repeat",
-                        "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.repeat.label}}",
+                        "value": "Repeat",
                         "type": "active"
                     },
                     {
                         "key": "manual",
-                        "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.manual.label}}",
+                        "value": "Manual",
                         "type": "active"
                     },
                     {
                         "key": "stop",
-                        "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.stop.label}}",
+                        "value": "Stop",
                         "type": "active"
                     },
                     {
                         "key": "map",
-                        "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.map.label}}",
+                        "value": "Map",
                         "type": "active"
                     }
                 ]
@@ -54,22 +54,22 @@
                         "alternatives": [
                             {
                                 "key": "part",
-                                "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.part.label}}",
+                                "value": "Spot",
                                 "type": "active"
                             },
                             {
                                 "key": "repeat",
-                                "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.repeat.label}}",
+                                "value": "Repeat",
                                 "type": "active"
                             },
                             {
                                 "key": "manual",
-                                "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.manual.label}}",
+                                "value": "Manual",
                                 "type": "active"
                             },
                             {
                                 "key": "map",
-                                "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.map.label}}",
+                                "value": "Map",
                                 "type": "active"
                             }
                         ],
@@ -82,7 +82,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Cleaning",
             "displayType": "list",
             "list": {
                 "command": {
@@ -90,32 +90,32 @@
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "part",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.part.label}}",
+                            "value": "Spot",
                             "type": "active"
                         },
                         {
                             "key": "repeat",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.repeat.label}}",
+                            "value": "Repeat",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.stop.label}}",
+                            "value": "Stop",
                             "type": "active"
                         },
                         {
                             "key": "map",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.map.label}}",
+                            "value": "Map",
                             "type": "active"
                         }
                     ],
@@ -127,32 +127,32 @@
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "part",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.part.label}}",
+                            "value": "Spot",
                             "type": "active"
                         },
                         {
                             "key": "repeat",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.repeat.label}}",
+                            "value": "Repeat",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.stop.label}}",
+                            "value": "Stop",
                             "type": "active"
                         },
                         {
                             "key": "map",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.map.label}}",
+                            "value": "Map",
                             "type": "active"
                         }
                     ]
@@ -163,38 +163,38 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Cleaning",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "part",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.part.label}}",
+                            "value": "Spot",
                             "type": "active"
                         },
                         {
                             "key": "repeat",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.repeat.label}}",
+                            "value": "Repeat",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.stop.label}}",
+                            "value": "Stop",
                             "type": "active"
                         },
                         {
                             "key": "map",
-                            "value": "{{i18n.attributes.robotCleanerCleaningMode.i18n.value.map.label}}",
+                            "value": "Map",
                             "type": "active"
                         }
                     ],
@@ -206,38 +206,38 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Cleaning",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "part",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.part.label}}",
+                            "value": "Spot",
                             "type": "active"
                         },
                         {
                             "key": "repeat",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.repeat.label}}",
+                            "value": "Repeat",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.stop.label}}",
+                            "value": "Stop",
                             "type": "active"
                         },
                         {
                             "key": "map",
-                            "value": "{{i18n.commands.setRobotCleanerCleaningMode.arguments.mode.i18n.map.label}}",
+                            "value": "Map",
                             "type": "active"
                         }
                     ],
diff --git a/json/robotCleanerMovement.i18n.en.json b/json/robotCleanerMovement.i18n.en.json
index 13a64817..ae54e6b8 100755
--- a/json/robotCleanerMovement.i18n.en.json
+++ b/json/robotCleanerMovement.i18n.en.json
@@ -12,6 +12,9 @@
                     "cleaning": {
                         "label": "Cleaning"
                     },
+                    "washingMop": {
+                        "label": "Washing mop"
+                    },
                     "idle": {
                         "label": "Standby"
                     },
@@ -53,32 +56,35 @@
                         "cleaning": {
                             "label": "Cleaning"
                         },
+                        "washingMop": {
+                            "label": "Washing mop"
+                        },
                         "idle": {
                             "label": "Standby"
                         },
                         "powerOff": {
                             "label": "Off"
                         },
-                        "reserve": {
-                            "label": "Scheduled"
+                        "alarm": {
+                            "label": "Error"
                         },
                         "charging": {
                             "label": "Charging"
                         },
-                        "alarm": {
-                            "label": "Error"
-                        },
-                        "homing": {
-                            "label": "Returning to dock"
+                        "reserve": {
+                            "label": "Scheduled"
                         },
                         "after": {
                             "label": "Charging before cleaning"
                         },
-                        "point": {
-                            "label": "Point cleaning"
+                        "homing": {
+                            "label": "Returning to dock"
                         },
                         "pause": {
                             "label": "Pause"
+                        },
+                        "point": {
+                            "label": "Point cleaning"
                         }
                     },
                     "description": "Set the robot cleaner movement mode, to \"homing\""
diff --git a/json/robotCleanerMovement.i18n.fr.json b/json/robotCleanerMovement.i18n.fr.json
index a2aceee5..d02415c7 100755
--- a/json/robotCleanerMovement.i18n.fr.json
+++ b/json/robotCleanerMovement.i18n.fr.json
@@ -12,6 +12,9 @@
                     "cleaning": {
                         "label": "Nettoyage"
                     },
+                    "washingMop": {
+                        "label": "Washing mop"
+                    },
                     "idle": {
                         "label": "En veille"
                     },
@@ -53,32 +56,35 @@
                         "cleaning": {
                             "label": "Nettoyage"
                         },
+                        "washingMop": {
+                            "label": "Washing mop"
+                        },
                         "idle": {
                             "label": "En veille"
                         },
                         "powerOff": {
                             "label": "Désactivé"
                         },
-                        "reserve": {
-                            "label": "Programmé"
+                        "alarm": {
+                            "label": "Erreur"
                         },
                         "charging": {
                             "label": "Chargement"
                         },
-                        "alarm": {
-                            "label": "Erreur"
-                        },
-                        "homing": {
-                            "label": "Retour sur la station d'accueil"
+                        "reserve": {
+                            "label": "Programmé"
                         },
                         "after": {
                             "label": "Rechargement avant nettoyage"
                         },
-                        "point": {
-                            "label": "Nettoyage ciblé"
+                        "homing": {
+                            "label": "Retour sur la station d'accueil"
                         },
                         "pause": {
                             "label": "Pause"
+                        },
+                        "point": {
+                            "label": "Nettoyage ciblé"
                         }
                     },
                     "description": "Set the robot cleaner movement mode, to \"homing\""
diff --git a/json/robotCleanerMovementPresentation.json b/json/robotCleanerMovementPresentation.json
index 58709a2c..b4c49354 100755
--- a/json/robotCleanerMovementPresentation.json
+++ b/json/robotCleanerMovementPresentation.json
@@ -6,52 +6,52 @@
                 "alternatives": [
                     {
                         "key": "homing",
-                        "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.homing.label}}",
+                        "value": "Returning to dock",
                         "type": "active"
                     },
                     {
                         "key": "idle",
-                        "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.idle.label}}",
+                        "value": "Standby",
                         "type": "inactive"
                     },
                     {
                         "key": "charging",
-                        "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.charging.label}}",
+                        "value": "Charging",
                         "type": "inactive"
                     },
                     {
                         "key": "alarm",
-                        "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.alarm.label}}",
+                        "value": "Error",
                         "type": "active"
                     },
                     {
                         "key": "powerOff",
-                        "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.powerOff.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     },
                     {
                         "key": "reserve",
-                        "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.reserve.label}}",
+                        "value": "Scheduled",
                         "type": "inactive"
                     },
                     {
                         "key": "point",
-                        "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.point.label}}",
+                        "value": "Point cleaning",
                         "type": "active"
                     },
                     {
                         "key": "after",
-                        "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.after.label}}",
+                        "value": "Charging before cleaning",
                         "type": "active"
                     },
                     {
                         "key": "cleaning",
-                        "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.cleaning.label}}",
+                        "value": "Cleaning",
                         "type": "active"
                     },
                     {
                         "key": "pause",
-                        "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.pause.label}}",
+                        "value": "Pause",
                         "type": "inactive"
                     }
                 ]
@@ -75,17 +75,17 @@
                         "alternatives": [
                             {
                                 "key": "idle",
-                                "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.idle.label}}",
+                                "value": "Standby",
                                 "type": "inactive"
                             },
                             {
                                 "key": "charging",
-                                "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.charging.label}}",
+                                "value": "Charging",
                                 "type": "inactive"
                             },
                             {
                                 "key": "reserve",
-                                "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.reserve.label}}",
+                                "value": "Scheduled",
                                 "type": "inactive"
                             }
                         ]
@@ -108,17 +108,17 @@
                         "alternatives": [
                             {
                                 "key": "idle",
-                                "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.idle.label}}",
+                                "value": "Standby",
                                 "type": "inactive"
                             },
                             {
                                 "key": "charging",
-                                "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.charging.label}}",
+                                "value": "Charging",
                                 "type": "inactive"
                             },
                             {
                                 "key": "reserve",
-                                "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.reserve.label}}",
+                                "value": "Scheduled",
                                 "type": "inactive"
                             }
                         ],
@@ -131,7 +131,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Movement",
             "displayType": "list",
             "list": {
                 "command": {
@@ -139,52 +139,52 @@
                     "alternatives": [
                         {
                             "key": "homing",
-                            "value": "{{i18n.commands.setRobotCleanerMovement.arguments.mode.i18n.homing.label}}",
+                            "value": "Returning to dock",
                             "type": "active"
                         },
                         {
                             "key": "idle",
-                            "value": "{{i18n.commands.setRobotCleanerMovement.arguments.mode.i18n.idle.label}}",
+                            "value": "Standby",
                             "type": "inactive"
                         },
                         {
                             "key": "charging",
-                            "value": "{{i18n.commands.setRobotCleanerMovement.arguments.mode.i18n.charging.label}}",
+                            "value": "Charging",
                             "type": "inactive"
                         },
                         {
                             "key": "alarm",
-                            "value": "{{i18n.commands.setRobotCleanerMovement.arguments.mode.i18n.alarm.label}}",
+                            "value": "Error",
                             "type": "active"
                         },
                         {
                             "key": "powerOff",
-                            "value": "{{i18n.commands.setRobotCleanerMovement.arguments.mode.i18n.powerOff.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "reserve",
-                            "value": "{{i18n.commands.setRobotCleanerMovement.arguments.mode.i18n.reserve.label}}",
+                            "value": "Scheduled",
                             "type": "inactive"
                         },
                         {
                             "key": "point",
-                            "value": "{{i18n.commands.setRobotCleanerMovement.arguments.mode.i18n.point.label}}",
+                            "value": "Point cleaning",
                             "type": "active"
                         },
                         {
                             "key": "after",
-                            "value": "{{i18n.commands.setRobotCleanerMovement.arguments.mode.i18n.after.label}}",
+                            "value": "Charging before cleaning",
                             "type": "active"
                         },
                         {
                             "key": "cleaning",
-                            "value": "{{i18n.commands.setRobotCleanerMovement.arguments.mode.i18n.cleaning.label}}",
+                            "value": "Cleaning",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setRobotCleanerMovement.arguments.mode.i18n.pause.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         }
                     ],
@@ -196,52 +196,52 @@
                     "alternatives": [
                         {
                             "key": "homing",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.homing.label}}",
+                            "value": "Returning to dock",
                             "type": "active"
                         },
                         {
                             "key": "idle",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.idle.label}}",
+                            "value": "Standby",
                             "type": "inactive"
                         },
                         {
                             "key": "charging",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.charging.label}}",
+                            "value": "Charging",
                             "type": "inactive"
                         },
                         {
                             "key": "alarm",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.alarm.label}}",
+                            "value": "Error",
                             "type": "active"
                         },
                         {
                             "key": "powerOff",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.powerOff.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "reserve",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.reserve.label}}",
+                            "value": "Scheduled",
                             "type": "inactive"
                         },
                         {
                             "key": "point",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.point.label}}",
+                            "value": "Point cleaning",
                             "type": "active"
                         },
                         {
                             "key": "after",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.after.label}}",
+                            "value": "Charging before cleaning",
                             "type": "active"
                         },
                         {
                             "key": "cleaning",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.cleaning.label}}",
+                            "value": "Cleaning",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.pause.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         }
                     ]
@@ -252,58 +252,58 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Movement",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "homing",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.homing.label}}",
+                            "value": "Returning to dock",
                             "type": "active"
                         },
                         {
                             "key": "idle",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.idle.label}}",
+                            "value": "Standby",
                             "type": "inactive"
                         },
                         {
                             "key": "charging",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.charging.label}}",
+                            "value": "Charging",
                             "type": "inactive"
                         },
                         {
                             "key": "alarm",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.alarm.label}}",
+                            "value": "Error",
                             "type": "active"
                         },
                         {
                             "key": "powerOff",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.powerOff.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "reserve",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.reserve.label}}",
+                            "value": "Scheduled",
                             "type": "inactive"
                         },
                         {
                             "key": "point",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.point.label}}",
+                            "value": "Point cleaning",
                             "type": "active"
                         },
                         {
                             "key": "after",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.after.label}}",
+                            "value": "Charging before cleaning",
                             "type": "active"
                         },
                         {
                             "key": "cleaning",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.cleaning.label}}",
+                            "value": "Cleaning",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.pause.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         }
                     ],
@@ -315,58 +315,58 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Movement",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "homing",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.homing.label}}",
+                            "value": "Returning to dock",
                             "type": "active"
                         },
                         {
                             "key": "idle",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.idle.label}}",
+                            "value": "Standby",
                             "type": "inactive"
                         },
                         {
                             "key": "charging",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.charging.label}}",
+                            "value": "Charging",
                             "type": "inactive"
                         },
                         {
                             "key": "alarm",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.alarm.label}}",
+                            "value": "Error",
                             "type": "active"
                         },
                         {
                             "key": "powerOff",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.powerOff.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "reserve",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.reserve.label}}",
+                            "value": "Scheduled",
                             "type": "inactive"
                         },
                         {
                             "key": "point",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.point.label}}",
+                            "value": "Point cleaning",
                             "type": "active"
                         },
                         {
                             "key": "after",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.after.label}}",
+                            "value": "Charging before cleaning",
                             "type": "active"
                         },
                         {
                             "key": "cleaning",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.cleaning.label}}",
+                            "value": "Cleaning",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.robotCleanerMovement.i18n.value.pause.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/robotCleanerOperatingState.i18n.en.json b/json/robotCleanerOperatingState.i18n.en.json
index bc6fabf4..7369e2bf 100755
--- a/json/robotCleanerOperatingState.i18n.en.json
+++ b/json/robotCleanerOperatingState.i18n.en.json
@@ -68,7 +68,35 @@
             "description": "Operational states supported by the robot cleaner",
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {}
+        },
+        "supportedCommands": {
+            "label": "supported commands",
+            "description": "An optional list of all commands supported by the robot cleaner, regardless of its current state. Setting this list is required for some integrations that may dynamically add or remove commands from the supportedOperatingStateCommands attribute based on the device's current operating state. In such cases, the supportedCommands attribute should be set to the full list of commands, and the device configuration should be patched to use supportedCommands rather than supportedOperatingStateCommands in the automation/actions section. If the device configuration is not patched, supportedCommands will not affect the routine builder user interface.",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {}
+        },
+        "supportedOperatingStateCommands": {
+            "label": "supported operating state commands",
+            "description": "Current available operational state commands",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {}
         }
     },
-    "commands": {}
+    "commands": {
+        "goHome": {
+            "label": "Return",
+            "description": "Return the robot cleaner to the charging dock",
+            "arguments": {}
+        },
+        "start": {
+            "label": "Start",
+            "description": "Start the robot cleaner",
+            "arguments": {}
+        },
+        "pause": {
+            "label": "Pause",
+            "description": "Pause the robot cleaner",
+            "arguments": {}
+        }
+    }
 }
\ No newline at end of file
diff --git a/json/robotCleanerOperatingState.i18n.fr.json b/json/robotCleanerOperatingState.i18n.fr.json
index aac0e155..e10217d8 100755
--- a/json/robotCleanerOperatingState.i18n.fr.json
+++ b/json/robotCleanerOperatingState.i18n.fr.json
@@ -68,7 +68,35 @@
             "description": "Operational states supported by the robot cleaner",
             "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
             "i18n": {}
+        },
+        "supportedCommands": {
+            "label": "supported commands",
+            "description": "An optional list of all commands supported by the robot cleaner, regardless of its current state. Setting this list is required for some integrations that may dynamically add or remove commands from the supportedOperatingStateCommands attribute based on the device's current operating state. In such cases, the supportedCommands attribute should be set to the full list of commands, and the device configuration should be patched to use supportedCommands rather than supportedOperatingStateCommands in the automation/actions section. If the device configuration is not patched, supportedCommands will not affect the routine builder user interface.",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {}
+        },
+        "supportedOperatingStateCommands": {
+            "label": "supported operating state commands",
+            "description": "Current available operational state commands",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {}
         }
     },
-    "commands": {}
+    "commands": {
+        "goHome": {
+            "label": "Retour",
+            "description": "Return the robot cleaner to the charging dock",
+            "arguments": {}
+        },
+        "start": {
+            "label": "Lancer",
+            "description": "Start the robot cleaner",
+            "arguments": {}
+        },
+        "pause": {
+            "label": "Pause",
+            "description": "Pause the robot cleaner",
+            "arguments": {}
+        }
+    }
 }
\ No newline at end of file
diff --git a/json/robotCleanerOperatingStatePresentation.json b/json/robotCleanerOperatingStatePresentation.json
index b37c3df2..687ee164 100755
--- a/json/robotCleanerOperatingStatePresentation.json
+++ b/json/robotCleanerOperatingStatePresentation.json
@@ -6,87 +6,87 @@
                 "alternatives": [
                     {
                         "key": "stopped",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.stopped.label}}",
+                        "value": "Stopped",
                         "type": "active"
                     },
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.running.label}}",
+                        "value": "Cleaning",
                         "type": "active"
                     },
                     {
                         "key": "paused",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.paused.label}}",
+                        "value": "Paused",
                         "type": "active"
                     },
                     {
                         "key": "seekingCharger",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.seekingCharger.label}}",
+                        "value": "Returning",
                         "type": "active"
                     },
                     {
                         "key": "charging",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.charging.label}}",
+                        "value": "Charging",
                         "type": "active"
                     },
                     {
                         "key": "docked",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.docked.label}}",
+                        "value": "Fully charged",
                         "type": "active"
                     },
                     {
                         "key": "unableToStartOrResume",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.unableToStartOrResume.label}}",
+                        "value": "Couldn't start",
                         "type": "active"
                     },
                     {
                         "key": "unableToCompleteOperation",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.unableToCompleteOperation.label}}",
+                        "value": "Couldn't complete",
                         "type": "active"
                     },
                     {
                         "key": "commandInvalidInState",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.commandInvalidInState.label}}",
+                        "value": "Couldn't do action",
                         "type": "active"
                     },
                     {
                         "key": "failedToFindChargingDock",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.failedToFindChargingDock.label}}",
+                        "value": "Couldn't find location",
                         "type": "active"
                     },
                     {
                         "key": "stuck",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.stuck.label}}",
+                        "value": "Stuck",
                         "type": "active"
                     },
                     {
                         "key": "dustBinMissing",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.dustBinMissing.label}}",
+                        "value": "Dust bin missing",
                         "type": "active"
                     },
                     {
                         "key": "dustBinFull",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.dustBinFull.label}}",
+                        "value": "Dust bin full",
                         "type": "active"
                     },
                     {
                         "key": "waterTankEmpty",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.waterTankEmpty.label}}",
+                        "value": "Water tank empty",
                         "type": "active"
                     },
                     {
                         "key": "waterTankMissing",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.waterTankMissing.label}}",
+                        "value": "Water tank missing",
                         "type": "active"
                     },
                     {
                         "key": "waterTankLidOpen",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.waterTankLidOpen.label}}",
+                        "value": "Water tank lid open",
                         "type": "active"
                     },
                     {
                         "key": "mopCleaningPadMissing",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.mopCleaningPadMissing.label}}",
+                        "value": "Mop missing",
                         "type": "active"
                     }
                 ]
@@ -97,190 +97,216 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Status",
             "displayType": "state",
             "state": {
                 "label": "{{operatingState.value}}",
                 "alternatives": [
                     {
                         "key": "stopped",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.stopped.label}}",
+                        "value": "Stopped",
                         "type": "active"
                     },
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.running.label}}",
+                        "value": "Cleaning",
                         "type": "active"
                     },
                     {
                         "key": "paused",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.paused.label}}",
+                        "value": "Paused",
                         "type": "active"
                     },
                     {
                         "key": "seekingCharger",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.seekingCharger.label}}",
+                        "value": "Returning",
                         "type": "active"
                     },
                     {
                         "key": "charging",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.charging.label}}",
+                        "value": "Charging",
                         "type": "active"
                     },
                     {
                         "key": "docked",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.docked.label}}",
+                        "value": "Fully charged",
                         "type": "active"
                     },
                     {
                         "key": "unableToStartOrResume",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.unableToStartOrResume.label}}",
+                        "value": "Couldn't start",
                         "type": "active"
                     },
                     {
                         "key": "unableToCompleteOperation",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.unableToCompleteOperation.label}}",
+                        "value": "Couldn't complete",
                         "type": "active"
                     },
                     {
                         "key": "commandInvalidInState",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.commandInvalidInState.label}}",
+                        "value": "Couldn't do action",
                         "type": "active"
                     },
                     {
                         "key": "failedToFindChargingDock",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.failedToFindChargingDock.label}}",
+                        "value": "Couldn't find location",
                         "type": "active"
                     },
                     {
                         "key": "stuck",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.stuck.label}}",
+                        "value": "Stuck",
                         "type": "active"
                     },
                     {
                         "key": "dustBinMissing",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.dustBinMissing.label}}",
+                        "value": "Dust bin missing",
                         "type": "active"
                     },
                     {
                         "key": "dustBinFull",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.dustBinFull.label}}",
+                        "value": "Dust bin full",
                         "type": "active"
                     },
                     {
                         "key": "waterTankEmpty",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.waterTankEmpty.label}}",
+                        "value": "Water tank empty",
                         "type": "active"
                     },
                     {
                         "key": "waterTankMissing",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.waterTankMissing.label}}",
+                        "value": "Water tank missing",
                         "type": "active"
                     },
                     {
                         "key": "waterTankLidOpen",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.waterTankLidOpen.label}}",
+                        "value": "Water tank lid open",
                         "type": "active"
                     },
                     {
                         "key": "mopCleaningPadMissing",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.mopCleaningPadMissing.label}}",
+                        "value": "Mop missing",
                         "type": "active"
                     }
                 ]
             }
+        },
+        {
+            "label": "Status",
+            "displayType": "list",
+            "list": {
+                "command": {
+                    "alternatives": [
+                        {
+                            "key": "start",
+                            "value": "Start",
+                            "type": "active"
+                        },
+                        {
+                            "key": "pause",
+                            "value": "Pause",
+                            "type": "active"
+                        },
+                        {
+                            "key": "goHome",
+                            "value": "Return",
+                            "type": "active"
+                        }
+                    ],
+                    "supportedValues": "supportedOperatingStateCommands.value"
+                }
+            }
         }
     ],
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "stopped",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.stopped.label}}",
+                            "value": "Stopped",
                             "type": "active"
                         },
                         {
                             "key": "running",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.running.label}}",
+                            "value": "Cleaning",
                             "type": "active"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.paused.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "seekingCharger",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.seekingCharger.label}}",
+                            "value": "Returning",
                             "type": "active"
                         },
                         {
                             "key": "charging",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.charging.label}}",
+                            "value": "Charging",
                             "type": "active"
                         },
                         {
                             "key": "docked",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.docked.label}}",
+                            "value": "Fully charged",
                             "type": "active"
                         },
                         {
                             "key": "unableToStartOrResume",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.unableToStartOrResume.label}}",
+                            "value": "Couldn't start",
                             "type": "active"
                         },
                         {
                             "key": "unableToCompleteOperation",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.unableToCompleteOperation.label}}",
+                            "value": "Couldn't complete",
                             "type": "active"
                         },
                         {
                             "key": "commandInvalidInState",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.commandInvalidInState.label}}",
+                            "value": "Couldn't do action",
                             "type": "active"
                         },
                         {
                             "key": "failedToFindChargingDock",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.failedToFindChargingDock.label}}",
+                            "value": "Couldn't find location",
                             "type": "active"
                         },
                         {
                             "key": "stuck",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.stuck.label}}",
+                            "value": "Stuck",
                             "type": "active"
                         },
                         {
                             "key": "dustBinMissing",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.dustBinMissing.label}}",
+                            "value": "Dust bin missing",
                             "type": "active"
                         },
                         {
                             "key": "dustBinFull",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.dustBinFull.label}}",
+                            "value": "Dust bin full",
                             "type": "active"
                         },
                         {
                             "key": "waterTankEmpty",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.waterTankEmpty.label}}",
+                            "value": "Water tank empty",
                             "type": "active"
                         },
                         {
                             "key": "waterTankMissing",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.waterTankMissing.label}}",
+                            "value": "Water tank missing",
                             "type": "active"
                         },
                         {
                             "key": "waterTankLidOpen",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.waterTankLidOpen.label}}",
+                            "value": "Water tank lid open",
                             "type": "active"
                         },
                         {
                             "key": "mopCleaningPadMissing",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.mopCleaningPadMissing.label}}",
+                            "value": "Mop missing",
                             "type": "active"
                         }
                     ],
@@ -291,7 +317,32 @@
                 }
             }
         ],
-        "actions": []
+        "actions": [
+            {
+                "label": "Status",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "start",
+                            "value": "Start",
+                            "type": "active"
+                        },
+                        {
+                            "key": "pause",
+                            "value": "Pause",
+                            "type": "active"
+                        },
+                        {
+                            "key": "goHome",
+                            "value": "Return",
+                            "type": "active"
+                        }
+                    ],
+                    "supportedValues": "supportedOperatingStateCommands.value"
+                }
+            }
+        ]
     },
     "id": "robotCleanerOperatingState",
     "version": 1
diff --git a/json/robotCleanerTurboModePresentation.json b/json/robotCleanerTurboModePresentation.json
index be67ecbf..308406c3 100755
--- a/json/robotCleanerTurboModePresentation.json
+++ b/json/robotCleanerTurboModePresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "active"
                     },
                     {
                         "key": "silence",
-                        "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.silence.label}}",
+                        "value": "Quiet",
                         "type": "active"
                     },
                     {
                         "key": "extraSilence",
-                        "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.extraSilence.label}}",
+                        "value": "Extra silence",
                         "type": "active"
                     }
                 ]
@@ -44,12 +44,12 @@
                         "alternatives": [
                             {
                                 "key": "silence",
-                                "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.silence.label}}",
+                                "value": "Quiet",
                                 "type": "active"
                             },
                             {
                                 "key": "extraSilence",
-                                "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.extraSilence.label}}",
+                                "value": "Extra silence",
                                 "type": "active"
                             }
                         ],
@@ -60,7 +60,7 @@
         ],
         "panelItems": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Turbo",
                 "displayType": "list",
                 "list": {
                     "command": {
@@ -68,22 +68,22 @@
                         "alternatives": [
                             {
                                 "key": "on",
-                                "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.on.label}}",
+                                "value": "On",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.off.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "silence",
-                                "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.silence.label}}",
+                                "value": "Quiet",
                                 "type": "active"
                             },
                             {
                                 "key": "extraSilence",
-                                "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.extraSilence.label}}",
+                                "value": "Extra silence",
                                 "type": "active"
                             }
                         ],
@@ -95,22 +95,22 @@
                         "alternatives": [
                             {
                                 "key": "on",
-                                "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.on.label}}",
+                                "value": "On",
                                 "type": "active"
                             },
                             {
                                 "key": "off",
-                                "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.off.label}}",
+                                "value": "Off",
                                 "type": "active"
                             },
                             {
                                 "key": "silence",
-                                "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.silence.label}}",
+                                "value": "Quiet",
                                 "type": "active"
                             },
                             {
                                 "key": "extraSilence",
-                                "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.extraSilence.label}}",
+                                "value": "Extra silence",
                                 "type": "active"
                             }
                         ]
@@ -128,7 +128,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Turbo",
             "displayType": "list",
             "list": {
                 "command": {
@@ -136,22 +136,22 @@
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "silence",
-                            "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.silence.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "extraSilence",
-                            "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.extraSilence.label}}",
+                            "value": "Extra silence",
                             "type": "active"
                         }
                     ],
@@ -163,22 +163,22 @@
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "silence",
-                            "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.silence.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "extraSilence",
-                            "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.extraSilence.label}}",
+                            "value": "Extra silence",
                             "type": "active"
                         }
                     ]
@@ -189,28 +189,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Turbo",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "silence",
-                            "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.silence.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "extraSilence",
-                            "value": "{{i18n.attributes.robotCleanerTurboMode.i18n.value.extraSilence.label}}",
+                            "value": "Extra silence",
                             "type": "active"
                         }
                     ],
@@ -222,28 +222,28 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Turbo",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "silence",
-                            "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.silence.label}}",
+                            "value": "Quiet",
                             "type": "active"
                         },
                         {
                             "key": "extraSilence",
-                            "value": "{{i18n.commands.setRobotCleanerTurboMode.arguments.mode.i18n.extraSilence.label}}",
+                            "value": "Extra silence",
                             "type": "active"
                         }
                     ],
diff --git a/json/safetySwitch.i18n.en.json b/json/safetySwitch.i18n.en.json
index 2a4865fb..012a3a90 100644
--- a/json/safetySwitch.i18n.en.json
+++ b/json/safetySwitch.i18n.en.json
@@ -1,17 +1,19 @@
 {
     "tag": "en",
-    "label": "Safety Switch",
+    "label": "Power",
+    "description": "Allow for the control of a safety switch device",
     "attributes": {
         "switch": {
-            "label": "switch",
+            "label": "Power",
+            "description": "A string representation of whether the safety switch is on or off",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
                 "value": {
                     "off": {
-                        "label": "off"
+                        "label": "Off"
                     },
                     "on": {
-                        "label": "on"
+                        "label": "On"
                     }
                 }
             }
@@ -19,7 +21,8 @@
     },
     "commands": {
         "off": {
-            "label": "off",
+            "label": "Turn Off",
+            "description": "Turn a safety switch off",
             "arguments": {}
         }
     }
diff --git a/json/safetySwitch.i18n.fr.json b/json/safetySwitch.i18n.fr.json
index 2a4865fb..f30dcb3e 100644
--- a/json/safetySwitch.i18n.fr.json
+++ b/json/safetySwitch.i18n.fr.json
@@ -1,17 +1,19 @@
 {
-    "tag": "en",
-    "label": "Safety Switch",
+    "tag": "fr",
+    "label": "Marche",
+    "description": "Allow for the control of a safety switch device",
     "attributes": {
         "switch": {
-            "label": "switch",
+            "label": "Marche",
+            "description": "A string representation of whether the safety switch is on or off",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
                 "value": {
                     "off": {
-                        "label": "off"
+                        "label": "Désactivé"
                     },
                     "on": {
-                        "label": "on"
+                        "label": "Activé"
                     }
                 }
             }
@@ -19,7 +21,8 @@
     },
     "commands": {
         "off": {
-            "label": "off",
+            "label": "Désactiver",
+            "description": "Turn a safety switch off",
             "arguments": {}
         }
     }
diff --git a/json/safetySwitchPresentation.json b/json/safetySwitchPresentation.json
new file mode 100644
index 00000000..1ac70d6d
--- /dev/null
+++ b/json/safetySwitchPresentation.json
@@ -0,0 +1,89 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{switch.value}}",
+                "alternatives": [
+                    {
+                        "key": "on",
+                        "value": "On",
+                        "type": "active"
+                    },
+                    {
+                        "key": "off",
+                        "value": "Off",
+                        "type": "inactive"
+                    }
+                ]
+            }
+        ],
+        "actions": [],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "Power",
+            "displayType": "list",
+            "list": {
+                "command": {
+                    "alternatives": [
+                        {
+                            "key": "off",
+                            "value": "Turn Off",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "{{WARNING_MESSAGE}}",
+                            "value": "For your safety, remote control for the {{DEVICE_NAME}} can only be used to turn it off, not to turn it on. After using the remote control, always make sure that the power is actually off.",
+                            "type": "active"
+                        }
+                    ]
+                },
+                "state": {
+                    "value": "switch.value",
+                    "valueType": "string",
+                    "alternatives": [
+                        {
+                            "key": "on",
+                            "value": "On",
+                            "type": "active"
+                        },
+                        {
+                            "key": "off",
+                            "value": "Off",
+                            "type": "inactive"
+                        }
+                    ]
+                }
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "Power",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "on",
+                            "value": "On",
+                            "type": "active"
+                        },
+                        {
+                            "key": "off",
+                            "value": "Off",
+                            "type": "inactive"
+                        }
+                    ],
+                    "value": "switch.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": []
+    },
+    "id": "safetySwitch",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/safetyValve.i18n.en.json b/json/safetyValve.i18n.en.json
index 884f71f0..12b87981 100644
--- a/json/safetyValve.i18n.en.json
+++ b/json/safetyValve.i18n.en.json
@@ -1,17 +1,19 @@
 {
     "tag": "en",
-    "label": "Safety Valve",
+    "label": "Valve",
+    "description": "Allows for the control of a safety valve device",
     "attributes": {
         "valve": {
-            "label": "valve",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Valve",
+            "description": "A string representation of whether the safety valve is open or closed",
+            "displayTemplate": "{{attribute}} of {{device.label}} is: {{value}}",
             "i18n": {
                 "value": {
                     "closed": {
-                        "label": "closed"
+                        "label": "Closed"
                     },
                     "open": {
-                        "label": "open"
+                        "label": "Open"
                     }
                 }
             }
@@ -19,7 +21,8 @@
     },
     "commands": {
         "close": {
-            "label": "close",
+            "label": "Close",
+            "description": "Close the safety valve",
             "arguments": {}
         }
     }
diff --git a/json/safetyValve.i18n.fr.json b/json/safetyValve.i18n.fr.json
index 884f71f0..a3d390f3 100644
--- a/json/safetyValve.i18n.fr.json
+++ b/json/safetyValve.i18n.fr.json
@@ -1,17 +1,19 @@
 {
-    "tag": "en",
-    "label": "Safety Valve",
+    "tag": "fr",
+    "label": "Vanne",
+    "description": "Allows for the control of a safety valve device",
     "attributes": {
         "valve": {
-            "label": "valve",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "label": "Vanne",
+            "description": "A string representation of whether the safety valve is open or closed",
+            "displayTemplate": "{{attribute}} of {{device.label}} is: {{value}}",
             "i18n": {
                 "value": {
                     "closed": {
-                        "label": "closed"
+                        "label": "Fermé"
                     },
                     "open": {
-                        "label": "open"
+                        "label": "Ouvert"
                     }
                 }
             }
@@ -19,7 +21,8 @@
     },
     "commands": {
         "close": {
-            "label": "close",
+            "label": "Fermer",
+            "description": "Close the safety valve",
             "arguments": {}
         }
     }
diff --git a/json/safetyValvePresentation.json b/json/safetyValvePresentation.json
new file mode 100644
index 00000000..cb639cf1
--- /dev/null
+++ b/json/safetyValvePresentation.json
@@ -0,0 +1,89 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{valve.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "Open",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "Closed",
+                        "type": "inactive"
+                    }
+                ]
+            }
+        ],
+        "actions": [],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "Valve",
+            "displayType": "list",
+            "list": {
+                "command": {
+                    "alternatives": [
+                        {
+                            "key": "close",
+                            "value": "Close",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "{{WARNING_MESSAGE}}",
+                            "value": "For your safety, remote control for the valve can only be used to close it, not to open it. After using the remote control, always make sure that the valve is actually closed.",
+                            "type": "active"
+                        }
+                    ]
+                },
+                "state": {
+                    "value": "valve.value",
+                    "valueType": "string",
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "Open",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "Closed",
+                            "type": "inactive"
+                        }
+                    ]
+                }
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "Valve",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "Open",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "Closed",
+                            "type": "inactive"
+                        }
+                    ],
+                    "value": "valve.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": []
+    },
+    "id": "safetyValve",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/samsungce.autoDispenseDetergent.json b/json/samsungce.autoDispenseDetergent.json
index dfd5d7df..55db7930 100755
--- a/json/samsungce.autoDispenseDetergent.json
+++ b/json/samsungce.autoDispenseDetergent.json
@@ -185,14 +185,14 @@
                     "value"
                 ]
             },
-            "setter": "setRecommendedAmount",
             "enumCommands": []
         }
     },
     "commands": {
         "unsetRecommendedAmount": {
             "name": "unsetRecommendedAmount",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setRecommendedAmount": {
             "name": "setRecommendedAmount",
@@ -217,7 +217,8 @@
                         "maximum": 20
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setType": {
             "name": "setType",
@@ -233,7 +234,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setAmount": {
             "name": "setAmount",
@@ -252,7 +254,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setDensity": {
             "name": "setDensity",
@@ -271,7 +274,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungce.countDownTimer.json b/json/samsungce.countDownTimer.json
index 7030b3d3..993c11b8 100755
--- a/json/samsungce.countDownTimer.json
+++ b/json/samsungce.countDownTimer.json
@@ -27,7 +27,6 @@
                     "value"
                 ]
             },
-            "setter": "setStartValue",
             "enumCommands": []
         },
         "currentValue": {
@@ -78,15 +77,18 @@
     "commands": {
         "resume": {
             "name": "resume",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "cancel": {
             "name": "cancel",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "start": {
             "name": "start",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setStartValue": {
             "name": "setStartValue",
@@ -110,11 +112,13 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "pause": {
             "name": "pause",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungce.customRecipe.json b/json/samsungce.customRecipe.json
index 1528184f..caec698b 100755
--- a/json/samsungce.customRecipe.json
+++ b/json/samsungce.customRecipe.json
@@ -16,7 +16,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.definedRecipe.json b/json/samsungce.definedRecipe.json
index 9237fb1c..a22db065 100755
--- a/json/samsungce.definedRecipe.json
+++ b/json/samsungce.definedRecipe.json
@@ -113,7 +113,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "cookDefinedRecipe": {
             "name": "cookDefinedRecipe",
@@ -170,7 +171,8 @@
                         "maximum": 255
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.detergentAutoReplenishment.json b/json/samsungce.detergentAutoReplenishment.json
index 6923f4db..a45ac4f9 100755
--- a/json/samsungce.detergentAutoReplenishment.json
+++ b/json/samsungce.detergentAutoReplenishment.json
@@ -406,7 +406,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setOrderThreshold": {
             "name": "setOrderThreshold",
@@ -431,7 +432,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "disableAlarm": {
             "name": "disableAlarm",
@@ -448,7 +450,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setAutoReplenishment": {
             "name": "setAutoReplenishment",
@@ -523,7 +526,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setInitialAmount": {
             "name": "setInitialAmount",
@@ -548,7 +552,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setRemainingAmount": {
             "name": "setRemainingAmount",
@@ -573,7 +578,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setDosage": {
             "name": "setDosage",
@@ -598,7 +604,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setType": {
             "name": "setType",
@@ -628,7 +635,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.detergentState.json b/json/samsungce.detergentState.json
index 10d89916..782a91d3 100755
--- a/json/samsungce.detergentState.json
+++ b/json/samsungce.detergentState.json
@@ -112,7 +112,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setInitialAmount": {
             "name": "setInitialAmount",
@@ -124,7 +125,8 @@
                         "type": "number"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setRemainingAmount": {
             "name": "setRemainingAmount",
@@ -136,7 +138,8 @@
                         "type": "number"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setDosage": {
             "name": "setDosage",
@@ -148,7 +151,8 @@
                         "type": "number"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.deviceIdentification.i18n.en.json b/json/samsungce.deviceIdentification.i18n.en.json
index 1c069e87..b42179a4 100755
--- a/json/samsungce.deviceIdentification.i18n.en.json
+++ b/json/samsungce.deviceIdentification.i18n.en.json
@@ -22,6 +22,23 @@
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
         },
+        "releaseCountry": {
+            "label": "releaseCountry",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "ZZ": {
+                        "label": "ZZ"
+                    },
+                    "KR": {
+                        "label": "KR"
+                    },
+                    "US": {
+                        "label": "US"
+                    }
+                }
+            }
+        },
         "modelClassificationCode": {
             "label": "modelClassificationCode",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
diff --git a/json/samsungce.deviceIdentification.i18n.fr.json b/json/samsungce.deviceIdentification.i18n.fr.json
index 1c069e87..b42179a4 100644
--- a/json/samsungce.deviceIdentification.i18n.fr.json
+++ b/json/samsungce.deviceIdentification.i18n.fr.json
@@ -22,6 +22,23 @@
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
         },
+        "releaseCountry": {
+            "label": "releaseCountry",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "ZZ": {
+                        "label": "ZZ"
+                    },
+                    "KR": {
+                        "label": "KR"
+                    },
+                    "US": {
+                        "label": "US"
+                    }
+                }
+            }
+        },
         "modelClassificationCode": {
             "label": "modelClassificationCode",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
diff --git a/json/samsungce.deviceIdentification.json b/json/samsungce.deviceIdentification.json
index d27b734e..650cbbae 100755
--- a/json/samsungce.deviceIdentification.json
+++ b/json/samsungce.deviceIdentification.json
@@ -65,6 +65,26 @@
             },
             "enumCommands": []
         },
+        "releaseCountry": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "US",
+                            "KR",
+                            "ZZ"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
         "modelClassificationCode": {
             "schema": {
                 "type": "object",
diff --git a/json/samsungce.doorStatePresentation.json b/json/samsungce.doorStatePresentation.json
index ea07389b..dcf1cbf3 100755
--- a/json/samsungce.doorStatePresentation.json
+++ b/json/samsungce.doorStatePresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "open",
-                        "value": "{{i18n.attributes.doorState.i18n.value.open.label}}",
+                        "value": "Door open",
                         "type": "active"
                     },
                     {
                         "key": "closed",
-                        "value": "{{i18n.attributes.doorState.i18n.value.closed.label}}",
+                        "value": "Door closed",
                         "type": "active"
                     }
                 ]
diff --git a/json/samsungce.dryerAutoCycleLink.json b/json/samsungce.dryerAutoCycleLink.json
index a991815c..807ef3b7 100755
--- a/json/samsungce.dryerAutoCycleLink.json
+++ b/json/samsungce.dryerAutoCycleLink.json
@@ -38,7 +38,8 @@
                         "pattern": "^AutoLinkCycle(_([A-Z]|[a-z]|\\d){4})+$"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setDryerAutoCycleLink": {
             "name": "setDryerAutoCycleLink",
@@ -54,7 +55,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.dryerCycle.json b/json/samsungce.dryerCycle.json
index 69f3c576..944702cd 100755
--- a/json/samsungce.dryerCycle.json
+++ b/json/samsungce.dryerCycle.json
@@ -136,7 +136,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.dryerCyclePreset.json b/json/samsungce.dryerCyclePreset.json
index f3250d70..24857223 100755
--- a/json/samsungce.dryerCyclePreset.json
+++ b/json/samsungce.dryerCyclePreset.json
@@ -132,7 +132,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "delete": {
             "name": "delete",
@@ -148,7 +149,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.dryerDryingTemperature.json b/json/samsungce.dryerDryingTemperature.json
index 05ee79cf..bcea3bfc 100755
--- a/json/samsungce.dryerDryingTemperature.json
+++ b/json/samsungce.dryerDryingTemperature.json
@@ -129,7 +129,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.dryerDryingTime.json b/json/samsungce.dryerDryingTime.json
index 5a8f14b7..666a67b6 100755
--- a/json/samsungce.dryerDryingTime.json
+++ b/json/samsungce.dryerDryingTime.json
@@ -58,7 +58,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.dryerOperatingState.i18n.fr.json b/json/samsungce.dryerOperatingState.i18n.fr.json
index 9ef134bd..26738a26 100755
--- a/json/samsungce.dryerOperatingState.i18n.fr.json
+++ b/json/samsungce.dryerOperatingState.i18n.fr.json
@@ -63,7 +63,7 @@
                         "label": "Préparation en cours"
                     },
                     "thawingFrozenInside": {
-                        "label": "Dégivrage"
+                        "label": "Dégivrage en cours"
                     },
                     "delayDry": {
                         "label": "Fin du cycle différé"
@@ -93,7 +93,7 @@
                         "label": "Séchage en cours"
                     },
                     "freezeProtection": {
-                        "label": "Mode antigel"
+                        "label": "Évitez la formation de gel"
                     }
                 }
             }
diff --git a/json/samsungce.dryerOperatingState.json b/json/samsungce.dryerOperatingState.json
index ea741611..0f93c0e5 100755
--- a/json/samsungce.dryerOperatingState.json
+++ b/json/samsungce.dryerOperatingState.json
@@ -201,15 +201,18 @@
     "commands": {
         "resume": {
             "name": "resume",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "cancel": {
             "name": "cancel",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "start": {
             "name": "start",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setDelayEnd": {
             "name": "setDelayEnd",
@@ -223,11 +226,13 @@
                         "maximum": 1440
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "pause": {
             "name": "pause",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.dryerOperatingStatePresentation.json b/json/samsungce.dryerOperatingStatePresentation.json
index 2c09aaf2..dfd2f634 100755
--- a/json/samsungce.dryerOperatingStatePresentation.json
+++ b/json/samsungce.dryerOperatingStatePresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.ready.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.running.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "paused",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.paused.label}}",
+                        "value": "Paused",
                         "type": "active"
                     }
                 ]
@@ -26,87 +26,87 @@
                 "alternatives": [
                     {
                         "key": "drying",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.drying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.cooling.label}}",
+                        "value": "Cooling",
                         "type": "active"
                     },
                     {
                         "key": "refreshing",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.refreshing.label}}",
+                        "value": "Refreshing",
                         "type": "active"
                     },
                     {
                         "key": "dehumidifying",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.dehumidifying.label}}",
+                        "value": "Dehumidifying",
                         "type": "active"
                     },
                     {
                         "key": "sanitizing",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.sanitizing.label}}",
+                        "value": "Sanitizing",
                         "type": "active"
                     },
                     {
                         "key": "internalCare",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.internalCare.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "weightSensing",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.weightSensing.label}}",
+                        "value": "Sensing the load",
                         "type": "active"
                     },
                     {
                         "key": "aIDrying",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.aIDrying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "humiditySensing",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.humiditySensing.label}}",
+                        "value": "Sensing",
                         "type": "active"
                     },
                     {
                         "key": "thawingFrozenInside",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.thawingFrozenInside.label}}",
+                        "value": "Defrosting",
                         "type": "active"
                     },
                     {
                         "key": "freezeProtection",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.freezeProtection.label}}",
+                        "value": "Prevent freezing",
                         "type": "active"
                     },
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.none.label}}",
+                        "value": "Preparing",
                         "type": "active"
                     },
                     {
                         "key": "continuousDehumidifying",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.continuousDehumidifying.label}}",
+                        "value": "Dehumidifying",
                         "type": "active"
                     },
                     {
                         "key": "finished",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.finished.label}}",
+                        "value": "Cycle complete",
                         "type": "active"
                     },
                     {
                         "key": "delayDry",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.delayDry.label}}",
+                        "value": "End of cycle delayed",
                         "type": "active"
                     },
                     {
                         "key": "laundrySensing",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.laundrySensing.label}}",
+                        "value": "Detecting laundry",
                         "type": "active"
                     },
                     {
                         "key": "wrinklePrevent",
-                        "value": "{{i18n.attributes.dryerJobState.i18n.value.wrinklePrevent.label}}",
+                        "value": "Wrinkle Preventing",
                         "type": "active"
                     }
                 ]
@@ -115,7 +115,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.commands.panelStart.label}}",
+                "label": "Start",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "start",
@@ -131,7 +131,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.panelCancel.label}}",
+                "label": "Cancel",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "cancel",
@@ -147,7 +147,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.panelPause.label}}",
+                "label": "Pause",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "pause",
@@ -163,7 +163,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.panelResume.label}}",
+                "label": "Resume",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "start",
@@ -179,7 +179,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.panelOk.label}}",
+                "label": "OK",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "cancel",
@@ -198,23 +198,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.operatingState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "ready",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.ready.label}}",
+                            "value": "Ready",
                             "type": "active"
                         },
                         {
                             "key": "running",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.running.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.paused.label}}",
+                            "value": "Paused",
                             "type": "active"
                         }
                     ],
@@ -224,93 +224,93 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.dryerJobState.label}}",
+                "label": "Drying progress",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "drying",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.drying.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "cooling",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.cooling.label}}",
+                            "value": "Cooling",
                             "type": "active"
                         },
                         {
                             "key": "refreshing",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.refreshing.label}}",
+                            "value": "Refreshing",
                             "type": "active"
                         },
                         {
                             "key": "dehumidifying",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.dehumidifying.label}}",
+                            "value": "Dehumidifying",
                             "type": "active"
                         },
                         {
                             "key": "sanitizing",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.sanitizing.label}}",
+                            "value": "Sanitizing",
                             "type": "active"
                         },
                         {
                             "key": "internalCare",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.internalCare.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "weightSensing",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.weightSensing.label}}",
+                            "value": "Sensing the load",
                             "type": "active"
                         },
                         {
                             "key": "aIDrying",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.aIDrying.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "humiditySensing",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.humiditySensing.label}}",
+                            "value": "Sensing",
                             "type": "active"
                         },
                         {
                             "key": "thawingFrozenInside",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.thawingFrozenInside.label}}",
+                            "value": "Defrosting",
                             "type": "active"
                         },
                         {
                             "key": "freezeProtection",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.freezeProtection.label}}",
+                            "value": "Prevent freezing",
                             "type": "active"
                         },
                         {
                             "key": "none",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.none.label}}",
+                            "value": "Preparing",
                             "type": "active"
                         },
                         {
                             "key": "continuousDehumidifying",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.continuousDehumidifying.label}}",
+                            "value": "Dehumidifying",
                             "type": "active"
                         },
                         {
                             "key": "finished",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.finished.label}}",
+                            "value": "Cycle complete",
                             "type": "active"
                         },
                         {
                             "key": "delayDry",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.delayDry.label}}",
+                            "value": "End of cycle delayed",
                             "type": "active"
                         },
                         {
                             "key": "laundrySensing",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.laundrySensing.label}}",
+                            "value": "Detecting laundry",
                             "type": "active"
                         },
                         {
                             "key": "wrinklePrevent",
-                            "value": "{{i18n.attributes.dryerJobState.i18n.value.wrinklePrevent.label}}",
+                            "value": "Wrinkle Preventing",
                             "type": "active"
                         }
                     ],
@@ -322,23 +322,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.operatingState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "start",
-                            "value": "{{i18n.commands.start.label}}",
+                            "value": "Start cycle",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause cycle",
                             "type": "active"
                         },
                         {
                             "key": "cancel",
-                            "value": "{{i18n.commands.cancel.label}}",
+                            "value": "Cancel cycle",
                             "type": "active"
                         }
                     ]
diff --git a/json/samsungce.dustFilterAlarm.json b/json/samsungce.dustFilterAlarm.json
index d9cd29e7..768ec088 100755
--- a/json/samsungce.dustFilterAlarm.json
+++ b/json/samsungce.dustFilterAlarm.json
@@ -71,7 +71,8 @@
                         "type": "integer"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.ehsFsvSettings.json b/json/samsungce.ehsFsvSettings.json
index 52ebc24a..b87e9820 100755
--- a/json/samsungce.ehsFsvSettings.json
+++ b/json/samsungce.ehsFsvSettings.json
@@ -92,11 +92,13 @@
                         "type": "number"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "refresh": {
             "name": "refresh",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.errorAndAlarmState.json b/json/samsungce.errorAndAlarmState.json
index 8581fa9a..72c44392 100755
--- a/json/samsungce.errorAndAlarmState.json
+++ b/json/samsungce.errorAndAlarmState.json
@@ -18,9 +18,19 @@
                                     "type": "string",
                                     "pattern": "^(?:[1-9]\\d{3}-?(?:(?:0[1-9]|1[0-2])-?(?:0[1-9]|1\\d|2[0-8])|(?:0[13-9]|1[0-2])-?(?:29|30)|(?:0[13578]|1[02])-?31)|(?:[1-9]\\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)-?02-?29)T(?:[01]\\d|2[0-3]):?[0-5]\\d:?[0-5]\\d(?:\\.\\d{3})?(?:Z|[+-][01]\\d(?::?[0-5]\\d)?)$"
                                 },
+                                "type": {
+                                    "type": "string",
+                                    "enum": [
+                                        "error",
+                                        "alarm"
+                                    ]
+                                },
                                 "code": {
                                     "type": "string"
                                 },
+                                "normalizedCode": {
+                                    "type": "string"
+                                },
                                 "description": {
                                     "type": "string"
                                 }
diff --git a/json/samsungce.fridgePantryMode.json b/json/samsungce.fridgePantryMode.json
index 6b0cd428..a5d5b0d1 100755
--- a/json/samsungce.fridgePantryMode.json
+++ b/json/samsungce.fridgePantryMode.json
@@ -19,7 +19,6 @@
                     "value"
                 ]
             },
-            "setter": "setMode",
             "enumCommands": []
         },
         "supportedModes": {
@@ -53,7 +52,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungce.hoodFanSpeed.json b/json/samsungce.hoodFanSpeed.json
index fe9f5415..eb31639e 100755
--- a/json/samsungce.hoodFanSpeed.json
+++ b/json/samsungce.hoodFanSpeed.json
@@ -33,7 +33,6 @@
                     "value"
                 ]
             },
-            "setter": "setHoodFanSpeed",
             "enumCommands": []
         },
         "supportedHoodFanSpeed": {
@@ -81,7 +80,8 @@
                         "type": "integer"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungce.hoodFanSpeedPresentation.json b/json/samsungce.hoodFanSpeedPresentation.json
index 4ddfa577..e2164279 100755
--- a/json/samsungce.hoodFanSpeedPresentation.json
+++ b/json/samsungce.hoodFanSpeedPresentation.json
@@ -6,72 +6,72 @@
                 "alternatives": [
                     {
                         "key": "0",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.0.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     },
                     {
                         "key": "1",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.1.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "2",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.2.label}}",
+                        "value": "Medium",
                         "type": "active"
                     },
                     {
                         "key": "3",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.3.label}}",
+                        "value": "High",
                         "type": "active"
                     },
                     {
                         "key": "4",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.4.label}}",
+                        "value": "Boost",
                         "type": "active"
                     },
                     {
                         "key": "5",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.5.label}}",
+                        "value": "Auto",
                         "type": "active"
                     },
                     {
                         "key": "6",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.6.label}}",
+                        "value": "Smart",
                         "type": "active"
                     },
                     {
                         "key": "7",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.7.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "14",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.14.label}}",
+                        "value": "Smart",
                         "type": "active"
                     },
                     {
                         "key": "15",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.15.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "16",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.16.label}}",
+                        "value": "Medium",
                         "type": "active"
                     },
                     {
                         "key": "17",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.17.label}}",
+                        "value": "High",
                         "type": "active"
                     },
                     {
                         "key": "18",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.18.label}}",
+                        "value": "Max",
                         "type": "active"
                     },
                     {
                         "key": "19",
-                        "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.19.label}}",
+                        "value": "Boost",
                         "type": "active"
                     }
                 ]
@@ -83,68 +83,68 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Wind strength",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "1",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.1.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "2",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.2.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "3",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.3.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "4",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.4.label}}",
+                            "value": "Boost",
                             "type": "active"
                         },
                         {
                             "key": "6",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.6.label}}",
+                            "value": "Smart",
                             "type": "active"
                         },
                         {
                             "key": "7",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.7.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "14",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.14.label}}",
+                            "value": "Smart",
                             "type": "active"
                         },
                         {
                             "key": "15",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.15.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "16",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.16.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "17",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.17.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "18",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.18.label}}",
+                            "value": "Max",
                             "type": "active"
                         },
                         {
                             "key": "19",
-                            "value": "{{i18n.attributes.hoodFanSpeed.i18n.value.19.label}}",
+                            "value": "Boost",
                             "type": "active"
                         }
                     ],
@@ -157,73 +157,73 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Wind strength",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "0",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.0.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "1",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.1.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "2",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.2.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "3",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.3.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "4",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.4.label}}",
+                            "value": "Boost",
                             "type": "active"
                         },
                         {
                             "key": "6",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.6.label}}",
+                            "value": "Smart",
                             "type": "active"
                         },
                         {
                             "key": "7",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.7.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "14",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.14.label}}",
+                            "value": "Smart",
                             "type": "active"
                         },
                         {
                             "key": "18",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.18.label}}",
+                            "value": "Max",
                             "type": "active"
                         },
                         {
                             "key": "19",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.19.label}}",
+                            "value": "Boost",
                             "type": "active"
                         },
                         {
                             "key": "17",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.17.label}}",
+                            "value": "High",
                             "type": "active"
                         },
                         {
                             "key": "16",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.16.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "15",
-                            "value": "{{i18n.commands.setHoodFanSpeed.arguments.speed.i18n.15.label}}",
+                            "value": "Low",
                             "type": "active"
                         }
                     ],
diff --git a/json/samsungce.individualControlLockPresentation.json b/json/samsungce.individualControlLockPresentation.json
index 083d2a3a..0b122db0 100644
--- a/json/samsungce.individualControlLockPresentation.json
+++ b/json/samsungce.individualControlLockPresentation.json
@@ -2,7 +2,7 @@
     "dashboard": {
         "states": [
             {
-                "label": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_AC_DEVICE_CARD_UNDER_CENTRAL_CONTROL}}"
+                "label": "Under central control"
             }
         ],
         "actions": [],
diff --git a/json/samsungce.kidsLockControl.json b/json/samsungce.kidsLockControl.json
index 4da23537..4de160f1 100755
--- a/json/samsungce.kidsLockControl.json
+++ b/json/samsungce.kidsLockControl.json
@@ -29,11 +29,13 @@
     "commands": {
         "unlock": {
             "name": "unlock",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "lock": {
             "name": "lock",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.kidsLockControlPresentation.json b/json/samsungce.kidsLockControlPresentation.json
index 4bdc11ca..eef35785 100755
--- a/json/samsungce.kidsLockControlPresentation.json
+++ b/json/samsungce.kidsLockControlPresentation.json
@@ -3,18 +3,18 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Child lock",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "lock",
-                            "value": "{{i18n.commands.lock.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "unlock",
-                            "value": "{{i18n.commands.unlock.label}}",
+                            "value": "Off",
                             "type": "active"
                         }
                     ]
diff --git a/json/samsungce.kitchenModeSpecification.json b/json/samsungce.kitchenModeSpecification.json
index 8994e154..fc774fcb 100755
--- a/json/samsungce.kitchenModeSpecification.json
+++ b/json/samsungce.kitchenModeSpecification.json
@@ -24,6 +24,10 @@
                                         "mode": {
                                             "type": "string"
                                         },
+                                        "default": {
+                                            "type": "boolean",
+                                            "default": false
+                                        },
                                         "supportedOperations": {
                                             "type": "array",
                                             "items": {
@@ -86,6 +90,37 @@
                                                             "pattern": "^\\d\\d+:[0-5]\\d:[0-5]\\d$"
                                                         }
                                                     }
+                                                },
+                                                "temperatureLevel": {
+                                                    "type": "object",
+                                                    "additionalProperties": false,
+                                                    "patternProperties": {
+                                                        "^(min|max|default)$": {
+                                                            "type": "string"
+                                                        }
+                                                    },
+                                                    "properties": {
+                                                        "supportedValues": {
+                                                            "type": "array",
+                                                            "items": {
+                                                                "type": "string"
+                                                            }
+                                                        },
+                                                        "temperatureLevelSpec": {
+                                                            "type": "object",
+                                                            "additionalProperties": false,
+                                                            "patternProperties": {
+                                                                "^(low|medium|high)$": {
+                                                                    "type": "object",
+                                                                    "patternProperties": {
+                                                                        "^(C|F)$": {
+                                                                            "type": "number"
+                                                                        }
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                    }
                                                 }
                                             }
                                         }
diff --git a/json/samsungce.lamp.json b/json/samsungce.lamp.json
index 5fde8f1c..40d6e891 100755
--- a/json/samsungce.lamp.json
+++ b/json/samsungce.lamp.json
@@ -35,7 +35,6 @@
                     "value"
                 ]
             },
-            "setter": "setBrightnessLevel",
             "enumCommands": []
         },
         "supportedBrightnessLevel": {
@@ -102,7 +101,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungce.lampPresentation.json b/json/samsungce.lampPresentation.json
index 61f124ce..ddd91af2 100755
--- a/json/samsungce.lampPresentation.json
+++ b/json/samsungce.lampPresentation.json
@@ -3,28 +3,28 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Light",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setBrightnessLevel.arguments.mode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "active"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.commands.setBrightnessLevel.arguments.mode.i18n.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "mid",
-                            "value": "{{i18n.commands.setBrightnessLevel.arguments.mode.i18n.mid.label}}",
+                            "value": "Medium",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.commands.setBrightnessLevel.arguments.mode.i18n.high.label}}",
+                            "value": "High",
                             "type": "active"
                         }
                     ],
diff --git a/json/samsungce.meatProbe.json b/json/samsungce.meatProbe.json
index 6b55f78a..42932494 100755
--- a/json/samsungce.meatProbe.json
+++ b/json/samsungce.meatProbe.json
@@ -28,7 +28,6 @@
                     "unit"
                 ]
             },
-            "setter": "setTemperatureSetpoint",
             "enumCommands": []
         },
         "temperature": {
@@ -88,7 +87,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungce.musicPlaylist.json b/json/samsungce.musicPlaylist.json
index 58596e98..26e0e68f 100755
--- a/json/samsungce.musicPlaylist.json
+++ b/json/samsungce.musicPlaylist.json
@@ -97,7 +97,6 @@
                     "value"
                 ]
             },
-            "setter": "setPlaylist",
             "enumCommands": []
         }
     },
@@ -148,7 +147,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungce.ovenMode.i18n.en.json b/json/samsungce.ovenMode.i18n.en.json
index 52216acf..44134be0 100755
--- a/json/samsungce.ovenMode.i18n.en.json
+++ b/json/samsungce.ovenMode.i18n.en.json
@@ -417,12 +417,18 @@
                     "DefrostA": {
                         "label": "DefrostA"
                     },
+                    "Pizza": {
+                        "label": "Pizza"
+                    },
                     "BreadProof": {
                         "label": "BreadProof"
                     },
                     "MicroWaveRoast": {
                         "label": "MicroWaveRoast"
                     },
+                    "AirFryMax": {
+                        "label": "AirFryMax"
+                    },
                     "PowerConvection": {
                         "label": "PowerConvection"
                     },
diff --git a/json/samsungce.ovenMode.i18n.fr.json b/json/samsungce.ovenMode.i18n.fr.json
index 52216acf..44134be0 100644
--- a/json/samsungce.ovenMode.i18n.fr.json
+++ b/json/samsungce.ovenMode.i18n.fr.json
@@ -417,12 +417,18 @@
                     "DefrostA": {
                         "label": "DefrostA"
                     },
+                    "Pizza": {
+                        "label": "Pizza"
+                    },
                     "BreadProof": {
                         "label": "BreadProof"
                     },
                     "MicroWaveRoast": {
                         "label": "MicroWaveRoast"
                     },
+                    "AirFryMax": {
+                        "label": "AirFryMax"
+                    },
                     "PowerConvection": {
                         "label": "PowerConvection"
                     },
diff --git a/json/samsungce.ovenMode.json b/json/samsungce.ovenMode.json
index 2a195d19..3270320a 100755
--- a/json/samsungce.ovenMode.json
+++ b/json/samsungce.ovenMode.json
@@ -20,6 +20,7 @@
                                 "AiSousvide",
                                 "AirFry",
                                 "AirFryer",
+                                "AirFryMax",
                                 "AirSousvide",
                                 "Autocook",
                                 "AutocookCustom",
@@ -100,6 +101,7 @@
                                 "MultiLevelCook",
                                 "NaturalSteam",
                                 "NoOperation",
+                                "Pizza",
                                 "PizzaCook",
                                 "PizzaNaan",
                                 "PlateWarm",
@@ -188,6 +190,7 @@
                             "AiSousvide",
                             "AirFry",
                             "AirFryer",
+                            "AirFryMax",
                             "AirSousvide",
                             "Autocook",
                             "AutocookCustom",
@@ -268,6 +271,7 @@
                             "MultiLevelCook",
                             "NaturalSteam",
                             "NoOperation",
+                            "Pizza",
                             "PizzaCook",
                             "PizzaNaan",
                             "PlateWarm",
@@ -340,7 +344,6 @@
                     "value"
                 ]
             },
-            "setter": "setOvenMode",
             "enumCommands": []
         }
     },
@@ -359,6 +362,7 @@
                             "AiSousvide",
                             "AirFry",
                             "AirFryer",
+                            "AirFryMax",
                             "AirSousvide",
                             "Autocook",
                             "AutocookCustom",
@@ -439,6 +443,7 @@
                             "MultiLevelCook",
                             "NaturalSteam",
                             "NoOperation",
+                            "Pizza",
                             "PizzaCook",
                             "PizzaNaan",
                             "PlateWarm",
@@ -506,7 +511,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungce.ovenOperatingState.json b/json/samsungce.ovenOperatingState.json
index 488aca8e..3171303b 100755
--- a/json/samsungce.ovenOperatingState.json
+++ b/json/samsungce.ovenOperatingState.json
@@ -110,7 +110,6 @@
                     "value"
                 ]
             },
-            "setter": "setOperationTime",
             "enumCommands": []
         }
     },
@@ -126,19 +125,23 @@
                         "pattern": "^\\d\\d+:[0-5]\\d:[0-5]\\d$"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "stop": {
             "name": "stop",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "start": {
             "name": "start",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "pause": {
             "name": "pause",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungce.powerCool.json b/json/samsungce.powerCool.json
index 7b89d016..d5c89035 100755
--- a/json/samsungce.powerCool.json
+++ b/json/samsungce.powerCool.json
@@ -24,11 +24,13 @@
     "commands": {
         "activate": {
             "name": "activate",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "deactivate": {
             "name": "deactivate",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.powerCoolPresentation.json b/json/samsungce.powerCoolPresentation.json
index 7d10cfc9..84b472f2 100755
--- a/json/samsungce.powerCoolPresentation.json
+++ b/json/samsungce.powerCoolPresentation.json
@@ -3,18 +3,18 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Power Cool",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "activate",
-                            "value": "{{i18n.commands.activate.label}}",
+                            "value": "Turn On",
                             "type": "active"
                         },
                         {
                             "key": "deactivate",
-                            "value": "{{i18n.commands.deactivate.label}}",
+                            "value": "Turn Off",
                             "type": "active"
                         }
                     ]
diff --git a/json/samsungce.powerFreeze.json b/json/samsungce.powerFreeze.json
index 259388a4..e11fbd44 100755
--- a/json/samsungce.powerFreeze.json
+++ b/json/samsungce.powerFreeze.json
@@ -24,11 +24,13 @@
     "commands": {
         "activate": {
             "name": "activate",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "deactivate": {
             "name": "deactivate",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.powerFreezePresentation.json b/json/samsungce.powerFreezePresentation.json
index b6108019..4aedf01a 100755
--- a/json/samsungce.powerFreezePresentation.json
+++ b/json/samsungce.powerFreezePresentation.json
@@ -3,18 +3,18 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Power Freeze",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "activate",
-                            "value": "{{i18n.commands.activate.label}}",
+                            "value": "Turn On",
                             "type": "active"
                         },
                         {
                             "key": "deactivate",
-                            "value": "{{i18n.commands.deactivate.label}}",
+                            "value": "Turn Off",
                             "type": "active"
                         }
                     ]
diff --git a/json/samsungce.remoteManagementData.json b/json/samsungce.remoteManagementData.json
index 7035d968..e632fee7 100755
--- a/json/samsungce.remoteManagementData.json
+++ b/json/samsungce.remoteManagementData.json
@@ -48,7 +48,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerAudioClip.json b/json/samsungce.robotCleanerAudioClip.json
index b90296e1..68d72de4 100755
--- a/json/samsungce.robotCleanerAudioClip.json
+++ b/json/samsungce.robotCleanerAudioClip.json
@@ -25,11 +25,13 @@
     "commands": {
         "enable": {
             "name": "enable",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "disable": {
             "name": "disable",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerAvpRegistration.json b/json/samsungce.robotCleanerAvpRegistration.json
index f51de385..877d12c5 100755
--- a/json/samsungce.robotCleanerAvpRegistration.json
+++ b/json/samsungce.robotCleanerAvpRegistration.json
@@ -30,7 +30,8 @@
     "commands": {
         "register": {
             "name": "register",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerCleaningMode.i18n.en.json b/json/samsungce.robotCleanerCleaningMode.i18n.en.json
index f91acc0f..63a23a5a 100755
--- a/json/samsungce.robotCleanerCleaningMode.i18n.en.json
+++ b/json/samsungce.robotCleanerCleaningMode.i18n.en.json
@@ -1,6 +1,6 @@
 {
     "tag": "en",
-    "label": "Robot Cleaner Cleaning Mode",
+    "label": "Pause",
     "attributes": {
         "supportedCleaningMode": {
             "label": "supportedCleaningMode",
diff --git a/json/samsungce.robotCleanerCleaningMode.i18n.fr.json b/json/samsungce.robotCleanerCleaningMode.i18n.fr.json
index f91acc0f..a592bfd0 100644
--- a/json/samsungce.robotCleanerCleaningMode.i18n.fr.json
+++ b/json/samsungce.robotCleanerCleaningMode.i18n.fr.json
@@ -1,6 +1,6 @@
 {
-    "tag": "en",
-    "label": "Robot Cleaner Cleaning Mode",
+    "tag": "fr",
+    "label": "Pause",
     "attributes": {
         "supportedCleaningMode": {
             "label": "supportedCleaningMode",
diff --git a/json/samsungce.robotCleanerCleaningMode.json b/json/samsungce.robotCleanerCleaningMode.json
index a34c414e..7735e991 100755
--- a/json/samsungce.robotCleanerCleaningMode.json
+++ b/json/samsungce.robotCleanerCleaningMode.json
@@ -120,15 +120,18 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "disableRepeatMode": {
             "name": "disableRepeatMode",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "enableRepeatMode": {
             "name": "enableRepeatMode",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerCleaningModePresentation.json b/json/samsungce.robotCleanerCleaningModePresentation.json
new file mode 100644
index 00000000..7e4fecbf
--- /dev/null
+++ b/json/samsungce.robotCleanerCleaningModePresentation.json
@@ -0,0 +1,24 @@
+{
+    "automation": {
+        "conditions": [],
+        "actions": [
+            {
+                "label": "Pause",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "stop",
+                            "value": "Pause",
+                            "type": "active"
+                        }
+                    ],
+                    "command": "setCleaningMode",
+                    "argumentType": "string"
+                }
+            }
+        ]
+    },
+    "id": "samsungce.robotCleanerCleaningMode",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerMonitoringAutomation.json b/json/samsungce.robotCleanerMonitoringAutomation.json
index 8a030904..964ea275 100755
--- a/json/samsungce.robotCleanerMonitoringAutomation.json
+++ b/json/samsungce.robotCleanerMonitoringAutomation.json
@@ -8,7 +8,8 @@
     "commands": {
         "enableMonitoringAutomation": {
             "name": "enableMonitoringAutomation",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerMonitoringAutomationPresentation.json b/json/samsungce.robotCleanerMonitoringAutomationPresentation.json
index 24a981d7..b2c2b423 100755
--- a/json/samsungce.robotCleanerMonitoringAutomationPresentation.json
+++ b/json/samsungce.robotCleanerMonitoringAutomationPresentation.json
@@ -3,13 +3,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Monitoring",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "enableMonitoringAutomation",
-                            "value": "{{i18n.label}}",
+                            "value": "Monitoring",
                             "type": "active"
                         }
                     ]
diff --git a/json/samsungce.robotCleanerOperatingState.i18n.en.json b/json/samsungce.robotCleanerOperatingState.i18n.en.json
index 0ec5c97a..81b1c061 100755
--- a/json/samsungce.robotCleanerOperatingState.i18n.en.json
+++ b/json/samsungce.robotCleanerOperatingState.i18n.en.json
@@ -18,11 +18,14 @@
                     "washingMop": {
                         "label": "Washing mop"
                     },
+                    "internalWash": {
+                        "label": "Internal cleaning"
+                    },
                     "paused": {
                         "label": "Paused"
                     },
                     "sabbath": {
-                        "label": "sabbath"
+                        "label": "Sabbath mode"
                     },
                     "attachingMopPadForRemainingJob": {
                         "label": "Attaching mop"
@@ -39,12 +42,18 @@
                     "factoryReset": {
                         "label": "factoryReset"
                     },
+                    "emptyStation": {
+                        "label": "Draining water"
+                    },
                     "error": {
                         "label": "Check required"
                     },
                     "manual": {
                         "label": "Monitoring"
                     },
+                    "cleaningStart": {
+                        "label": "Cleaning starts"
+                    },
                     "mediaPlaying": {
                         "label": "mediaPlaying"
                     },
@@ -82,7 +91,7 @@
                         "label": "Waiting"
                     },
                     "suspend": {
-                        "label": "suspend"
+                        "label": "Power saving mode"
                     },
                     "detachingMopPad": {
                         "label": "Removing mop"
@@ -97,7 +106,7 @@
                         "label": "Monitoring"
                     },
                     "supplyingWater": {
-                        "label": "Filling the water in"
+                        "label": "Filling water in"
                     },
                     "charging": {
                         "label": "Charging"
@@ -118,11 +127,14 @@
                         "label": "Emptying water"
                     },
                     "exploring": {
-                        "label": "Exploring"
+                        "label": "Drawing map"
                     },
                     "calibrating": {
                         "label": "Calibrating"
                     },
+                    "cleaningEnd": {
+                        "label": "Cleaning completed"
+                    },
                     "reserved": {
                         "label": "reserved"
                     },
@@ -153,7 +165,7 @@
                         "label": "none"
                     },
                     "vacuuming": {
-                        "label": "Vacumming"
+                        "label": "Vacuuming"
                     },
                     "mopping": {
                         "label": "Wet mopping"
diff --git a/json/samsungce.robotCleanerOperatingState.i18n.fr.json b/json/samsungce.robotCleanerOperatingState.i18n.fr.json
index bab5c5b6..e77cb525 100755
--- a/json/samsungce.robotCleanerOperatingState.i18n.fr.json
+++ b/json/samsungce.robotCleanerOperatingState.i18n.fr.json
@@ -18,11 +18,14 @@
                     "washingMop": {
                         "label": "Lavage de la serpillère"
                     },
+                    "internalWash": {
+                        "label": "Nettoyage interne"
+                    },
                     "paused": {
                         "label": "Pause"
                     },
                     "sabbath": {
-                        "label": "sabbath"
+                        "label": "Mode Shabbat"
                     },
                     "attachingMopPadForRemainingJob": {
                         "label": "Serpillère en train d'être fixée"
@@ -39,12 +42,18 @@
                     "factoryReset": {
                         "label": "factoryReset"
                     },
+                    "emptyStation": {
+                        "label": "Vidange de l'eau"
+                    },
                     "error": {
                         "label": "Vérification requise"
                     },
                     "manual": {
                         "label": "Surveillance"
                     },
+                    "cleaningStart": {
+                        "label": "Nettoyage commencé"
+                    },
                     "mediaPlaying": {
                         "label": "mediaPlaying"
                     },
@@ -82,7 +91,7 @@
                         "label": "En attente"
                     },
                     "suspend": {
-                        "label": "suspend"
+                        "label": "Mode d'économie d'énergie"
                     },
                     "detachingMopPad": {
                         "label": "Serpillère en train d'être retirée"
@@ -118,11 +127,14 @@
                         "label": "Vidage de l'eau"
                     },
                     "exploring": {
-                        "label": "Exploration"
+                        "label": "Création de carte"
                     },
                     "calibrating": {
                         "label": "Étalonnage en cours"
                     },
+                    "cleaningEnd": {
+                        "label": "Nettoyage terminé."
+                    },
                     "reserved": {
                         "label": "reserved"
                     },
diff --git a/json/samsungce.robotCleanerOperatingState.json b/json/samsungce.robotCleanerOperatingState.json
index 0cc57280..c5094418 100755
--- a/json/samsungce.robotCleanerOperatingState.json
+++ b/json/samsungce.robotCleanerOperatingState.json
@@ -53,7 +53,13 @@
                                 "mopWashingPaused",
                                 "spinDrying",
                                 "preparingWater",
-                                "supplyingWater"
+                                "supplyingWater",
+                                "sabbath",
+                                "suspend",
+                                "emptyStation",
+                                "internalWash",
+                                "cleaningStart",
+                                "cleaningEnd"
                             ]
                         }
                     }
@@ -111,7 +117,13 @@
                             "mopWashingPaused",
                             "spinDrying",
                             "preparingWater",
-                            "supplyingWater"
+                            "supplyingWater",
+                            "sabbath",
+                            "suspend",
+                            "emptyStation",
+                            "internalWash",
+                            "cleaningStart",
+                            "cleaningEnd"
                         ]
                     }
                 },
@@ -192,7 +204,8 @@
     "commands": {
         "resume": {
             "name": "resume",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setOperatingState": {
             "name": "setOperatingState",
@@ -211,23 +224,28 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "returnToHome": {
             "name": "returnToHome",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "start": {
             "name": "start",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "pause": {
             "name": "pause",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "cancelRemainingJob": {
             "name": "cancelRemainingJob",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerOperatingStatePresentation.json b/json/samsungce.robotCleanerOperatingStatePresentation.json
index ea2b4922..859aebb4 100755
--- a/json/samsungce.robotCleanerOperatingStatePresentation.json
+++ b/json/samsungce.robotCleanerOperatingStatePresentation.json
@@ -6,182 +6,212 @@
                 "alternatives": [
                     {
                         "key": "charging",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.charging.label}}",
+                        "value": "Charging",
                         "type": "active"
                     },
                     {
                         "key": "charged",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.charged.label}}",
+                        "value": "Fully Charged",
                         "type": "active"
                     },
                     {
                         "key": "idle",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.idle.label}}",
+                        "value": "Waiting",
                         "type": "active"
                     },
                     {
                         "key": "cleaning",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.cleaning.label}}",
+                        "value": "Cleaning",
+                        "type": "active"
+                    },
+                    {
+                        "key": "cleaningStart",
+                        "value": "Cleaning",
                         "type": "active"
                     },
                     {
                         "key": "paused",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.paused.label}}",
+                        "value": "Paused",
                         "type": "active"
                     },
                     {
                         "key": "homing",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.homing.label}}",
+                        "value": "Returning",
+                        "type": "active"
+                    },
+                    {
+                        "key": "cleaningEnd",
+                        "value": "Returning",
                         "type": "active"
                     },
                     {
                         "key": "error",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.error.label}}",
+                        "value": "Check required",
                         "type": "active"
                     },
                     {
                         "key": "chargingForRemainingJob",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.chargingForRemainingJob.label}}",
+                        "value": "Charging",
                         "type": "active"
                     },
                     {
                         "key": "exploring",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.exploring.label}}",
+                        "value": "Drawing map",
                         "type": "active"
                     },
                     {
                         "key": "emitDust",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.emitDust.label}}",
+                        "value": "Emptying dust",
                         "type": "active"
                     },
                     {
                         "key": "manual",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.manual.label}}",
+                        "value": "Monitoring",
                         "type": "active"
                     },
                     {
                         "key": "patrol",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.patrol.label}}",
+                        "value": "Patrolling",
                         "type": "active"
                     },
                     {
                         "key": "monitoring",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.monitoring.label}}",
+                        "value": "Monitoring",
                         "type": "active"
                     },
                     {
                         "key": "findingPet",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.findingPet.label}}",
+                        "value": "Monitoring",
                         "type": "active"
                     },
                     {
                         "key": "powerSaving",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.powerSaving.label}}",
+                        "value": "Power saving mode",
                         "type": "active"
                     },
                     {
                         "key": "relocal",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.relocal.label}}",
+                        "value": "Finding location",
                         "type": "active"
                     },
                     {
                         "key": "processing",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.relocal.label}}",
+                        "value": "Finding location",
                         "type": "active"
                     },
                     {
                         "key": "messaging",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.messaging.label}}",
+                        "value": "Sending voice",
                         "type": "active"
                     },
                     {
                         "key": "calibrating",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.calibrating.label}}",
+                        "value": "Calibrating",
                         "type": "active"
                     },
                     {
                         "key": "moving",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.moving.label}}",
+                        "value": "Moving",
                         "type": "active"
                     },
                     {
                         "key": "welcoming",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.welcoming.label}}",
+                        "value": "Welcoming child",
                         "type": "active"
                     },
                     {
                         "key": "detachingMopPad",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.detachingMopPad.label}}",
+                        "value": "Removing mop",
                         "type": "active"
                     },
                     {
                         "key": "waitingForChangingMopPad",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.idle.label}}",
+                        "value": "Waiting",
                         "type": "active"
                     },
                     {
                         "key": "attachingMopPad",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.attachingMopPad.label}}",
+                        "value": "Attaching mop",
                         "type": "active"
                     },
                     {
                         "key": "attachingMopPadForRemainingJob",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.attachingMopPad.label}}",
+                        "value": "Attaching mop",
                         "type": "active"
                     },
                     {
                         "key": "washingMop",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.washingMop.label}}",
+                        "value": "Washing mop",
                         "type": "active"
                     },
                     {
                         "key": "sterilizingMop",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.sterilizingMop.label}}",
+                        "value": "Steam-washing mop",
                         "type": "active"
                     },
                     {
                         "key": "dryingMop",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.dryingMop.label}}",
+                        "value": "Drying mop",
                         "type": "active"
                     },
                     {
                         "key": "spinDrying",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.spinDrying.label}}",
+                        "value": "Dehydrating mop",
                         "type": "active"
                     },
                     {
                         "key": "preparingWater",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.preparingWater.label}}",
+                        "value": "Preparing the water",
                         "type": "active"
                     },
                     {
                         "key": "supplyingWater",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.supplyingWater.label}}",
+                        "value": "Filling water in",
                         "type": "active"
                     },
                     {
                         "key": "flexCharged",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.flexCharged.label}}",
+                        "value": "Charged",
                         "type": "active"
                     },
                     {
                         "key": "descaling",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.descaling.label}}",
+                        "value": "Descaling",
                         "type": "active"
                     },
                     {
                         "key": "mopWashingPaused",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.mopWashingPaused.label}}",
+                        "value": "Mop-washing paused",
                         "type": "active"
                     },
                     {
                         "key": "drainingWater",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.drainingWater.label}}",
+                        "value": "Emptying water",
                         "type": "active"
                     },
                     {
                         "key": "waitingForDescaling",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.waitingForDescaling.label}}",
+                        "value": "Waiting for descaling",
+                        "type": "active"
+                    },
+                    {
+                        "key": "sabbath",
+                        "value": "Sabbath mode",
+                        "type": "active"
+                    },
+                    {
+                        "key": "suspend",
+                        "value": "Power saving mode",
+                        "type": "active"
+                    },
+                    {
+                        "key": "emptyStation",
+                        "value": "Draining water",
+                        "type": "active"
+                    },
+                    {
+                        "key": "internalWash",
+                        "value": "Internal cleaning",
                         "type": "active"
                     }
                 ]
@@ -191,17 +221,17 @@
                 "alternatives": [
                     {
                         "key": "mopping",
-                        "value": "{{i18n.attributes.cleaningStep.i18n.value.mopping.label}}",
+                        "value": "Wet mopping",
                         "type": "active"
                     },
                     {
                         "key": "vacuuming",
-                        "value": "{{i18n.attributes.cleaningStep.i18n.value.vacuuming.label}}",
+                        "value": "Vacuuming",
                         "type": "active"
                     },
                     {
                         "key": "oneStepCleaning",
-                        "value": "{{i18n.attributes.cleaningStep.i18n.value.oneStepCleaning.label}}",
+                        "value": "Cleaning",
                         "type": "active"
                     }
                 ]
@@ -236,81 +266,98 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.operatingState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "charging",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.charging.label}}",
+                            "value": "Charging",
                             "type": "active"
                         },
                         {
                             "key": "charged",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.charged.label}}",
+                            "value": "Fully Charged",
                             "type": "active"
                         },
                         {
                             "key": "idle",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.idle.label}}",
+                            "value": "Waiting",
                             "type": "active"
                         },
                         {
                             "key": "cleaning",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.cleaning.label}}",
+                            "value": "Cleaning",
                             "type": "active"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.paused.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "homing",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.homing.label}}",
+                            "value": "Returning",
                             "type": "active"
                         },
                         {
                             "key": "error",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.error.label}}",
+                            "value": "Check required",
+                            "type": "active"
+                        },
+                        {
+                            "key": "patrol",
+                            "value": "Patrolling",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cleaningStart",
+                            "value": "Cleaning starts",
+                            "type": "active"
+                        },
+                        {
+                            "key": "cleaningEnd",
+                            "value": "Cleaning completed",
                             "type": "active"
                         }
                     ],
+                    "supportedValues": "supportedOperatingState.value",
                     "value": "operatingState.value",
                     "valueType": "string",
                     "multiSelectable": false
-                }
+                },
+                "emphasis": false
             }
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.operatingState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "start",
-                            "value": "{{i18n.commands.start.label}}",
+                            "value": "Start",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.commands.resume.label}}",
+                            "value": "Start",
                             "type": "active"
                         },
                         {
                             "key": "returnToHome",
-                            "value": "{{i18n.commands.returnToHome.label}}",
+                            "value": "Return To Charging Station",
                             "type": "active"
                         },
                         {
                             "key": "cancelRemainingJob",
-                            "value": "{{i18n.commands.cancelRemainingJob.label}}",
+                            "value": "Stop",
                             "type": "active"
                         }
                     ]
diff --git a/json/samsungce.robotCleanerPetCleaningSchedule.i18n.en.json b/json/samsungce.robotCleanerPetCleaningSchedule.i18n.en.json
index 612be090..12685499 100755
--- a/json/samsungce.robotCleanerPetCleaningSchedule.i18n.en.json
+++ b/json/samsungce.robotCleanerPetCleaningSchedule.i18n.en.json
@@ -2,6 +2,11 @@
     "tag": "en",
     "label": "Robot Cleaner Pet Cleaning Schedule",
     "attributes": {
+        "excludeHolidays": {
+            "label": "excludeHolidays",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
         "dayOfWeek": {
             "label": "dayOfWeek",
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
@@ -50,6 +55,10 @@
         "disable": {
             "label": "disable",
             "arguments": {}
+        },
+        "setExcludeHolidays": {
+            "label": "setExcludeHolidays",
+            "arguments": {}
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerPetCleaningSchedule.i18n.fr.json b/json/samsungce.robotCleanerPetCleaningSchedule.i18n.fr.json
index 612be090..12685499 100644
--- a/json/samsungce.robotCleanerPetCleaningSchedule.i18n.fr.json
+++ b/json/samsungce.robotCleanerPetCleaningSchedule.i18n.fr.json
@@ -2,6 +2,11 @@
     "tag": "en",
     "label": "Robot Cleaner Pet Cleaning Schedule",
     "attributes": {
+        "excludeHolidays": {
+            "label": "excludeHolidays",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
         "dayOfWeek": {
             "label": "dayOfWeek",
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
@@ -50,6 +55,10 @@
         "disable": {
             "label": "disable",
             "arguments": {}
+        },
+        "setExcludeHolidays": {
+            "label": "setExcludeHolidays",
+            "arguments": {}
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerPetCleaningSchedule.json b/json/samsungce.robotCleanerPetCleaningSchedule.json
index f060a7e2..135ce08c 100755
--- a/json/samsungce.robotCleanerPetCleaningSchedule.json
+++ b/json/samsungce.robotCleanerPetCleaningSchedule.json
@@ -5,6 +5,22 @@
     "name": "Robot Cleaner Pet Cleaning Schedule",
     "ephemeral": false,
     "attributes": {
+        "excludeHolidays": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "boolean",
+                        "default": false
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
         "dayOfWeek": {
             "schema": {
                 "type": "object",
@@ -191,15 +207,31 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "enable": {
             "name": "enable",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "disable": {
             "name": "disable",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
+        },
+        "setExcludeHolidays": {
+            "name": "setExcludeHolidays",
+            "arguments": [
+                {
+                    "name": "excludeHolidays",
+                    "optional": false,
+                    "schema": {
+                        "type": "boolean"
+                    }
+                }
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerPetMonitor.i18n.en.json b/json/samsungce.robotCleanerPetMonitor.i18n.en.json
index 59719cb1..7b25425c 100755
--- a/json/samsungce.robotCleanerPetMonitor.i18n.en.json
+++ b/json/samsungce.robotCleanerPetMonitor.i18n.en.json
@@ -2,6 +2,31 @@
     "tag": "en",
     "label": "Robot Cleaner Pet Monitor",
     "attributes": {
+        "areaIds": {
+            "label": "areaIds",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "originator": {
+            "label": "originator",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "waypoints": {
+            "label": "waypoints",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "enabled": {
+            "label": "enabled",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "excludeHolidays": {
+            "label": "excludeHolidays",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
         "dayOfWeek": {
             "label": "dayOfWeek",
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
@@ -31,11 +56,6 @@
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
         },
-        "areaIds": {
-            "label": "areaIds",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
-            "i18n": {}
-        },
         "startTime": {
             "label": "startTime",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
@@ -51,25 +71,10 @@
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
         },
-        "originator": {
-            "label": "originator",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
-            "i18n": {}
-        },
         "obsoleted": {
             "label": "obsoleted",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
-        },
-        "waypoints": {
-            "label": "waypoints",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
-            "i18n": {}
-        },
-        "enabled": {
-            "label": "enabled",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
-            "i18n": {}
         }
     },
     "commands": {
@@ -84,6 +89,10 @@
         "setMonitor": {
             "label": "setMonitor",
             "arguments": {}
+        },
+        "setExcludeHolidays": {
+            "label": "setExcludeHolidays",
+            "arguments": {}
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerPetMonitor.i18n.fr.json b/json/samsungce.robotCleanerPetMonitor.i18n.fr.json
index 59719cb1..7b25425c 100644
--- a/json/samsungce.robotCleanerPetMonitor.i18n.fr.json
+++ b/json/samsungce.robotCleanerPetMonitor.i18n.fr.json
@@ -2,6 +2,31 @@
     "tag": "en",
     "label": "Robot Cleaner Pet Monitor",
     "attributes": {
+        "areaIds": {
+            "label": "areaIds",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "originator": {
+            "label": "originator",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "waypoints": {
+            "label": "waypoints",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "enabled": {
+            "label": "enabled",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "excludeHolidays": {
+            "label": "excludeHolidays",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
         "dayOfWeek": {
             "label": "dayOfWeek",
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
@@ -31,11 +56,6 @@
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
         },
-        "areaIds": {
-            "label": "areaIds",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
-            "i18n": {}
-        },
         "startTime": {
             "label": "startTime",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
@@ -51,25 +71,10 @@
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
         },
-        "originator": {
-            "label": "originator",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
-            "i18n": {}
-        },
         "obsoleted": {
             "label": "obsoleted",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {}
-        },
-        "waypoints": {
-            "label": "waypoints",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
-            "i18n": {}
-        },
-        "enabled": {
-            "label": "enabled",
-            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
-            "i18n": {}
         }
     },
     "commands": {
@@ -84,6 +89,10 @@
         "setMonitor": {
             "label": "setMonitor",
             "arguments": {}
+        },
+        "setExcludeHolidays": {
+            "label": "setExcludeHolidays",
+            "arguments": {}
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerPetMonitor.json b/json/samsungce.robotCleanerPetMonitor.json
index 4b07f396..6ebe34d4 100755
--- a/json/samsungce.robotCleanerPetMonitor.json
+++ b/json/samsungce.robotCleanerPetMonitor.json
@@ -5,23 +5,14 @@
     "name": "Robot Cleaner Pet Monitor",
     "ephemeral": false,
     "attributes": {
-        "dayOfWeek": {
+        "areaIds": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
                         "type": "array",
                         "items": {
-                            "type": "string",
-                            "enum": [
-                                "Sun",
-                                "Mon",
-                                "Tue",
-                                "Wed",
-                                "Thu",
-                                "Fri",
-                                "Sat"
-                            ]
+                            "type": "string"
                         }
                     }
                 },
@@ -32,7 +23,22 @@
             },
             "enumCommands": []
         },
-        "monitoringStatus": {
+        "originator": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "waypoints": {
             "schema": {
                 "type": "object",
                 "properties": {
@@ -41,29 +47,19 @@
                         "items": {
                             "type": "object",
                             "properties": {
-                                "areadId": {
+                                "id": {
                                     "type": "string"
                                 },
-                                "monitoringStatus": {
-                                    "type": "string",
-                                    "enum": [
-                                        "ready",
-                                        "selected",
-                                        "moving",
-                                        "monitoring",
-                                        "finished",
-                                        "paused",
-                                        "abnormal",
-                                        "error"
-                                    ]
-                                },
-                                "errorCode": {
-                                    "type": "string"
+                                "coordinates": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
                                 }
                             },
                             "required": [
-                                "areadId",
-                                "monitoringStatus"
+                                "id",
+                                "coordinates"
                             ]
                         }
                     }
@@ -75,16 +71,13 @@
             },
             "enumCommands": []
         },
-        "blockingStatus": {
+        "enabled": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "string",
-                        "enum": [
-                            "blocked",
-                            "unblocked"
-                        ]
+                        "type": "boolean",
+                        "default": false
                     }
                 },
                 "additionalProperties": false,
@@ -94,12 +87,13 @@
             },
             "enumCommands": []
         },
-        "mapId": {
+        "excludeHolidays": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "string"
+                        "type": "boolean",
+                        "default": false
                     }
                 },
                 "additionalProperties": false,
@@ -109,14 +103,23 @@
             },
             "enumCommands": []
         },
-        "areaIds": {
+        "dayOfWeek": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
                         "type": "array",
                         "items": {
-                            "type": "string"
+                            "type": "string",
+                            "enum": [
+                                "Sun",
+                                "Mon",
+                                "Tue",
+                                "Wed",
+                                "Thu",
+                                "Fri",
+                                "Sat"
+                            ]
                         }
                     }
                 },
@@ -127,13 +130,40 @@
             },
             "enumCommands": []
         },
-        "startTime": {
+        "monitoringStatus": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "string",
-                        "pattern": "^([01]\\d|2[0-3]):[0-5]\\d$"
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "areadId": {
+                                    "type": "string"
+                                },
+                                "monitoringStatus": {
+                                    "type": "string",
+                                    "enum": [
+                                        "ready",
+                                        "selected",
+                                        "moving",
+                                        "monitoring",
+                                        "finished",
+                                        "paused",
+                                        "abnormal",
+                                        "error"
+                                    ]
+                                },
+                                "errorCode": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "areadId",
+                                "monitoringStatus"
+                            ]
+                        }
                     }
                 },
                 "additionalProperties": false,
@@ -143,20 +173,16 @@
             },
             "enumCommands": []
         },
-        "interval": {
+        "blockingStatus": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "integer"
-                    },
-                    "unit": {
                         "type": "string",
                         "enum": [
-                            "hour",
-                            "min"
-                        ],
-                        "default": "hour"
+                            "blocked",
+                            "unblocked"
+                        ]
                     }
                 },
                 "additionalProperties": false,
@@ -166,13 +192,12 @@
             },
             "enumCommands": []
         },
-        "endTime": {
+        "mapId": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "string",
-                        "pattern": "^([01]\\d|2[0-3]):[0-5]\\d$"
+                        "type": "string"
                     }
                 },
                 "additionalProperties": false,
@@ -182,12 +207,13 @@
             },
             "enumCommands": []
         },
-        "originator": {
+        "startTime": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "string"
+                        "type": "string",
+                        "pattern": "^([01]\\d|2[0-3]):[0-5]\\d$"
                     }
                 },
                 "additionalProperties": false,
@@ -197,13 +223,20 @@
             },
             "enumCommands": []
         },
-        "obsoleted": {
+        "interval": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "boolean",
-                        "default": false
+                        "type": "integer"
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "hour",
+                            "min"
+                        ],
+                        "default": "hour"
                     }
                 },
                 "additionalProperties": false,
@@ -213,30 +246,13 @@
             },
             "enumCommands": []
         },
-        "waypoints": {
+        "endTime": {
             "schema": {
                 "type": "object",
                 "properties": {
                     "value": {
-                        "type": "array",
-                        "items": {
-                            "type": "object",
-                            "properties": {
-                                "id": {
-                                    "type": "string"
-                                },
-                                "coordinates": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "string"
-                                    }
-                                }
-                            },
-                            "required": [
-                                "id",
-                                "coordinates"
-                            ]
-                        }
+                        "type": "string",
+                        "pattern": "^([01]\\d|2[0-3]):[0-5]\\d$"
                     }
                 },
                 "additionalProperties": false,
@@ -246,7 +262,7 @@
             },
             "enumCommands": []
         },
-        "enabled": {
+        "obsoleted": {
             "schema": {
                 "type": "object",
                 "properties": {
@@ -266,11 +282,13 @@
     "commands": {
         "enable": {
             "name": "enable",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "disable": {
             "name": "disable",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setMonitor": {
             "name": "setMonitor",
@@ -374,7 +392,21 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
+        },
+        "setExcludeHolidays": {
+            "name": "setExcludeHolidays",
+            "arguments": [
+                {
+                    "name": "excludeHolidays",
+                    "optional": false,
+                    "schema": {
+                        "type": "boolean"
+                    }
+                }
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerReservation.json b/json/samsungce.robotCleanerReservation.json
index aee96f98..b1c08968 100755
--- a/json/samsungce.robotCleanerReservation.json
+++ b/json/samsungce.robotCleanerReservation.json
@@ -147,7 +147,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "deleteReservations": {
             "name": "deleteReservations",
@@ -163,7 +164,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "editReservation": {
             "name": "editReservation",
@@ -226,7 +228,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "deleteReservation": {
             "name": "deleteReservation",
@@ -239,7 +242,8 @@
                         "additionalProperties": false
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.robotCleanerWelcome.json b/json/samsungce.robotCleanerWelcome.json
index fb55ee81..198d71ed 100755
--- a/json/samsungce.robotCleanerWelcome.json
+++ b/json/samsungce.robotCleanerWelcome.json
@@ -28,7 +28,6 @@
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setCoordinates",
             "enumCommands": []
         }
     },
@@ -57,11 +56,13 @@
                         "type": "number"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "start": {
             "name": "start",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungce.selfCheck.json b/json/samsungce.selfCheck.json
index cb6f4520..dfaaf80f 100755
--- a/json/samsungce.selfCheck.json
+++ b/json/samsungce.selfCheck.json
@@ -124,11 +124,13 @@
     "commands": {
         "cancelSelfCheck": {
             "name": "cancelSelfCheck",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "startSelfCheck": {
             "name": "startSelfCheck",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.selfCheckPresentation.json b/json/samsungce.selfCheckPresentation.json
index 4774919e..bbb40348 100755
--- a/json/samsungce.selfCheckPresentation.json
+++ b/json/samsungce.selfCheckPresentation.json
@@ -6,7 +6,7 @@
                 "alternatives": [
                     {
                         "key": "running",
-                        "value": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_LIVING_SELF_CHECK_RUN}}",
+                        "value": "Testing",
                         "type": "active"
                     }
                 ]
diff --git a/json/samsungce.softenerAutoReplenishment.json b/json/samsungce.softenerAutoReplenishment.json
index 5ce50263..eec88add 100755
--- a/json/samsungce.softenerAutoReplenishment.json
+++ b/json/samsungce.softenerAutoReplenishment.json
@@ -148,7 +148,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setOrderThreshold": {
             "name": "setOrderThreshold",
@@ -171,7 +172,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "disableAlarm": {
             "name": "disableAlarm",
@@ -186,7 +188,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setAutoReplenishment": {
             "name": "setAutoReplenishment",
@@ -259,7 +262,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setInitialAmount": {
             "name": "setInitialAmount",
@@ -282,7 +286,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setRemainingAmount": {
             "name": "setRemainingAmount",
@@ -305,7 +310,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setDosage": {
             "name": "setDosage",
@@ -328,7 +334,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setType": {
             "name": "setType",
@@ -356,7 +363,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.softenerOrder.json b/json/samsungce.softenerOrder.json
index 5b6fdd25..af5cbdbe 100755
--- a/json/samsungce.softenerOrder.json
+++ b/json/samsungce.softenerOrder.json
@@ -47,7 +47,8 @@
     "commands": {
         "enableAlarm": {
             "name": "enableAlarm",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setOrderThreshold": {
             "name": "setOrderThreshold",
@@ -59,11 +60,13 @@
                         "type": "number"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "disableAlarm": {
             "name": "disableAlarm",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.softenerState.json b/json/samsungce.softenerState.json
index b61d59a5..199669a7 100755
--- a/json/samsungce.softenerState.json
+++ b/json/samsungce.softenerState.json
@@ -107,7 +107,8 @@
                         "type": "number"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setRemainingAmount": {
             "name": "setRemainingAmount",
@@ -119,7 +120,8 @@
                         "type": "number"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setDosage": {
             "name": "setDosage",
@@ -131,7 +133,8 @@
                         "type": "number"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setSoftenerType": {
             "name": "setSoftenerType",
@@ -143,7 +146,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.softwareUpdate.json b/json/samsungce.softwareUpdate.json
index b60967e6..2c64f075 100755
--- a/json/samsungce.softwareUpdate.json
+++ b/json/samsungce.softwareUpdate.json
@@ -164,7 +164,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "disagreeUpdate": {
             "name": "disagreeUpdate",
@@ -176,7 +177,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.softwareUpdatePresentation.json b/json/samsungce.softwareUpdatePresentation.json
index 98b2d535..ce3e1b16 100755
--- a/json/samsungce.softwareUpdatePresentation.json
+++ b/json/samsungce.softwareUpdatePresentation.json
@@ -6,28 +6,28 @@
                 "alternatives": [
                     {
                         "key": "true",
-                        "value": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_UPDATE_AVAILABLE}}",
+                        "value": "Update available",
                         "type": "active"
                     }
                 ]
             },
             {
-                "label": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_UPDATE_PREPARING}}"
+                "label": "Preparing…"
             },
             {
-                "label": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_UPDATE_IN_PROGRESS}}"
+                "label": "Updating {{progress.value}}%"
             },
             {
-                "label": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_UPDATE_COMPLETE}}"
+                "label": "Complete"
             },
             {
-                "label": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_UPDATE_CHECKING}}"
+                "label": "Checking…"
             },
             {
-                "label": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_UPDATE_REBOOTING}}"
+                "label": "Restarting…"
             },
             {
-                "label": "{{___PO_CODE_SAMSUNGELECTRONICS.DA_UPDATE_SWAP_REBOOTING}}"
+                "label": "Updating…"
             }
         ],
         "actions": [],
diff --git a/json/samsungce.soundDetectionSensitivity.json b/json/samsungce.soundDetectionSensitivity.json
index 98e25033..f6caf115 100755
--- a/json/samsungce.soundDetectionSensitivity.json
+++ b/json/samsungce.soundDetectionSensitivity.json
@@ -66,7 +66,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.toggleSwitch.json b/json/samsungce.toggleSwitch.json
index 654521a5..c654a55e 100755
--- a/json/samsungce.toggleSwitch.json
+++ b/json/samsungce.toggleSwitch.json
@@ -37,15 +37,18 @@
     "commands": {
         "toggle": {
             "name": "toggle",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "off": {
             "name": "off",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "on": {
             "name": "on",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.toggleSwitchPresentation.json b/json/samsungce.toggleSwitchPresentation.json
index 6ab1e38a..cf835c57 100755
--- a/json/samsungce.toggleSwitchPresentation.json
+++ b/json/samsungce.toggleSwitchPresentation.json
@@ -8,23 +8,23 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Toggle Switch",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "toggle",
-                            "value": "{{i18n.attributes.switch.i18n.value.toggle.label}}",
+                            "value": "___PO_CODE_CAPABILITY.SAMSUNGCE.TOGGLESWITCH_DEFAULT_ATTRIBUTES_SWITCH_TOGGLE",
                             "type": "active"
                         },
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.switch.i18n.value.on.label}}",
+                            "value": "on",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.switch.i18n.value.off.label}}",
+                            "value": "off",
                             "type": "active"
                         }
                     ]
diff --git a/json/samsungce.viewInside.json b/json/samsungce.viewInside.json
index dd049e78..df17b429 100755
--- a/json/samsungce.viewInside.json
+++ b/json/samsungce.viewInside.json
@@ -108,11 +108,13 @@
                         "default": "mainShelves"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "refreshAll": {
             "name": "refreshAll",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "refresh": {
             "name": "refresh",
@@ -124,7 +126,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.washerBubbleSoak.json b/json/samsungce.washerBubbleSoak.json
index 108563f5..d57128af 100755
--- a/json/samsungce.washerBubbleSoak.json
+++ b/json/samsungce.washerBubbleSoak.json
@@ -28,11 +28,13 @@
     "commands": {
         "off": {
             "name": "off",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "on": {
             "name": "on",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.washerCycle.i18n.en.json b/json/samsungce.washerCycle.i18n.en.json
index 9790c214..6a852867 100755
--- a/json/samsungce.washerCycle.i18n.en.json
+++ b/json/samsungce.washerCycle.i18n.en.json
@@ -3,18 +3,18 @@
     "label": "Washer Cycle",
     "attributes": {
         "cycleType": {
-            "label": "cycleType",
+            "label": "Mode",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
                 "value": {
                     "washingOnly": {
-                        "label": "washingOnly"
+                        "label": "Washing only "
                     },
                     "allInOne": {
-                        "label": "allInOne"
+                        "label": "Washing + Drying"
                     },
                     "dryingOnly": {
-                        "label": "dryingOnly"
+                        "label": "Drying only"
                     }
                 }
             }
@@ -24,6 +24,11 @@
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
             "i18n": {}
         },
+        "availableCycleTypes": {
+            "label": "availableCycleTypes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
         "washerCycle": {
             "label": "washerCycle",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
@@ -44,6 +49,25 @@
         "setWasherCycle": {
             "label": "setWasherCycle",
             "arguments": {}
+        },
+        "setCycleType": {
+            "label": "setCycleType",
+            "arguments": {
+                "cycleType": {
+                    "i18n": {
+                        "washingOnly": {
+                            "label": "Washing only "
+                        },
+                        "allInOne": {
+                            "label": "Washing + Drying"
+                        },
+                        "dryingOnly": {
+                            "label": "Drying only"
+                        }
+                    },
+                    "label": "Mode"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.washerCycle.i18n.fr.json b/json/samsungce.washerCycle.i18n.fr.json
index 9790c214..462cdbf5 100644
--- a/json/samsungce.washerCycle.i18n.fr.json
+++ b/json/samsungce.washerCycle.i18n.fr.json
@@ -1,20 +1,20 @@
 {
-    "tag": "en",
+    "tag": "fr",
     "label": "Washer Cycle",
     "attributes": {
         "cycleType": {
-            "label": "cycleType",
+            "label": "Mode",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
             "i18n": {
                 "value": {
                     "washingOnly": {
-                        "label": "washingOnly"
+                        "label": "Lavage uniquement"
                     },
                     "allInOne": {
-                        "label": "allInOne"
+                        "label": "Lavage + Séchage"
                     },
                     "dryingOnly": {
-                        "label": "dryingOnly"
+                        "label": "Séchage uniquement"
                     }
                 }
             }
@@ -24,6 +24,11 @@
             "displayTemplate": "{{attribute}} of {{device.label}} was updated",
             "i18n": {}
         },
+        "availableCycleTypes": {
+            "label": "availableCycleTypes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
         "washerCycle": {
             "label": "washerCycle",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
@@ -44,6 +49,25 @@
         "setWasherCycle": {
             "label": "setWasherCycle",
             "arguments": {}
+        },
+        "setCycleType": {
+            "label": "setCycleType",
+            "arguments": {
+                "cycleType": {
+                    "i18n": {
+                        "washingOnly": {
+                            "label": "Lavage uniquement"
+                        },
+                        "allInOne": {
+                            "label": "Lavage + Séchage"
+                        },
+                        "dryingOnly": {
+                            "label": "Séchage uniquement"
+                        }
+                    },
+                    "label": "Mode"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.washerCycle.json b/json/samsungce.washerCycle.json
index b3a6a99f..d46a9d15 100755
--- a/json/samsungce.washerCycle.json
+++ b/json/samsungce.washerCycle.json
@@ -48,6 +48,30 @@
                                     ],
                                     "default": "washingOnly"
                                 },
+                                "supportedCycleTypes": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string",
+                                        "enum": [
+                                            "allInOne",
+                                            "washingOnly",
+                                            "dryingOnly"
+                                        ],
+                                        "default": "washingOnly"
+                                    }
+                                },
+                                "unavailableCycleTypes": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string",
+                                        "enum": [
+                                            "allInOne",
+                                            "washingOnly",
+                                            "dryingOnly"
+                                        ],
+                                        "default": "washingOnly"
+                                    }
+                                },
                                 "supportedOptions": {
                                     "type": "object",
                                     "additionalProperties": false,
@@ -177,6 +201,28 @@
             },
             "enumCommands": []
         },
+        "availableCycleTypes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "allInOne",
+                                "washingOnly",
+                                "dryingOnly"
+                            ],
+                            "default": "washingOnly"
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
         "washerCycle": {
             "schema": {
                 "type": "object",
@@ -241,7 +287,34 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
+        },
+        "setCycleType": {
+            "name": "setCycleType",
+            "arguments": [
+                {
+                    "name": "cycleType",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "enum": [
+                            "allInOne",
+                            "washingOnly",
+                            "dryingOnly"
+                        ],
+                        "default": "washingOnly"
+                    }
+                },
+                {
+                    "name": "washerCycle",
+                    "optional": true,
+                    "schema": {
+                        "type": "string"
+                    }
+                }
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.washerCyclePresentation.json b/json/samsungce.washerCyclePresentation.json
new file mode 100644
index 00000000..22a75d19
--- /dev/null
+++ b/json/samsungce.washerCyclePresentation.json
@@ -0,0 +1,66 @@
+{
+    "dashboard": {
+        "states": [],
+        "actions": [],
+        "panelItems": [
+            {
+                "label": "Mode",
+                "displayType": "list",
+                "list": {
+                    "command": {
+                        "name": "setCycleType",
+                        "alternatives": [
+                            {
+                                "key": "allInOne",
+                                "value": "Washing + Drying",
+                                "type": "active"
+                            },
+                            {
+                                "key": "washingOnly",
+                                "value": "Washing only ",
+                                "type": "active"
+                            },
+                            {
+                                "key": "dryingOnly",
+                                "value": "Drying only",
+                                "type": "active"
+                            }
+                        ],
+                        "argumentType": "string",
+                        "supportedValues": "availableCycleTypes.value"
+                    },
+                    "state": {
+                        "value": "cycleType.value",
+                        "valueType": "string",
+                        "alternatives": [
+                            {
+                                "key": "allInOne",
+                                "value": "Washing + Drying",
+                                "type": "active"
+                            },
+                            {
+                                "key": "washingOnly",
+                                "value": "Washing only ",
+                                "type": "active"
+                            },
+                            {
+                                "key": "dryingOnly",
+                                "value": "Drying only",
+                                "type": "active"
+                            }
+                        ]
+                    },
+                    "availableSizes": [
+                        "2x1",
+                        "3x1",
+                        "4x1",
+                        "1/3x1",
+                        "2x2"
+                    ]
+                }
+            }
+        ]
+    },
+    "id": "samsungce.washerCycle",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/samsungce.washerCyclePreset.json b/json/samsungce.washerCyclePreset.json
index da9ee1b0..ad940f7f 100755
--- a/json/samsungce.washerCyclePreset.json
+++ b/json/samsungce.washerCyclePreset.json
@@ -186,7 +186,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "delete": {
             "name": "delete",
@@ -202,7 +203,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.washerDelayEnd.json b/json/samsungce.washerDelayEnd.json
index a4eb3fe6..e11bf557 100755
--- a/json/samsungce.washerDelayEnd.json
+++ b/json/samsungce.washerDelayEnd.json
@@ -59,7 +59,8 @@
     "commands": {
         "refreshMinimumReservableTime": {
             "name": "refreshMinimumReservableTime",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setDelayTime": {
             "name": "setDelayTime",
@@ -73,7 +74,8 @@
                         "maximum": 1440
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.washerFreezePreventPresentation.json b/json/samsungce.washerFreezePreventPresentation.json
index 83f468f1..9f882650 100755
--- a/json/samsungce.washerFreezePreventPresentation.json
+++ b/json/samsungce.washerFreezePreventPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.running.label}}",
+                        "value": "Prevent freezing",
                         "type": "active"
                     },
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.ready.label}}",
+                        "value": "ready",
                         "type": "active"
                     }
                 ]
diff --git a/json/samsungce.washerOperatingState.i18n.en.json b/json/samsungce.washerOperatingState.i18n.en.json
index 4399fb83..d7aa5ebe 100755
--- a/json/samsungce.washerOperatingState.i18n.en.json
+++ b/json/samsungce.washerOperatingState.i18n.en.json
@@ -2,6 +2,16 @@
     "tag": "en",
     "label": "Washer Operating State",
     "attributes": {
+        "washingProgress": {
+            "label": "washingProgress",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "dryingProgress": {
+            "label": "dryingProgress",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
         "washerJobState": {
             "label": "Washing progress",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
diff --git a/json/samsungce.washerOperatingState.i18n.fr.json b/json/samsungce.washerOperatingState.i18n.fr.json
index 13dcb579..0d1d45a5 100755
--- a/json/samsungce.washerOperatingState.i18n.fr.json
+++ b/json/samsungce.washerOperatingState.i18n.fr.json
@@ -2,6 +2,16 @@
     "tag": "fr",
     "label": "Washer Operating State",
     "attributes": {
+        "washingProgress": {
+            "label": "washingProgress",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "dryingProgress": {
+            "label": "dryingProgress",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
         "washerJobState": {
             "label": "Lavage en cours",
             "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
@@ -47,7 +57,7 @@
                         "label": "Rinçage en cours"
                     },
                     "freezeProtection": {
-                        "label": "Mode antigel"
+                        "label": "Évitez la formation de gel"
                     },
                     "waitingToDry": {
                         "label": "En attente du séchage"
diff --git a/json/samsungce.washerOperatingState.json b/json/samsungce.washerOperatingState.json
index 483cfd3d..ba19eb58 100755
--- a/json/samsungce.washerOperatingState.json
+++ b/json/samsungce.washerOperatingState.json
@@ -5,6 +5,56 @@
     "name": "Washer Operating State",
     "ephemeral": false,
     "attributes": {
+        "washingProgress": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 0,
+                        "maximum": 100
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "%"
+                        ],
+                        "default": "%"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value",
+                    "unit"
+                ]
+            },
+            "enumCommands": []
+        },
+        "dryingProgress": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 0,
+                        "maximum": 100
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "%"
+                        ],
+                        "default": "%"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value",
+                    "unit"
+                ]
+            },
+            "enumCommands": []
+        },
         "washerJobState": {
             "schema": {
                 "type": "object",
@@ -341,19 +391,23 @@
     "commands": {
         "resume": {
             "name": "resume",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "cancel": {
             "name": "cancel",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "start": {
             "name": "start",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "estimateOperationTime": {
             "name": "estimateOperationTime",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setDelayEnd": {
             "name": "setDelayEnd",
@@ -367,11 +421,13 @@
                         "maximum": 1440
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "pause": {
             "name": "pause",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.washerOperatingStatePresentation.json b/json/samsungce.washerOperatingStatePresentation.json
index fc30e27f..e5e2c7b4 100755
--- a/json/samsungce.washerOperatingStatePresentation.json
+++ b/json/samsungce.washerOperatingStatePresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "ready",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.ready.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.running.label}}",
+                        "value": "Washing",
                         "type": "active"
                     },
                     {
                         "key": "paused",
-                        "value": "{{i18n.attributes.operatingState.i18n.value.paused.label}}",
+                        "value": "Paused",
                         "type": "active"
                     }
                 ]
@@ -26,122 +26,122 @@
                 "alternatives": [
                     {
                         "key": "preWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.preWash.label}}",
+                        "value": "Prewashing",
                         "type": "active"
                     },
                     {
                         "key": "airWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.airWash.label}}",
+                        "value": "Refreshing",
                         "type": "active"
                     },
                     {
                         "key": "drying",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.drying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "rinse",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.rinse.label}}",
+                        "value": "Rinsing",
                         "type": "active"
                     },
                     {
                         "key": "spin",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.spin.label}}",
+                        "value": "Spinning",
                         "type": "active"
                     },
                     {
                         "key": "wash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.wash.label}}",
+                        "value": "Washing",
                         "type": "active"
                     },
                     {
                         "key": "weightSensing",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.weightSensing.label}}",
+                        "value": "Sensing the load",
                         "type": "active"
                     },
                     {
                         "key": "soilLevelSensing",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.soilLevelSensing.label}}",
+                        "value": "Detecting stains",
                         "type": "active"
                     },
                     {
                         "key": "laundrySensing",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.laundrySensing.label}}",
+                        "value": "Detecting laundry",
                         "type": "active"
                     },
                     {
                         "key": "drumCleaning",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.drumCleaning.label}}",
+                        "value": "Cleaning",
                         "type": "active"
                     },
                     {
                         "key": "aIWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.aIWash.label}}",
+                        "value": "Washing",
                         "type": "active"
                     },
                     {
                         "key": "aIRinse",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.aIRinse.label}}",
+                        "value": "Rinsing",
                         "type": "active"
                     },
                     {
                         "key": "aISpin",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.aISpin.label}}",
+                        "value": "Spinning",
                         "type": "active"
                     },
                     {
                         "key": "freezeProtection",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.freezeProtection.label}}",
+                        "value": "Prevent freezing",
                         "type": "active"
                     },
                     {
                         "key": "finished",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.finished.label}}",
+                        "value": "Cycle complete",
                         "type": "active"
                     },
                     {
                         "key": "delayWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.delayWash.label}}",
+                        "value": "End of cycle delayed",
                         "type": "active"
                     },
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.none.label}}",
+                        "value": "Preparing",
                         "type": "active"
                     },
                     {
                         "key": "sanitizing",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.sanitizing.label}}",
+                        "value": "Sanitizing",
                         "type": "active"
                     },
                     {
                         "key": "internalCare",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.internalCare.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "removingSuds",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.removingSuds.label}}",
+                        "value": "Removing suds",
                         "type": "active"
                     },
                     {
                         "key": "waitingToDry",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.waitingToDry.label}}",
+                        "value": "Waiting to dry",
                         "type": "active"
                     },
                     {
                         "key": "cleaningCondenser",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.cleaningCondenser.label}}",
+                        "value": "Cleaning condenser",
                         "type": "active"
                     },
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.cooling.label}}",
+                        "value": "Cooling",
                         "type": "active"
                     },
                     {
                         "key": "aIDrying",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.aIDrying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     }
                 ]
@@ -150,7 +150,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.commands.panelStart.label}}",
+                "label": "Start",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "start",
@@ -166,7 +166,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.panelCancel.label}}",
+                "label": "Cancel",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "cancel",
@@ -182,7 +182,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.panelPause.label}}",
+                "label": "Pause",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "pause",
@@ -198,7 +198,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.panelResume.label}}",
+                "label": "Resume",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "start",
@@ -214,7 +214,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.panelOk.label}}",
+                "label": "OK",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "cancel",
@@ -233,23 +233,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.operatingState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "ready",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.ready.label}}",
+                            "value": "Ready",
                             "type": "active"
                         },
                         {
                             "key": "running",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.running.label}}",
+                            "value": "Washing",
                             "type": "active"
                         },
                         {
                             "key": "paused",
-                            "value": "{{i18n.attributes.operatingState.i18n.value.paused.label}}",
+                            "value": "Paused",
                             "type": "active"
                         }
                     ],
@@ -259,128 +259,128 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.washerJobState.label}}",
+                "label": "Washing progress",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "preWash",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.preWash.label}}",
+                            "value": "Prewashing",
                             "type": "active"
                         },
                         {
                             "key": "airWash",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.airWash.label}}",
+                            "value": "Refreshing",
                             "type": "active"
                         },
                         {
                             "key": "drying",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.drying.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.rinse.label}}",
+                            "value": "Rinsing",
                             "type": "active"
                         },
                         {
                             "key": "spin",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.spin.label}}",
+                            "value": "Spinning",
                             "type": "active"
                         },
                         {
                             "key": "wash",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.wash.label}}",
+                            "value": "Washing",
                             "type": "active"
                         },
                         {
                             "key": "weightSensing",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.weightSensing.label}}",
+                            "value": "Sensing the load",
                             "type": "active"
                         },
                         {
                             "key": "soilLevelSensing",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.soilLevelSensing.label}}",
+                            "value": "Detecting stains",
                             "type": "active"
                         },
                         {
                             "key": "laundrySensing",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.laundrySensing.label}}",
+                            "value": "Detecting laundry",
                             "type": "active"
                         },
                         {
                             "key": "drumCleaning",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.drumCleaning.label}}",
+                            "value": "Cleaning",
                             "type": "active"
                         },
                         {
                             "key": "aIWash",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.aIWash.label}}",
+                            "value": "Washing",
                             "type": "active"
                         },
                         {
                             "key": "aIRinse",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.aIRinse.label}}",
+                            "value": "Rinsing",
                             "type": "active"
                         },
                         {
                             "key": "aISpin",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.aISpin.label}}",
+                            "value": "Spinning",
                             "type": "active"
                         },
                         {
                             "key": "freezeProtection",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.freezeProtection.label}}",
+                            "value": "Prevent freezing",
                             "type": "active"
                         },
                         {
                             "key": "finished",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.finished.label}}",
+                            "value": "Cycle complete",
                             "type": "active"
                         },
                         {
                             "key": "delayWash",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.delayWash.label}}",
+                            "value": "End of cycle delayed",
                             "type": "active"
                         },
                         {
                             "key": "none",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.none.label}}",
+                            "value": "Preparing",
                             "type": "active"
                         },
                         {
                             "key": "sanitizing",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.sanitizing.label}}",
+                            "value": "Sanitizing",
                             "type": "active"
                         },
                         {
                             "key": "internalCare",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.internalCare.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "removingSuds",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.removingSuds.label}}",
+                            "value": "Removing suds",
                             "type": "active"
                         },
                         {
                             "key": "waitingToDry",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.waitingToDry.label}}",
+                            "value": "Waiting to dry",
                             "type": "active"
                         },
                         {
                             "key": "cleaningCondenser",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.cleaningCondenser.label}}",
+                            "value": "Cleaning condenser",
                             "type": "active"
                         },
                         {
                             "key": "cooling",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.cooling.label}}",
+                            "value": "Cooling",
                             "type": "active"
                         },
                         {
                             "key": "aIDrying",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.aIDrying.label}}",
+                            "value": "Drying",
                             "type": "active"
                         }
                     ],
@@ -392,23 +392,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.operatingState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "start",
-                            "value": "{{i18n.commands.start.label}}",
+                            "value": "Start cycle",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause cycle",
                             "type": "active"
                         },
                         {
                             "key": "cancel",
-                            "value": "{{i18n.commands.cancel.label}}",
+                            "value": "Cancel cycle",
                             "type": "active"
                         }
                     ]
diff --git a/json/samsungce.washerWashingTime.json b/json/samsungce.washerWashingTime.json
index fd109ee6..df3955b3 100755
--- a/json/samsungce.washerWashingTime.json
+++ b/json/samsungce.washerWashingTime.json
@@ -58,7 +58,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.washerWaterLevel.json b/json/samsungce.washerWaterLevel.json
index 0ce67e48..c9735d4b 100755
--- a/json/samsungce.washerWaterLevel.json
+++ b/json/samsungce.washerWaterLevel.json
@@ -123,7 +123,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.washerWaterValve.json b/json/samsungce.washerWaterValve.json
index f99c0c76..de49aca1 100755
--- a/json/samsungce.washerWaterValve.json
+++ b/json/samsungce.washerWaterValve.json
@@ -69,7 +69,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungce.welcomeMessage.json b/json/samsungce.welcomeMessage.json
index 3dfe7dff..6c0ce635 100755
--- a/json/samsungce.welcomeMessage.json
+++ b/json/samsungce.welcomeMessage.json
@@ -31,7 +31,8 @@
     "commands": {
         "deleteWelcomeMessage": {
             "name": "deleteWelcomeMessage",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setWelcomeMessage": {
             "name": "setWelcomeMessage",
@@ -49,7 +50,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungim.fixedFindNode.json b/json/samsungim.fixedFindNode.json
index d11cde9e..ece63dc0 100755
--- a/json/samsungim.fixedFindNode.json
+++ b/json/samsungim.fixedFindNode.json
@@ -8,7 +8,8 @@
     "commands": {
         "refresh": {
             "name": "refresh",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungtv.firmwareVersion.json b/json/samsungtv.firmwareVersion.json
index 9520a338..d5818383 100755
--- a/json/samsungtv.firmwareVersion.json
+++ b/json/samsungtv.firmwareVersion.json
@@ -16,7 +16,6 @@
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setFirmwareVersion",
             "enumCommands": []
         }
     },
@@ -31,7 +30,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungvd.ambient.i18n.en.json b/json/samsungvd.ambient.i18n.en.json
index e64ecc87..b537befd 100755
--- a/json/samsungvd.ambient.i18n.en.json
+++ b/json/samsungvd.ambient.i18n.en.json
@@ -9,6 +9,10 @@
         }
     },
     "commands": {
+        "sendData": {
+            "label": "sendData",
+            "arguments": {}
+        },
         "setAmbientOn": {
             "label": "Ambient Mode On",
             "arguments": {}
diff --git a/json/samsungvd.ambient.i18n.fr.json b/json/samsungvd.ambient.i18n.fr.json
index 9f37c2b4..7453529b 100755
--- a/json/samsungvd.ambient.i18n.fr.json
+++ b/json/samsungvd.ambient.i18n.fr.json
@@ -9,6 +9,10 @@
         }
     },
     "commands": {
+        "sendData": {
+            "label": "sendData",
+            "arguments": {}
+        },
         "setAmbientOn": {
             "label": "Ambient Mode Activé",
             "arguments": {}
diff --git a/json/samsungvd.ambient.json b/json/samsungvd.ambient.json
index d7a12a0c..5331cf3f 100755
--- a/json/samsungvd.ambient.json
+++ b/json/samsungvd.ambient.json
@@ -22,9 +22,23 @@
         }
     },
     "commands": {
+        "sendData": {
+            "name": "sendData",
+            "arguments": [
+                {
+                    "name": "data",
+                    "optional": false,
+                    "schema": {
+                        "type": "object"
+                    }
+                }
+            ],
+            "sensitive": false
+        },
         "setAmbientOn": {
             "name": "setAmbientOn",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungvd.ambient18.json b/json/samsungvd.ambient18.json
index 567d2578..d4c02acb 100755
--- a/json/samsungvd.ambient18.json
+++ b/json/samsungvd.ambient18.json
@@ -8,7 +8,8 @@
     "commands": {
         "setAmbientOn": {
             "name": "setAmbientOn",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungvd.ambient18Presentation.json b/json/samsungvd.ambient18Presentation.json
index 363acebd..05d14412 100755
--- a/json/samsungvd.ambient18Presentation.json
+++ b/json/samsungvd.ambient18Presentation.json
@@ -3,13 +3,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.commands.setAmbientOn.label}}",
+                "label": "Ambient Mode On",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "setAmbientOn",
-                            "value": "{{i18n.commands.setAmbientOn.arguments.id.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         }
                     ]
diff --git a/json/samsungvd.ambientContent.json b/json/samsungvd.ambientContent.json
index f2261583..95467904 100755
--- a/json/samsungvd.ambientContent.json
+++ b/json/samsungvd.ambientContent.json
@@ -32,7 +32,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungvd.ambientContentPresentation.json b/json/samsungvd.ambientContentPresentation.json
index fcc44ca2..b93f70be 100755
--- a/json/samsungvd.ambientContentPresentation.json
+++ b/json/samsungvd.ambientContentPresentation.json
@@ -3,18 +3,19 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.commands.setAmbientContent.label}}",
+                "label": "Ambient Mode Content",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "weather",
-                            "value": "{{i18n.commands.setAmbientContent.arguments.id.i18n.heating.label}}",
+                            "value": "Weather",
                             "type": "active"
                         }
                     ],
                     "supportedValues": "supportedAmbientApps.value",
-                    "command": "setAmbientContent"
+                    "command": "setAmbientContent",
+                    "argumentType": "string"
                 }
             }
         ]
diff --git a/json/samsungvd.ambientPresentation.json b/json/samsungvd.ambientPresentation.json
index c3ad8e11..cba922e0 100755
--- a/json/samsungvd.ambientPresentation.json
+++ b/json/samsungvd.ambientPresentation.json
@@ -3,13 +3,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.commands.setAmbientOn.label}}",
+                "label": "Ambient Mode On",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "setAmbientOn",
-                            "value": "{{i18n.commands.setAmbientOn.label}}",
+                            "value": "Ambient Mode On",
                             "type": "active"
                         }
                     ]
diff --git a/json/samsungvd.audioInputSource.json b/json/samsungvd.audioInputSource.json
index d6c3cd4e..a32a67ed 100755
--- a/json/samsungvd.audioInputSource.json
+++ b/json/samsungvd.audioInputSource.json
@@ -41,7 +41,8 @@
     "commands": {
         "setNextInputSource": {
             "name": "setNextInputSource",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungvd.audioInputSourcePresentation.json b/json/samsungvd.audioInputSourcePresentation.json
index 4e5fc3d1..635b810f 100755
--- a/json/samsungvd.audioInputSourcePresentation.json
+++ b/json/samsungvd.audioInputSourcePresentation.json
@@ -2,10 +2,10 @@
     "dashboard": {
         "states": [
             {
-                "label": "{{i18n.attributes.bluetooth.label}}"
+                "label": "Bluetooth"
             },
             {
-                "label": "{{i18n.attributes.wifi3pda.label}}"
+                "label": "Playing from Amazon Alexa"
             },
             {
                 "label": "Wi-Fi"
diff --git a/json/samsungvd.firmwareVersion.json b/json/samsungvd.firmwareVersion.json
index cd523c51..099d729a 100755
--- a/json/samsungvd.firmwareVersion.json
+++ b/json/samsungvd.firmwareVersion.json
@@ -18,7 +18,6 @@
                     "value"
                 ]
             },
-            "setter": "setFirmwareVersion",
             "enumCommands": []
         }
     },
@@ -33,7 +32,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungvd.groupInfoPresentation.json b/json/samsungvd.groupInfoPresentation.json
index 15e95a30..1aadb2d9 100755
--- a/json/samsungvd.groupInfoPresentation.json
+++ b/json/samsungvd.groupInfoPresentation.json
@@ -2,10 +2,10 @@
     "dashboard": {
         "states": [
             {
-                "label": "{{i18n.attributes.playingFrom.label}}"
+                "label": "Playing from {{masterName.value}}"
             },
             {
-                "label": "{{i18n.attributes.sharingFrom.label}}"
+                "label": "Sharing from {{masterName.value}}"
             }
         ],
         "actions": [],
diff --git a/json/samsungvd.lightControl.json b/json/samsungvd.lightControl.json
index 6a2113f7..997a7b7b 100755
--- a/json/samsungvd.lightControl.json
+++ b/json/samsungvd.lightControl.json
@@ -132,7 +132,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungvd.lightControlPresentation.json b/json/samsungvd.lightControlPresentation.json
index a7dd0918..13994211 100755
--- a/json/samsungvd.lightControlPresentation.json
+++ b/json/samsungvd.lightControlPresentation.json
@@ -3,7 +3,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.commands.setLightControlMode.label}}",
+                "label": "Hue Sync",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
diff --git a/json/samsungvd.mediaInputSource.json b/json/samsungvd.mediaInputSource.json
index c04c2e72..25c0e460 100755
--- a/json/samsungvd.mediaInputSource.json
+++ b/json/samsungvd.mediaInputSource.json
@@ -35,28 +35,7 @@
                 "type": "object",
                 "properties": {
                     "value": {
-                        "title": "MediaSource",
-                        "type": "string",
-                        "enum": [
-                            "AM",
-                            "CD",
-                            "FM",
-                            "HDMI",
-                            "HDMI1",
-                            "HDMI2",
-                            "HDMI3",
-                            "HDMI4",
-                            "HDMI5",
-                            "HDMI6",
-                            "digitalTv",
-                            "USB",
-                            "YouTube",
-                            "aux",
-                            "bluetooth",
-                            "digital",
-                            "melon",
-                            "wifi"
-                        ]
+                        "type": "string"
                     }
                 },
                 "additionalProperties": false,
@@ -64,7 +43,6 @@
                     "value"
                 ]
             },
-            "setter": "setInputSource",
             "enumCommands": []
         }
     },
@@ -76,31 +54,11 @@
                     "name": "id",
                     "optional": false,
                     "schema": {
-                    "title": "MediaSource",
-                        "type": "string",
-                        "enum": [
-                            "AM",
-                            "CD",
-                            "FM",
-                            "HDMI",
-                            "HDMI1",
-                            "HDMI2",
-                            "HDMI3",
-                            "HDMI4",
-                            "HDMI5",
-                            "HDMI6",
-                            "digitalTv",
-                            "USB",
-                            "YouTube",
-                            "aux",
-                            "bluetooth",
-                            "digital",
-                            "melon",
-                            "wifi"
-                        ]
+                        "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungvd.mediaInputSourcePresentation.json b/json/samsungvd.mediaInputSourcePresentation.json
index 7c60a614..79ee47bf 100755
--- a/json/samsungvd.mediaInputSourcePresentation.json
+++ b/json/samsungvd.mediaInputSourcePresentation.json
@@ -2,13 +2,13 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.inputSource.label}}",
+                "label": "Source",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "NotAvailable",
-                            "value": "{{i18n.attributes.emptyInputSources.label}}",
+                            "value": "No devices found",
                             "type": "inactive"
                         }
                     ],
@@ -21,13 +21,13 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.commands.setInputSource.label}}",
+                "label": "Change Source",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "NotAvailable",
-                            "value": "{{i18n.attributes.emptyInputSources.label}}",
+                            "value": "No devices found",
                             "type": "active"
                         }
                     ],
diff --git a/json/samsungvd.pictureMode.json b/json/samsungvd.pictureMode.json
index bc2e04dc..6f3dbbd2 100755
--- a/json/samsungvd.pictureMode.json
+++ b/json/samsungvd.pictureMode.json
@@ -16,7 +16,6 @@
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setPictureMode",
             "enumCommands": []
         },
         "supportedPictureModes": {
@@ -69,7 +68,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungvd.pictureModePresentation.json b/json/samsungvd.pictureModePresentation.json
index 24caa7a5..8f612de6 100755
--- a/json/samsungvd.pictureModePresentation.json
+++ b/json/samsungvd.pictureModePresentation.json
@@ -34,7 +34,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.commands.setPictureMode.label}}",
+                "label": "Change Picture Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
diff --git a/json/samsungvd.soundFrom.json b/json/samsungvd.soundFrom.json
index 359bd770..95b8c9d8 100755
--- a/json/samsungvd.soundFrom.json
+++ b/json/samsungvd.soundFrom.json
@@ -54,7 +54,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/samsungvd.soundMode.json b/json/samsungvd.soundMode.json
index 6ad3e72c..f4289269 100755
--- a/json/samsungvd.soundMode.json
+++ b/json/samsungvd.soundMode.json
@@ -41,7 +41,6 @@
                 "additionalProperties": false,
                 "required": []
             },
-            "setter": "setSoundMode",
             "enumCommands": []
         },
         "supportedSoundModes": {
@@ -72,7 +71,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/samsungvd.soundModePresentation.json b/json/samsungvd.soundModePresentation.json
index 63cca3f7..3ce9f0e2 100755
--- a/json/samsungvd.soundModePresentation.json
+++ b/json/samsungvd.soundModePresentation.json
@@ -34,7 +34,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.commands.setSoundMode.label}}",
+                "label": "Change Sound Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
diff --git a/json/samsungvd.thingStatusPresentation.json b/json/samsungvd.thingStatusPresentation.json
index a0664457..e5e73ec9 100755
--- a/json/samsungvd.thingStatusPresentation.json
+++ b/json/samsungvd.thingStatusPresentation.json
@@ -2,7 +2,7 @@
     "dashboard": {
         "states": [
             {
-                "label": "{{i18n.attributes.updating.label}}"
+                "label": "Updating..."
             }
         ],
         "actions": [],
diff --git a/json/sceneActivityPresentation.json b/json/sceneActivityPresentation.json
index cc3c9023..01a21fb0 100644
--- a/json/sceneActivityPresentation.json
+++ b/json/sceneActivityPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Scene",
             "displayType": "state",
             "state": {
                 "label": "{{activatedScene.value}}"
@@ -20,7 +20,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Scene",
                 "displayType": "dynamicList",
                 "dynamicList": {
                     "value": "activatedScene.value",
diff --git a/json/scenes.json b/json/scenes.json
index be5e4442..249cbe61 100755
--- a/json/scenes.json
+++ b/json/scenes.json
@@ -51,7 +51,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/scent.json b/json/scent.json
index 91551e18..fb69b4af 100755
--- a/json/scent.json
+++ b/json/scent.json
@@ -60,7 +60,8 @@
                         "maximum": 100
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/scentPresentation.json b/json/scentPresentation.json
index 320158db..8eaeb9af 100755
--- a/json/scentPresentation.json
+++ b/json/scentPresentation.json
@@ -1,14 +1,14 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Scents",
             "displayType": "state",
             "state": {
                 "label": "{{scentName.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Scents",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Scents",
                 "displayType": "textField",
                 "textField": {
                     "value": "scentName.value",
@@ -36,7 +36,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Scents",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setScentIntensity",
diff --git a/json/sec.diagnosticsInformation.i18n.en.json b/json/sec.diagnosticsInformation.i18n.en.json
index 7c6ad632..71728cbe 100755
--- a/json/sec.diagnosticsInformation.i18n.en.json
+++ b/json/sec.diagnosticsInformation.i18n.en.json
@@ -71,6 +71,9 @@
                     "wifi_stdk": {
                         "label": "wifi_stdk"
                     },
+                    "ble_stdk_hub": {
+                        "label": "ble_stdk_hub"
+                    },
                     "l3_ocf": {
                         "label": "l3_ocf"
                     }
diff --git a/json/sec.diagnosticsInformation.i18n.fr.json b/json/sec.diagnosticsInformation.i18n.fr.json
index 7c6ad632..71728cbe 100644
--- a/json/sec.diagnosticsInformation.i18n.fr.json
+++ b/json/sec.diagnosticsInformation.i18n.fr.json
@@ -71,6 +71,9 @@
                     "wifi_stdk": {
                         "label": "wifi_stdk"
                     },
+                    "ble_stdk_hub": {
+                        "label": "ble_stdk_hub"
+                    },
                     "l3_ocf": {
                         "label": "l3_ocf"
                     }
diff --git a/json/sec.diagnosticsInformation.json b/json/sec.diagnosticsInformation.json
index 08661543..017e94a5 100755
--- a/json/sec.diagnosticsInformation.json
+++ b/json/sec.diagnosticsInformation.json
@@ -110,7 +110,8 @@
                             "wifi_https",
                             "ble_stdk",
                             "wifi_stdk",
-                            "l3_ocf"
+                            "l3_ocf",
+                            "ble_stdk_hub"
                         ]
                     }
                 },
diff --git a/json/sec.wifiConfiguration.json b/json/sec.wifiConfiguration.json
index 81e8871e..0b8afd6d 100755
--- a/json/sec.wifiConfiguration.json
+++ b/json/sec.wifiConfiguration.json
@@ -100,6 +100,7 @@
                             "enum": [
                                 "helper_hotspot",
                                 "ble_ocf",
+                                "ble_stdk_hub",
                                 "ble_stdk"
                             ]
                         }
diff --git a/json/securitySystem.json b/json/securitySystem.json
index 4ae45794..136453d5 100755
--- a/json/securitySystem.json
+++ b/json/securitySystem.json
@@ -161,11 +161,13 @@
                         "type": "boolean"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "disarm": {
             "name": "disarm",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "armAway": {
             "name": "armAway",
@@ -177,7 +179,8 @@
                         "type": "boolean"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/securitySystemPresentation.json b/json/securitySystemPresentation.json
index 6643baf7..6fd8e179 100755
--- a/json/securitySystemPresentation.json
+++ b/json/securitySystemPresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "armedAway",
-                        "value": "{{i18n.attributes.securitySystemStatus.i18n.value.armedAway.label}}",
+                        "value": "Armed (away)",
                         "type": "active"
                     },
                     {
                         "key": "armedStay",
-                        "value": "{{i18n.attributes.securitySystemStatus.i18n.value.armedStay.label}}",
+                        "value": "Armed (stay)",
                         "type": "active"
                     },
                     {
                         "key": "disarmed",
-                        "value": "{{i18n.attributes.securitySystemStatus.i18n.value.disarmed.label}}",
+                        "value": "Disarmed",
                         "type": "active"
                     }
                 ]
@@ -27,24 +27,24 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Security mode",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "armAway",
-                            "value": "{{i18n.commands.armAway.label}}",
+                            "value": "Armed (away)",
                             "type": "active"
                         },
                         {
                             "key": "armStay",
-                            "value": "{{i18n.commands.armStay.label}}",
+                            "value": "Armed (stay)",
                             "type": "active"
                         },
                         {
                             "key": "disarm",
-                            "value": "{{i18n.commands.disarm.label}}",
+                            "value": "Disarmed",
                             "type": "active"
                         }
                     ],
@@ -56,17 +56,17 @@
                     "alternatives": [
                         {
                             "key": "armedAway",
-                            "value": "{{i18n.attributes.securitySystemStatus.i18n.value.armedAway.label}}",
+                            "value": "Armed (away)",
                             "type": "active"
                         },
                         {
                             "key": "armedStay",
-                            "value": "{{i18n.attributes.securitySystemStatus.i18n.value.armedStay.label}}",
+                            "value": "Armed (stay)",
                             "type": "active"
                         },
                         {
                             "key": "disarmed",
-                            "value": "{{i18n.attributes.securitySystemStatus.i18n.value.disarmed.label}}",
+                            "value": "Disarmed",
                             "type": "active"
                         }
                     ]
@@ -77,23 +77,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Security mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "armedAway",
-                            "value": "{{i18n.attributes.securitySystemStatus.i18n.value.armedAway.label}}",
+                            "value": "Armed (away)",
                             "type": "active"
                         },
                         {
                             "key": "armedStay",
-                            "value": "{{i18n.attributes.securitySystemStatus.i18n.value.armedStay.label}}",
+                            "value": "Armed (stay)",
                             "type": "active"
                         },
                         {
                             "key": "disarmed",
-                            "value": "{{i18n.attributes.securitySystemStatus.i18n.value.disarmed.label}}",
+                            "value": "Disarmed",
                             "type": "active"
                         }
                     ],
@@ -106,23 +106,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Security mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "armAway",
-                            "value": "{{i18n.commands.armAway.label}}",
+                            "value": "Armed (away)",
                             "type": "active"
                         },
                         {
                             "key": "armStay",
-                            "value": "{{i18n.commands.armStay.label}}",
+                            "value": "Armed (stay)",
                             "type": "active"
                         },
                         {
                             "key": "disarm",
-                            "value": "{{i18n.commands.disarm.label}}",
+                            "value": "Disarmed",
                             "type": "active"
                         }
                     ],
diff --git a/json/serviceArea.json b/json/serviceArea.json
index 2f1b5398..82e0a131 100644
--- a/json/serviceArea.json
+++ b/json/serviceArea.json
@@ -69,7 +69,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/serviceAreaPresentation.json b/json/serviceAreaPresentation.json
index 23be4ed9..783beba8 100644
--- a/json/serviceAreaPresentation.json
+++ b/json/serviceAreaPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Cleaning area",
             "displayType": "state",
             "state": {
                 "label": "{{selectedAreas.value}}"
diff --git a/json/signalStrengthPresentation.json b/json/signalStrengthPresentation.json
index c27858b5..3e832f0d 100755
--- a/json/signalStrengthPresentation.json
+++ b/json/signalStrengthPresentation.json
@@ -10,14 +10,14 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Signal strength",
             "displayType": "state",
             "state": {
                 "label": "{{lqi.value}}"
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Signal strength",
             "displayType": "state",
             "state": {
                 "label": "{{rssi.value}}",
@@ -28,7 +28,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Signal strength",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "lqi.value",
@@ -40,7 +40,7 @@
                 }
             },
             {
-                "label": "{{i18n.label}}",
+                "label": "Signal strength",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "rssi.value",
diff --git a/json/signalahead13665.applianceoperationstatesv2Presentation.json b/json/signalahead13665.applianceoperationstatesv2Presentation.json
index 70def85c..03acc757 100755
--- a/json/signalahead13665.applianceoperationstatesv2Presentation.json
+++ b/json/signalahead13665.applianceoperationstatesv2Presentation.json
@@ -6,47 +6,47 @@
                 "alternatives": [
                     {
                         "key": "Inactive",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Inactive.label}}",
+                        "value": "Inactive",
                         "type": "active"
                     },
                     {
                         "key": "Ready",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Ready.label}}",
+                        "value": "Ready",
                         "type": "active"
                     },
                     {
                         "key": "Run",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Run.label}}",
+                        "value": "Running",
                         "type": "active"
                     },
                     {
                         "key": "Pause",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Pause.label}}",
+                        "value": "Paused",
                         "type": "active"
                     },
                     {
                         "key": "Finished",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Finished.label}}",
+                        "value": "Completed",
                         "type": "active"
                     },
                     {
                         "key": "DelayedStart",
-                        "value": "{{i18n.attributes.operationState.i18n.value.DelayedStart.label}}",
+                        "value": "Delayed Start",
                         "type": "active"
                     },
                     {
                         "key": "ActionRequired",
-                        "value": "{{i18n.attributes.operationState.i18n.value.ActionRequired.label}}",
+                        "value": "Action Required",
                         "type": "active"
                     },
                     {
                         "key": "Error",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Error.label}}",
+                        "value": "Error",
                         "type": "active"
                     },
                     {
                         "key": "Aborting",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Aborting.label}}",
+                        "value": "Aborting",
                         "type": "active"
                     }
                 ]
@@ -57,54 +57,54 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.operationState.label}}",
+            "label": "Operation State",
             "displayType": "state",
             "state": {
                 "label": "{{operationState.value}}",
                 "alternatives": [
                     {
                         "key": "Inactive",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Inactive.label}}",
+                        "value": "Inactive",
                         "type": "active"
                     },
                     {
                         "key": "Ready",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Ready.label}}",
+                        "value": "Ready",
                         "type": "active"
                     },
                     {
                         "key": "Run",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Run.label}}",
+                        "value": "Running",
                         "type": "active"
                     },
                     {
                         "key": "Pause",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Pause.label}}",
+                        "value": "Paused",
                         "type": "active"
                     },
                     {
                         "key": "Finished",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Finished.label}}",
+                        "value": "Completed",
                         "type": "active"
                     },
                     {
                         "key": "DelayedStart",
-                        "value": "{{i18n.attributes.operationState.i18n.value.DelayedStart.label}}",
+                        "value": "Delayed Start",
                         "type": "active"
                     },
                     {
                         "key": "ActionRequired",
-                        "value": "{{i18n.attributes.operationState.i18n.value.ActionRequired.label}}",
+                        "value": "Action Required",
                         "type": "active"
                     },
                     {
                         "key": "Error",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Error.label}}",
+                        "value": "Error",
                         "type": "active"
                     },
                     {
                         "key": "Aborting",
-                        "value": "{{i18n.attributes.operationState.i18n.value.Aborting.label}}",
+                        "value": "Aborting",
                         "type": "active"
                     }
                 ]
@@ -114,53 +114,53 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.operationState.label}}",
+                "label": "Operation State",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "Inactive",
-                            "value": "{{i18n.attributes.operationState.i18n.value.Inactive.label}}",
+                            "value": "Inactive",
                             "type": "active"
                         },
                         {
                             "key": "Ready",
-                            "value": "{{i18n.attributes.operationState.i18n.value.Ready.label}}",
+                            "value": "Ready",
                             "type": "active"
                         },
                         {
                             "key": "Run",
-                            "value": "{{i18n.attributes.operationState.i18n.value.Run.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "Pause",
-                            "value": "{{i18n.attributes.operationState.i18n.value.Pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "Finished",
-                            "value": "{{i18n.attributes.operationState.i18n.value.Finished.label}}",
+                            "value": "Completed",
                             "type": "active"
                         },
                         {
                             "key": "DelayedStart",
-                            "value": "{{i18n.attributes.operationState.i18n.value.DelayedStart.label}}",
+                            "value": "Delayed Start",
                             "type": "active"
                         },
                         {
                             "key": "ActionRequired",
-                            "value": "{{i18n.attributes.operationState.i18n.value.ActionRequired.label}}",
+                            "value": "Action Required",
                             "type": "active"
                         },
                         {
                             "key": "Error",
-                            "value": "{{i18n.attributes.operationState.i18n.value.Error.label}}",
+                            "value": "Error",
                             "type": "active"
                         },
                         {
                             "key": "Aborting",
-                            "value": "{{i18n.attributes.operationState.i18n.value.Aborting.label}}",
+                            "value": "Aborting",
                             "type": "active"
                         }
                     ],
diff --git a/json/signalahead13665.dishwasherprogramsv2.json b/json/signalahead13665.dishwasherprogramsv2.json
index 349d0a58..46566406 100755
--- a/json/signalahead13665.dishwasherprogramsv2.json
+++ b/json/signalahead13665.dishwasherprogramsv2.json
@@ -96,7 +96,8 @@
     "commands": {
         "stop": {
             "name": "stop",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setProgram": {
             "name": "setProgram",
@@ -120,7 +121,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/signalahead13665.dishwasherprogramsv2Presentation.json b/json/signalahead13665.dishwasherprogramsv2Presentation.json
index f9e76fc9..28ad464b 100755
--- a/json/signalahead13665.dishwasherprogramsv2Presentation.json
+++ b/json/signalahead13665.dishwasherprogramsv2Presentation.json
@@ -6,62 +6,62 @@
                 "alternatives": [
                     {
                         "key": "Dishcare_Dishwasher_Program_Auto2",
-                        "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Auto2.label}}",
+                        "value": "Auto 45-65°",
                         "type": "active"
                     },
                     {
                         "key": "Dishcare_Dishwasher_Program_Eco50",
-                        "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Eco50.label}}",
+                        "value": "Eco 50°",
                         "type": "active"
                     },
                     {
                         "key": "Dishcare_Dishwasher_Program_Kurz60",
-                        "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Kurz60.label}}",
+                        "value": "Short 60°C",
                         "type": "active"
                     },
                     {
                         "key": "Dishcare_Dishwasher_Program_Intensiv70",
-                        "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Intensiv70.label}}",
+                        "value": "Intensive 70°",
                         "type": "active"
                     },
                     {
                         "key": "Dishcare_Dishwasher_Program_Quick45",
-                        "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Quick45.label}}",
+                        "value": "Quick wash 45°C",
                         "type": "active"
                     },
                     {
                         "key": "Dishcare_Dishwasher_Program_Auto3",
-                        "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Auto3.label}}",
+                        "value": "Auto 65-75°C",
                         "type": "active"
                     },
                     {
                         "key": "Dishcare_Dishwasher_Program_NightWash",
-                        "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_NightWash.label}}",
+                        "value": "Night program 50°C",
                         "type": "active"
                     },
                     {
                         "key": "Dishcare_Dishwasher_Program_MachineCare",
-                        "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_MachineCare.label}}",
+                        "value": "Machine Care",
                         "type": "active"
                     },
                     {
                         "key": "Dishcare_Dishwasher_Program_PreRinse",
-                        "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_PreRinse.label}}",
+                        "value": "Pre-rinse",
                         "type": "active"
                     },
                     {
                         "key": "Dishcare_Dishwasher_Program_Glas40",
-                        "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Glas40.label}}",
+                        "value": "Glass 40°",
                         "type": "active"
                     },
                     {
                         "key": "None",
-                        "value": "{{i18n.attributes.program.i18n.value.None.label}}",
+                        "value": "None",
                         "type": "active"
                     },
                     {
                         "key": "UnknownProgram",
-                        "value": "{{i18n.attributes.program.i18n.value.UnknownProgram.label}}",
+                        "value": "Unknown program",
                         "type": "active"
                     }
                 ]
@@ -72,7 +72,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.program.label}}",
+            "label": "Programs",
             "displayType": "list",
             "list": {
                 "command": {
@@ -80,52 +80,52 @@
                     "alternatives": [
                         {
                             "key": "Dishcare_Dishwasher_Program_Auto2",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Auto2.label}}",
+                            "value": "Auto 45-65°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Eco50",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Eco50.label}}",
+                            "value": "Eco 50°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Kurz60",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Kurz60.label}}",
+                            "value": "Short 60°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Intensiv70",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Intensiv70.label}}",
+                            "value": "Intensive 70°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Quick45",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Quick45.label}}",
+                            "value": "Quick wash 45°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Auto3",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Auto3.label}}",
+                            "value": "Auto 65-75°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_NightWash",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_NightWash.label}}",
+                            "value": "Night program 50°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_MachineCare",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_MachineCare.label}}",
+                            "value": "Machine Care",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_PreRinse",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_PreRinse.label}}",
+                            "value": "Pre-rinse",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Glas40",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Glas40.label}}",
+                            "value": "Glass 40°",
                             "type": "active"
                         }
                     ],
@@ -138,62 +138,62 @@
                     "alternatives": [
                         {
                             "key": "Dishcare_Dishwasher_Program_Auto2",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Auto2.label}}",
+                            "value": "Auto 45-65°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Eco50",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Eco50.label}}",
+                            "value": "Eco 50°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Kurz60",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Kurz60.label}}",
+                            "value": "Short 60°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Intensiv70",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Intensiv70.label}}",
+                            "value": "Intensive 70°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Quick45",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Quick45.label}}",
+                            "value": "Quick wash 45°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Auto3",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Auto3.label}}",
+                            "value": "Auto 65-75°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_NightWash",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_NightWash.label}}",
+                            "value": "Night program 50°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_MachineCare",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_MachineCare.label}}",
+                            "value": "Machine Care",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_PreRinse",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_PreRinse.label}}",
+                            "value": "Pre-rinse",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Glas40",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Glas40.label}}",
+                            "value": "Glass 40°",
                             "type": "active"
                         },
                         {
                             "key": "None",
-                            "value": "{{i18n.attributes.program.i18n.value.None.label}}",
+                            "value": "None",
                             "type": "active"
                         },
                         {
                             "key": "UnknownProgram",
-                            "value": "{{i18n.attributes.program.i18n.value.UnknownProgram.label}}",
+                            "value": "Unknown program",
                             "type": "active"
                         }
                     ]
@@ -204,68 +204,68 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.program.label}}",
+                "label": "Programs",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "Dishcare_Dishwasher_Program_Auto2",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Auto2.label}}",
+                            "value": "Auto 45-65°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Eco50",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Eco50.label}}",
+                            "value": "Eco 50°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Kurz60",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Kurz60.label}}",
+                            "value": "Short 60°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Intensiv70",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Intensiv70.label}}",
+                            "value": "Intensive 70°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Quick45",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Quick45.label}}",
+                            "value": "Quick wash 45°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Auto3",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Auto3.label}}",
+                            "value": "Auto 65-75°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_NightWash",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_NightWash.label}}",
+                            "value": "Night program 50°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_MachineCare",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_MachineCare.label}}",
+                            "value": "Machine Care",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_PreRinse",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_PreRinse.label}}",
+                            "value": "Pre-rinse",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Glas40",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Glas40.label}}",
+                            "value": "Glass 40°",
                             "type": "active"
                         },
                         {
                             "key": "None",
-                            "value": "{{i18n.attributes.program.i18n.value.None.label}}",
+                            "value": "None",
                             "type": "active"
                         },
                         {
                             "key": "UnknownProgram",
-                            "value": "{{i18n.attributes.program.i18n.value.UnknownProgram.label}}",
+                            "value": "Unknown program",
                             "type": "active"
                         }
                     ],
@@ -278,58 +278,58 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.program.label}}",
+                "label": "Programs",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "Dishcare_Dishwasher_Program_Auto2",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Auto2.label}}",
+                            "value": "Auto 45-65°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Eco50",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Eco50.label}}",
+                            "value": "Eco 50°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Kurz60",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Kurz60.label}}",
+                            "value": "Short 60°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Intensiv70",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Intensiv70.label}}",
+                            "value": "Intensive 70°",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Quick45",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Quick45.label}}",
+                            "value": "Quick wash 45°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Auto3",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Auto3.label}}",
+                            "value": "Auto 65-75°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_NightWash",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_NightWash.label}}",
+                            "value": "Night program 50°C",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_MachineCare",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_MachineCare.label}}",
+                            "value": "Machine Care",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_PreRinse",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_PreRinse.label}}",
+                            "value": "Pre-rinse",
                             "type": "active"
                         },
                         {
                             "key": "Dishcare_Dishwasher_Program_Glas40",
-                            "value": "{{i18n.attributes.program.i18n.value.Dishcare_Dishwasher_Program_Glas40.label}}",
+                            "value": "Glass 40°",
                             "type": "active"
                         }
                     ],
diff --git a/json/signalahead13665.ovenprogramsv2.json b/json/signalahead13665.ovenprogramsv2.json
index 3fdf9c68..1f431d6f 100755
--- a/json/signalahead13665.ovenprogramsv2.json
+++ b/json/signalahead13665.ovenprogramsv2.json
@@ -105,7 +105,8 @@
     "commands": {
         "stop": {
             "name": "stop",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setProgram": {
             "name": "setProgram",
@@ -132,7 +133,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/signalahead13665.ovenprogramsv2Presentation.json b/json/signalahead13665.ovenprogramsv2Presentation.json
index d0f222c3..d6014a66 100755
--- a/json/signalahead13665.ovenprogramsv2Presentation.json
+++ b/json/signalahead13665.ovenprogramsv2Presentation.json
@@ -6,77 +6,77 @@
                 "alternatives": [
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_HotAir",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAir.label}}",
+                        "value": "4D hot air",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_TopBottomHeating",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_TopBottomHeating.label}}",
+                        "value": "Top/bottom heating",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_HotAirGrilling",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAirGrilling.label}}",
+                        "value": "Hot air grilling",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_PizzaSetting",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_PizzaSetting.label}}",
+                        "value": "Pizza setting",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_HotAirEco",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAirEco.label}}",
+                        "value": "Hot air eco",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_KeepWarm",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_KeepWarm.label}}",
+                        "value": "Keep warm",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_PreheatOvenware",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_PreheatOvenware.label}}",
+                        "value": "Preheat ovenware",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_TopBottomHeatingEco",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_TopBottomHeatingEco.label}}",
+                        "value": "Top/bottom heating eco",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_FrozenHeatupSpecial",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_FrozenHeatupSpecial.label}}",
+                        "value": "CoolStart",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_SlowCook",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_SlowCook.label}}",
+                        "value": "Slow cook",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_IntensiveHeat",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_IntensiveHeat.label}}",
+                        "value": "Intensive heat",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_Defrost",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_Defrost.label}}",
+                        "value": "Defrost",
                         "type": "active"
                     },
                     {
                         "key": "Cooking_Oven_Program_HeatingMode_BottomHeating",
-                        "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_BottomHeating.label}}",
+                        "value": "Bottom heating",
                         "type": "active"
                     },
                     {
                         "key": "None",
-                        "value": "{{i18n.attributes.program.i18n.value.None.label}}",
+                        "value": "None",
                         "type": "active"
                     },
                     {
                         "key": "UnknownProgram",
-                        "value": "{{i18n.attributes.program.i18n.value.UnknownProgram.label}}",
+                        "value": "Unknown program",
                         "type": "active"
                     }
                 ]
@@ -87,7 +87,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.program.label}}",
+            "label": "Programs",
             "displayType": "list",
             "list": {
                 "command": {
@@ -95,67 +95,67 @@
                     "alternatives": [
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAir",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAir.label}}",
+                            "value": "4D hot air",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_TopBottomHeating",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_TopBottomHeating.label}}",
+                            "value": "Top/bottom heating",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAirGrilling",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAirGrilling.label}}",
+                            "value": "Hot air grilling",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_PizzaSetting",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_PizzaSetting.label}}",
+                            "value": "Pizza setting",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAirEco",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAirEco.label}}",
+                            "value": "Hot air eco",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_KeepWarm",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_KeepWarm.label}}",
+                            "value": "Keep warm",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_PreheatOvenware",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_PreheatOvenware.label}}",
+                            "value": "Preheat ovenware",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_TopBottomHeatingEco",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_TopBottomHeatingEco.label}}",
+                            "value": "Top/bottom heating eco",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_FrozenHeatupSpecial",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_FrozenHeatupSpecial.label}}",
+                            "value": "CoolStart",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_SlowCook",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_SlowCook.label}}",
+                            "value": "Slow cook",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_IntensiveHeat",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_IntensiveHeat.label}}",
+                            "value": "Intensive heat",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_Defrost",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_Defrost.label}}",
+                            "value": "Defrost",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_BottomHeating",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_BottomHeating.label}}",
+                            "value": "Bottom heating",
                             "type": "active"
                         }
                     ],
@@ -168,77 +168,77 @@
                     "alternatives": [
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAir",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAir.label}}",
+                            "value": "4D hot air",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_TopBottomHeating",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_TopBottomHeating.label}}",
+                            "value": "Top/bottom heating",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAirGrilling",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAirGrilling.label}}",
+                            "value": "Hot air grilling",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_PizzaSetting",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_PizzaSetting.label}}",
+                            "value": "Pizza setting",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAirEco",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAirEco.label}}",
+                            "value": "Hot air eco",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_KeepWarm",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_KeepWarm.label}}",
+                            "value": "Keep warm",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_PreheatOvenware",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_PreheatOvenware.label}}",
+                            "value": "Preheat ovenware",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_TopBottomHeatingEco",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_TopBottomHeatingEco.label}}",
+                            "value": "Top/bottom heating eco",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_FrozenHeatupSpecial",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_FrozenHeatupSpecial.label}}",
+                            "value": "CoolStart",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_SlowCook",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_SlowCook.label}}",
+                            "value": "Slow cook",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_IntensiveHeat",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_IntensiveHeat.label}}",
+                            "value": "Intensive heat",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_Defrost",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_Defrost.label}}",
+                            "value": "Defrost",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_BottomHeating",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_BottomHeating.label}}",
+                            "value": "Bottom heating",
                             "type": "active"
                         },
                         {
                             "key": "None",
-                            "value": "{{i18n.attributes.program.i18n.value.None.label}}",
+                            "value": "None",
                             "type": "active"
                         },
                         {
                             "key": "UnknownProgram",
-                            "value": "{{i18n.attributes.program.i18n.value.UnknownProgram.label}}",
+                            "value": "Unknown program",
                             "type": "active"
                         }
                     ]
@@ -249,83 +249,83 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.program.label}}",
+                "label": "Programs",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAir",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAir.label}}",
+                            "value": "4D hot air",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_TopBottomHeating",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_TopBottomHeating.label}}",
+                            "value": "Top/bottom heating",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAirGrilling",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAirGrilling.label}}",
+                            "value": "Hot air grilling",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_PizzaSetting",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_PizzaSetting.label}}",
+                            "value": "Pizza setting",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAirEco",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAirEco.label}}",
+                            "value": "Hot air eco",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_KeepWarm",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_KeepWarm.label}}",
+                            "value": "Keep warm",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_PreheatOvenware",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_PreheatOvenware.label}}",
+                            "value": "Preheat ovenware",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_TopBottomHeatingEco",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_TopBottomHeatingEco.label}}",
+                            "value": "Top/bottom heating eco",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_FrozenHeatupSpecial",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_FrozenHeatupSpecial.label}}",
+                            "value": "CoolStart",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_SlowCook",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_SlowCook.label}}",
+                            "value": "Slow cook",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_IntensiveHeat",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_IntensiveHeat.label}}",
+                            "value": "Intensive heat",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_Defrost",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_Defrost.label}}",
+                            "value": "Defrost",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_BottomHeating",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_BottomHeating.label}}",
+                            "value": "Bottom heating",
                             "type": "active"
                         },
                         {
                             "key": "None",
-                            "value": "{{i18n.attributes.program.i18n.value.None.label}}",
+                            "value": "None",
                             "type": "active"
                         },
                         {
                             "key": "UnknownProgram",
-                            "value": "{{i18n.attributes.program.i18n.value.UnknownProgram.label}}",
+                            "value": "Unknown program",
                             "type": "active"
                         }
                     ],
@@ -338,73 +338,73 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.program.label}}",
+                "label": "Programs",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAir",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAir.label}}",
+                            "value": "4D hot air",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_TopBottomHeating",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_TopBottomHeating.label}}",
+                            "value": "Top/bottom heating",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAirGrilling",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAirGrilling.label}}",
+                            "value": "Hot air grilling",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_PizzaSetting",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_PizzaSetting.label}}",
+                            "value": "Pizza setting",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_HotAirEco",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_HotAirEco.label}}",
+                            "value": "Hot air eco",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_KeepWarm",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_KeepWarm.label}}",
+                            "value": "Keep warm",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_PreheatOvenware",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_PreheatOvenware.label}}",
+                            "value": "Preheat ovenware",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_TopBottomHeatingEco",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_TopBottomHeatingEco.label}}",
+                            "value": "Top/bottom heating eco",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_FrozenHeatupSpecial",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_FrozenHeatupSpecial.label}}",
+                            "value": "CoolStart",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_SlowCook",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_SlowCook.label}}",
+                            "value": "Slow cook",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_IntensiveHeat",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_IntensiveHeat.label}}",
+                            "value": "Intensive heat",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_Defrost",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_Defrost.label}}",
+                            "value": "Defrost",
                             "type": "active"
                         },
                         {
                             "key": "Cooking_Oven_Program_HeatingMode_BottomHeating",
-                            "value": "{{i18n.attributes.program.i18n.value.Cooking_Oven_Program_HeatingMode_BottomHeating.label}}",
+                            "value": "Bottom heating",
                             "type": "active"
                         }
                     ],
diff --git a/json/signalahead13665.pauseresumev2.json b/json/signalahead13665.pauseresumev2.json
index 01ef67e2..a5ac2322 100755
--- a/json/signalahead13665.pauseresumev2.json
+++ b/json/signalahead13665.pauseresumev2.json
@@ -33,7 +33,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/signalahead13665.pauseresumev2Presentation.json b/json/signalahead13665.pauseresumev2Presentation.json
index 02f4f151..3e91252e 100755
--- a/json/signalahead13665.pauseresumev2Presentation.json
+++ b/json/signalahead13665.pauseresumev2Presentation.json
@@ -6,7 +6,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.pauseState.label}}",
+            "label": "Pause / Resume",
             "displayType": "playPause",
             "playPause": {
                 "command": {
@@ -23,12 +23,12 @@
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.play.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "inactive"
                         }
                     ]
@@ -39,18 +39,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.pauseState.label}}",
+                "label": "Pause / Resume",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.play.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "inactive"
                         }
                     ],
@@ -62,18 +62,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.pauseState.label}}",
+                "label": "Pause / Resume",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.play.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/signalahead13665.pauseresumev3.json b/json/signalahead13665.pauseresumev3.json
index 927c9f45..eeb3e1df 100755
--- a/json/signalahead13665.pauseresumev3.json
+++ b/json/signalahead13665.pauseresumev3.json
@@ -33,7 +33,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/signalahead13665.pauseresumev3Presentation.json b/json/signalahead13665.pauseresumev3Presentation.json
index 3db5b837..5d23b14e 100755
--- a/json/signalahead13665.pauseresumev3Presentation.json
+++ b/json/signalahead13665.pauseresumev3Presentation.json
@@ -6,7 +6,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.pauseState.label}}",
+            "label": "Pause / Resume",
             "displayType": "switch",
             "switch": {
                 "command": {
@@ -23,12 +23,12 @@
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.play.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "inactive"
                         }
                     ]
@@ -39,18 +39,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.pauseState.label}}",
+                "label": "Pause / Resume",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.play.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "inactive"
                         }
                     ],
@@ -62,18 +62,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.pauseState.label}}",
+                "label": "Pause / Resume",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.play.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.pauseState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/signalahead13665.programdurationv2.json b/json/signalahead13665.programdurationv2.json
index 0358781a..45474d28 100755
--- a/json/signalahead13665.programdurationv2.json
+++ b/json/signalahead13665.programdurationv2.json
@@ -44,7 +44,8 @@
                         "maximum": 120
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/signalahead13665.programdurationv2Presentation.json b/json/signalahead13665.programdurationv2Presentation.json
index 8005acca..c46171c5 100755
--- a/json/signalahead13665.programdurationv2Presentation.json
+++ b/json/signalahead13665.programdurationv2Presentation.json
@@ -6,7 +6,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.duration.label}}",
+            "label": "Adjust duration (min)",
             "displayType": "numberField",
             "numberField": {
                 "value": "duration.value",
@@ -24,7 +24,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.duration.label}}",
+                "label": "Adjust duration (min)",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "duration.value",
@@ -39,7 +39,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.duration.label}}",
+                "label": "Adjust duration (min)",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setProgramDuration",
diff --git a/json/signalahead13665.startstopprogramv2.json b/json/signalahead13665.startstopprogramv2.json
index 97977d06..72cf71dc 100755
--- a/json/signalahead13665.startstopprogramv2.json
+++ b/json/signalahead13665.startstopprogramv2.json
@@ -41,7 +41,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/signalahead13665.startstopprogramv2Presentation.json b/json/signalahead13665.startstopprogramv2Presentation.json
index d4971bc0..cd8713c8 100755
--- a/json/signalahead13665.startstopprogramv2Presentation.json
+++ b/json/signalahead13665.startstopprogramv2Presentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.startstop.label}}",
+            "label": "Start / Stop",
             "displayType": "playStop",
             "playStop": {
                 "command": {
@@ -26,12 +26,12 @@
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.startstop.i18n.value.play.label}}",
+                            "value": "Active",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.startstop.i18n.value.stop.label}}",
+                            "value": "Inactive",
                             "type": "inactive"
                         }
                     ],
@@ -43,18 +43,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.startstop.label}}",
+                "label": "Start / Stop",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.startstop.i18n.value.play.label}}",
+                            "value": "Active",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.startstop.i18n.value.stop.label}}",
+                            "value": "Inactive",
                             "type": "inactive"
                         }
                     ],
@@ -66,18 +66,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.startstop.label}}",
+                "label": "Start / Stop",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.startstop.i18n.value.play.label}}",
+                            "value": "Active",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.startstop.i18n.value.stop.label}}",
+                            "value": "Inactive",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/signalahead13665.startstopprogramv3.json b/json/signalahead13665.startstopprogramv3.json
index 4bfe7f72..81d6c8f0 100755
--- a/json/signalahead13665.startstopprogramv3.json
+++ b/json/signalahead13665.startstopprogramv3.json
@@ -41,7 +41,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/signalahead13665.startstopprogramv3Presentation.json b/json/signalahead13665.startstopprogramv3Presentation.json
index e7bf15b1..8db44b2e 100755
--- a/json/signalahead13665.startstopprogramv3Presentation.json
+++ b/json/signalahead13665.startstopprogramv3Presentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.startstop.label}}",
+            "label": "Start / Stop",
             "displayType": "switch",
             "switch": {
                 "command": {
@@ -27,12 +27,12 @@
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.startstop.i18n.value.play.label}}",
+                            "value": "Active",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.startstop.i18n.value.stop.label}}",
+                            "value": "Inactive",
                             "type": "inactive"
                         }
                     ]
@@ -43,18 +43,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.startstop.label}}",
+                "label": "Start / Stop",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.startstop.i18n.value.play.label}}",
+                            "value": "Active",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.startstop.i18n.value.stop.label}}",
+                            "value": "Inactive",
                             "type": "inactive"
                         }
                     ],
@@ -66,18 +66,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.startstop.label}}",
+                "label": "Start / Stop",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "play",
-                            "value": "{{i18n.attributes.startstop.i18n.value.play.label}}",
+                            "value": "Active",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.startstop.i18n.value.stop.label}}",
+                            "value": "Inactive",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/sleepSensorPresentation.json b/json/sleepSensorPresentation.json
index bf860d7b..9e8bfef5 100755
--- a/json/sleepSensorPresentation.json
+++ b/json/sleepSensorPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "sleeping",
-                        "value": "{{i18n.attributes.sleeping.i18n.value.sleeping.label}}",
+                        "value": "Sleeping",
                         "type": "active"
                     },
                     {
                         "key": "not sleeping",
-                        "value": "{{i18n.attributes.sleeping.i18n.value.not sleeping.label}}",
+                        "value": "Not sleeping",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Sleep sensor",
             "displayType": "state",
             "state": {
                 "label": "{{sleeping.value}}",
                 "alternatives": [
                     {
                         "key": "sleeping",
-                        "value": "{{i18n.attributes.sleeping.i18n.value.sleeping.label}}",
+                        "value": "Sleeping",
                         "type": "active"
                     },
                     {
                         "key": "not sleeping",
-                        "value": "{{i18n.attributes.sleeping.i18n.value.not sleeping.label}}",
+                        "value": "Not sleeping",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Sleep sensor",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "sleeping",
-                            "value": "{{i18n.attributes.sleeping.i18n.value.sleeping.label}}",
+                            "value": "Sleeping",
                             "type": "active"
                         },
                         {
                             "key": "not sleeping",
-                            "value": "{{i18n.attributes.sleeping.i18n.value.not sleeping.label}}",
+                            "value": "Not sleeping",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/smokeDetectorPresentation.json b/json/smokeDetectorPresentation.json
index 9916f27c..3c0b38c1 100755
--- a/json/smokeDetectorPresentation.json
+++ b/json/smokeDetectorPresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.smoke.i18n.value.clear.label}}",
+                        "value": "Clear",
                         "type": "inactive"
                     },
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.smoke.i18n.value.detected.label}}",
+                        "value": "Smoke detected",
                         "type": "active"
                     },
                     {
                         "key": "tested",
-                        "value": "{{i18n.attributes.smoke.i18n.value.tested.label}}",
+                        "value": "Device tested",
                         "type": "active"
                     }
                 ]
@@ -27,24 +27,24 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Smoke detector",
             "displayType": "state",
             "state": {
                 "label": "{{smoke.value}}",
                 "alternatives": [
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.smoke.i18n.value.clear.label}}",
+                        "value": "Clear",
                         "type": "inactive"
                     },
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.smoke.i18n.value.detected.label}}",
+                        "value": "Smoke detected",
                         "type": "active"
                     },
                     {
                         "key": "tested",
-                        "value": "{{i18n.attributes.smoke.i18n.value.tested.label}}",
+                        "value": "Device tested",
                         "type": "active"
                     }
                 ]
@@ -54,18 +54,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Smoke detector",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "clear",
-                            "value": "{{i18n.attributes.smoke.i18n.value.clear.label}}",
+                            "value": "Clear",
                             "type": "inactive"
                         },
                         {
                             "key": "detected",
-                            "value": "{{i18n.attributes.smoke.i18n.value.detected.label}}",
+                            "value": "Smoke detected",
                             "type": "active"
                         }
                     ],
diff --git a/json/soilMoistureMeasurement.i18n.en.json b/json/soilMoistureMeasurement.i18n.en.json
new file mode 100644
index 00000000..9527f962
--- /dev/null
+++ b/json/soilMoistureMeasurement.i18n.en.json
@@ -0,0 +1,17 @@
+{
+    "tag": "en",
+    "label": "Soil Moisture Measurement",
+    "attributes": {
+        "soilMoistureLevel": {
+            "label": "soilMoistureLevel",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "soilMoistureLevelRange": {
+            "label": "soilMoistureLevelRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/soilMoistureMeasurement.i18n.fr.json b/json/soilMoistureMeasurement.i18n.fr.json
new file mode 100644
index 00000000..9527f962
--- /dev/null
+++ b/json/soilMoistureMeasurement.i18n.fr.json
@@ -0,0 +1,17 @@
+{
+    "tag": "en",
+    "label": "Soil Moisture Measurement",
+    "attributes": {
+        "soilMoistureLevel": {
+            "label": "soilMoistureLevel",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "soilMoistureLevelRange": {
+            "label": "soilMoistureLevelRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/soilMoistureMeasurement.json b/json/soilMoistureMeasurement.json
new file mode 100644
index 00000000..47972bbe
--- /dev/null
+++ b/json/soilMoistureMeasurement.json
@@ -0,0 +1,72 @@
+{
+    "id": "soilMoistureMeasurement",
+    "version": 1,
+    "status": "proposed",
+    "name": "Soil Moisture Measurement",
+    "ephemeral": false,
+    "attributes": {
+        "soilMoistureLevel": {
+            "schema": {
+                "title": "Percent",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "number",
+                        "minimum": 0,
+                        "maximum": 100
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "%"
+                        ],
+                        "default": "%"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "soilMoistureLevelRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "number",
+                                "minimum": 0,
+                                "maximum": 100
+                            },
+                            "maximum": {
+                                "type": "number",
+                                "minimum": 0,
+                                "maximum": 100
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "%"
+                        ],
+                        "default": "%"
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/soundDetection.i18n.en.json b/json/soundDetection.i18n.en.json
index b3fb61f8..727b6790 100755
--- a/json/soundDetection.i18n.en.json
+++ b/json/soundDetection.i18n.en.json
@@ -33,8 +33,8 @@
                     "dogBarking": {
                         "label": "Dog barking"
                     },
-                    "noSound": {
-                        "label": "No sound"
+                    "applianceAlarm": {
+                        "label": "Appliance alarm"
                     },
                     "siren": {
                         "label": "Siren"
@@ -42,17 +42,56 @@
                     "catMeowing": {
                         "label": "Cat meowing"
                     },
-                    "snoring": {
-                        "label": "Snoring"
+                    "faucetRunning": {
+                        "label": "Faucet running"
                     },
                     "doorKnocking": {
-                        "label": "Knock on door"
+                        "label": "Knocking"
+                    },
+                    "kettleBoiling": {
+                        "label": "Kettle boiling"
                     },
                     "babyCrying": {
                         "label": "Baby crying"
                     },
+                    "emergencyAlarm": {
+                        "label": "Emergency alarm"
+                    },
+                    "screaming": {
+                        "label": "Screaming"
+                    },
+                    "clapping": {
+                        "label": "Clapping"
+                    },
+                    "noSound": {
+                        "label": "No sound"
+                    },
+                    "coughing": {
+                        "label": "Coughing"
+                    },
+                    "dogHowling": {
+                        "label": "Dog howling"
+                    },
+                    "catPurring": {
+                        "label": "Cat purring"
+                    },
+                    "speech": {
+                        "label": "Speech"
+                    },
+                    "doorbell": {
+                        "label": "Doorbell"
+                    },
+                    "hairDrying": {
+                        "label": "Hair drying"
+                    },
+                    "snoring": {
+                        "label": "Snoring"
+                    },
                     "glassBreaking": {
-                        "label": "Breaking glass"
+                        "label": "Glass breaking"
+                    },
+                    "dogGrowling": {
+                        "label": "Dog growling"
                     },
                     "fireAlarm": {
                         "label": "Fire alarm"
diff --git a/json/soundDetection.i18n.fr.json b/json/soundDetection.i18n.fr.json
index 04e46a3a..ad95ac27 100755
--- a/json/soundDetection.i18n.fr.json
+++ b/json/soundDetection.i18n.fr.json
@@ -33,8 +33,8 @@
                     "dogBarking": {
                         "label": "Aboiement de chien"
                     },
-                    "noSound": {
-                        "label": "Aucun son"
+                    "applianceAlarm": {
+                        "label": "Alarme d'un appareil"
                     },
                     "siren": {
                         "label": "Sirène"
@@ -42,18 +42,57 @@
                     "catMeowing": {
                         "label": "Miaulement de chat"
                     },
-                    "snoring": {
-                        "label": "Ronflement"
+                    "faucetRunning": {
+                        "label": "Faucet running"
                     },
                     "doorKnocking": {
-                        "label": "Frappement à la porte"
+                        "label": "Bruit de coups"
+                    },
+                    "kettleBoiling": {
+                        "label": "Kettle boiling"
                     },
                     "babyCrying": {
                         "label": "Bébé en train de pleurer"
                     },
+                    "emergencyAlarm": {
+                        "label": "Alarme d'urgence"
+                    },
+                    "screaming": {
+                        "label": "Hurlement"
+                    },
+                    "clapping": {
+                        "label": "Applaudissements"
+                    },
+                    "noSound": {
+                        "label": "Aucun son"
+                    },
+                    "coughing": {
+                        "label": "Toux"
+                    },
+                    "dogHowling": {
+                        "label": "Dog howling"
+                    },
+                    "catPurring": {
+                        "label": "Cat purring"
+                    },
+                    "speech": {
+                        "label": "Speech"
+                    },
+                    "doorbell": {
+                        "label": "Sonnette"
+                    },
+                    "hairDrying": {
+                        "label": "Hair drying"
+                    },
+                    "snoring": {
+                        "label": "Ronflement"
+                    },
                     "glassBreaking": {
                         "label": "Bris de verre"
                     },
+                    "dogGrowling": {
+                        "label": "Dog growling"
+                    },
                     "fireAlarm": {
                         "label": "Alarme incendie"
                     },
diff --git a/json/soundDetection.json b/json/soundDetection.json
index ad2aad17..f9d529f4 100755
--- a/json/soundDetection.json
+++ b/json/soundDetection.json
@@ -48,11 +48,24 @@
                                 "babyCrying",
                                 "glassBreaking",
                                 "fireAlarm",
+                                "applianceAlarm",
+                                "emergencyAlarm",
+                                "screaming",
                                 "dogBarking",
+                                "dogGrowling",
+                                "dogHowling",
                                 "catMeowing",
+                                "catPurring",
                                 "doorKnocking",
+                                "doorbell",
+                                "faucetRunning",
+                                "hairDrying",
+                                "kettleBoiling",
                                 "siren",
                                 "fingerSnapping",
+                                "clapping",
+                                "coughing",
+                                "speech",
                                 "snoring"
                             ]
                         }
@@ -77,11 +90,24 @@
                             "babyCrying",
                             "glassBreaking",
                             "fireAlarm",
+                            "applianceAlarm",
+                            "emergencyAlarm",
+                            "screaming",
                             "dogBarking",
+                            "dogGrowling",
+                            "dogHowling",
                             "catMeowing",
+                            "catPurring",
                             "doorKnocking",
+                            "doorbell",
+                            "faucetRunning",
+                            "hairDrying",
+                            "kettleBoiling",
                             "siren",
                             "fingerSnapping",
+                            "clapping",
+                            "coughing",
+                            "speech",
                             "snoring"
                         ]
                     }
@@ -97,11 +123,13 @@
     "commands": {
         "disableSoundDetection": {
             "name": "disableSoundDetection",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "enableSoundDetection": {
             "name": "enableSoundDetection",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/soundDetectionPresentation.json b/json/soundDetectionPresentation.json
index 8b9e0264..ca75f014 100755
--- a/json/soundDetectionPresentation.json
+++ b/json/soundDetectionPresentation.json
@@ -6,52 +6,117 @@
                 "alternatives": [
                     {
                         "key": "noSound",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.noSound.label}}",
+                        "value": "No sound",
                         "type": "inactive"
                     },
                     {
                         "key": "babyCrying",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.babyCrying.label}}",
+                        "value": "Baby crying",
                         "type": "active"
                     },
                     {
                         "key": "glassBreaking",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.glassBreaking.label}}",
+                        "value": "Glass breaking",
                         "type": "active"
                     },
                     {
                         "key": "fireAlarm",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.fireAlarm.label}}",
+                        "value": "Fire alarm",
+                        "type": "active"
+                    },
+                    {
+                        "key": "applianceAlarm",
+                        "value": "Appliance alarm",
+                        "type": "active"
+                    },
+                    {
+                        "key": "emergencyAlarm",
+                        "value": "Emergency alarm",
+                        "type": "active"
+                    },
+                    {
+                        "key": "screaming",
+                        "value": "Screaming",
                         "type": "active"
                     },
                     {
                         "key": "dogBarking",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.dogBarking.label}}",
+                        "value": "Dog barking",
+                        "type": "active"
+                    },
+                    {
+                        "key": "dogGrowling",
+                        "value": "Dog growling",
+                        "type": "active"
+                    },
+                    {
+                        "key": "dogHowling",
+                        "value": "Dog howling",
                         "type": "active"
                     },
                     {
                         "key": "catMeowing",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.catMeowing.label}}",
+                        "value": "Cat meowing",
+                        "type": "active"
+                    },
+                    {
+                        "key": "catPurring",
+                        "value": "Cat purring",
                         "type": "active"
                     },
                     {
                         "key": "doorKnocking",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.doorKnocking.label}}",
+                        "value": "Knocking",
+                        "type": "active"
+                    },
+                    {
+                        "key": "doorbell",
+                        "value": "Doorbell",
+                        "type": "active"
+                    },
+                    {
+                        "key": "faucetRunning",
+                        "value": "Faucet running",
+                        "type": "active"
+                    },
+                    {
+                        "key": "hairDrying",
+                        "value": "Hair drying",
+                        "type": "active"
+                    },
+                    {
+                        "key": "kettleBoiling",
+                        "value": "Kettle boiling",
                         "type": "active"
                     },
                     {
                         "key": "siren",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.siren.label}}",
+                        "value": "Siren",
                         "type": "active"
                     },
                     {
                         "key": "fingerSnapping",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.fingerSnapping.label}}",
+                        "value": "Finger snapping",
+                        "type": "active"
+                    },
+                    {
+                        "key": "clapping",
+                        "value": "Clapping",
+                        "type": "active"
+                    },
+                    {
+                        "key": "coughing",
+                        "value": "Coughing",
+                        "type": "active"
+                    },
+                    {
+                        "key": "speech",
+                        "value": "Speech",
                         "type": "active"
                     },
                     {
                         "key": "snoring",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.snoring.label}}",
+                        "value": "Snoring",
                         "type": "active"
                     }
                 ]
@@ -62,66 +127,131 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Sound detection",
             "displayType": "state",
             "state": {
                 "label": "{{soundDetected.value}}",
                 "alternatives": [
                     {
                         "key": "noSound",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.noSound.label}}",
+                        "value": "No sound",
                         "type": "inactive"
                     },
                     {
                         "key": "babyCrying",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.babyCrying.label}}",
+                        "value": "Baby crying",
                         "type": "active"
                     },
                     {
                         "key": "glassBreaking",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.glassBreaking.label}}",
+                        "value": "Glass breaking",
                         "type": "active"
                     },
                     {
                         "key": "fireAlarm",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.fireAlarm.label}}",
+                        "value": "Fire alarm",
+                        "type": "active"
+                    },
+                    {
+                        "key": "applianceAlarm",
+                        "value": "Appliance alarm",
+                        "type": "active"
+                    },
+                    {
+                        "key": "emergencyAlarm",
+                        "value": "Emergency alarm",
+                        "type": "active"
+                    },
+                    {
+                        "key": "screaming",
+                        "value": "Screaming",
                         "type": "active"
                     },
                     {
                         "key": "dogBarking",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.dogBarking.label}}",
+                        "value": "Dog barking",
+                        "type": "active"
+                    },
+                    {
+                        "key": "dogGrowling",
+                        "value": "Dog growling",
+                        "type": "active"
+                    },
+                    {
+                        "key": "dogHowling",
+                        "value": "Dog howling",
                         "type": "active"
                     },
                     {
                         "key": "catMeowing",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.catMeowing.label}}",
+                        "value": "Cat meowing",
+                        "type": "active"
+                    },
+                    {
+                        "key": "catPurring",
+                        "value": "Cat purring",
                         "type": "active"
                     },
                     {
                         "key": "doorKnocking",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.doorKnocking.label}}",
+                        "value": "Knocking",
+                        "type": "active"
+                    },
+                    {
+                        "key": "doorbell",
+                        "value": "Doorbell",
+                        "type": "active"
+                    },
+                    {
+                        "key": "faucetRunning",
+                        "value": "Faucet running",
+                        "type": "active"
+                    },
+                    {
+                        "key": "hairDrying",
+                        "value": "Hair drying",
+                        "type": "active"
+                    },
+                    {
+                        "key": "kettleBoiling",
+                        "value": "Kettle boiling",
                         "type": "active"
                     },
                     {
                         "key": "siren",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.siren.label}}",
+                        "value": "Siren",
                         "type": "active"
                     },
                     {
                         "key": "fingerSnapping",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.fingerSnapping.label}}",
+                        "value": "Finger snapping",
+                        "type": "active"
+                    },
+                    {
+                        "key": "clapping",
+                        "value": "Clapping",
+                        "type": "active"
+                    },
+                    {
+                        "key": "coughing",
+                        "value": "Coughing",
+                        "type": "active"
+                    },
+                    {
+                        "key": "speech",
+                        "value": "Speech",
                         "type": "active"
                     },
                     {
                         "key": "snoring",
-                        "value": "{{i18n.attributes.soundDetected.i18n.value.snoring.label}}",
+                        "value": "Snoring",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Sound detection",
             "displayType": "switch",
             "switch": {
                 "command": {
@@ -137,12 +267,12 @@
                     "alternatives": [
                         {
                             "key": "enabled",
-                            "value": "{{i18n.attributes.soundDetectionState.i18n.value.enabled.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "disabled",
-                            "value": "{{i18n.attributes.soundDetectionState.i18n.value.disabled.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
@@ -153,58 +283,123 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Sound detection",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "noSound",
-                            "value": "{{i18n.attributes.soundDetected.i18n.value.noSound.label}}",
+                            "value": "No sound",
                             "type": "inactive"
                         },
                         {
                             "key": "babyCrying",
-                            "value": "{{i18n.attributes.soundDetected.i18n.value.babyCrying.label}}",
+                            "value": "Baby crying",
                             "type": "active"
                         },
                         {
                             "key": "glassBreaking",
-                            "value": "{{i18n.attributes.soundDetected.i18n.value.glassBreaking.label}}",
+                            "value": "Glass breaking",
                             "type": "active"
                         },
                         {
                             "key": "fireAlarm",
-                            "value": "{{i18n.attributes.soundDetected.i18n.value.fireAlarm.label}}",
+                            "value": "Fire alarm",
+                            "type": "active"
+                        },
+                        {
+                            "key": "applianceAlarm",
+                            "value": "Appliance alarm",
+                            "type": "active"
+                        },
+                        {
+                            "key": "emergencyAlarm",
+                            "value": "Emergency alarm",
+                            "type": "active"
+                        },
+                        {
+                            "key": "screaming",
+                            "value": "Screaming",
                             "type": "active"
                         },
                         {
                             "key": "dogBarking",
-                            "value": "{{i18n.attributes.soundDetected.i18n.value.dogBarking.label}}",
+                            "value": "Dog barking",
+                            "type": "active"
+                        },
+                        {
+                            "key": "dogGrowling",
+                            "value": "Dog growling",
+                            "type": "active"
+                        },
+                        {
+                            "key": "dogHowling",
+                            "value": "Dog howling",
                             "type": "active"
                         },
                         {
                             "key": "catMeowing",
-                            "value": "{{i18n.attributes.soundDetected.i18n.value.catMeowing.label}}",
+                            "value": "Cat meowing",
+                            "type": "active"
+                        },
+                        {
+                            "key": "catPurring",
+                            "value": "Cat purring",
                             "type": "active"
                         },
                         {
                             "key": "doorKnocking",
-                            "value": "{{i18n.attributes.soundDetected.i18n.value.doorKnocking.label}}",
+                            "value": "Knocking",
+                            "type": "active"
+                        },
+                        {
+                            "key": "doorbell",
+                            "value": "Doorbell",
+                            "type": "active"
+                        },
+                        {
+                            "key": "faucetRunning",
+                            "value": "Faucet running",
+                            "type": "active"
+                        },
+                        {
+                            "key": "hairDrying",
+                            "value": "Hair drying",
+                            "type": "active"
+                        },
+                        {
+                            "key": "kettleBoiling",
+                            "value": "Kettle boiling",
                             "type": "active"
                         },
                         {
                             "key": "siren",
-                            "value": "{{i18n.attributes.soundDetected.i18n.value.siren.label}}",
+                            "value": "Siren",
                             "type": "active"
                         },
                         {
                             "key": "fingerSnapping",
-                            "value": "{{i18n.attributes.soundDetected.i18n.value.fingerSnapping.label}}",
+                            "value": "Finger snapping",
+                            "type": "active"
+                        },
+                        {
+                            "key": "clapping",
+                            "value": "Clapping",
+                            "type": "active"
+                        },
+                        {
+                            "key": "coughing",
+                            "value": "Coughing",
+                            "type": "active"
+                        },
+                        {
+                            "key": "speech",
+                            "value": "Speech",
                             "type": "active"
                         },
                         {
                             "key": "snoring",
-                            "value": "{{i18n.attributes.soundDetected.i18n.value.snoring.label}}",
+                            "value": "Snoring",
                             "type": "active"
                         }
                     ],
@@ -217,18 +412,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Sound detection",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "enableSoundDetection",
-                            "value": "{{i18n.commands.enableSoundDetection.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "disableSoundDetection",
-                            "value": "{{i18n.commands.disableSoundDetection.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
diff --git a/json/soundPressureLevelPresentation.json b/json/soundPressureLevelPresentation.json
index 657b7279..321125ad 100755
--- a/json/soundPressureLevelPresentation.json
+++ b/json/soundPressureLevelPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Noise level",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Noise level",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "soundPressureLevel.value",
diff --git a/json/soundSensorPresentation.json b/json/soundSensorPresentation.json
index 2b6fc10b..1fc34c95 100755
--- a/json/soundSensorPresentation.json
+++ b/json/soundSensorPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.sound.i18n.value.detected.label}}",
+                        "value": "Sound detected",
                         "type": "active"
                     },
                     {
                         "key": "not detected",
-                        "value": "{{i18n.attributes.sound.i18n.value.not detected.label}}",
+                        "value": "No sound",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Sound sensor",
             "displayType": "state",
             "state": {
                 "label": "{{sound.value}}",
                 "alternatives": [
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.sound.i18n.value.detected.label}}",
+                        "value": "Sound detected",
                         "type": "active"
                     },
                     {
                         "key": "not detected",
-                        "value": "{{i18n.attributes.sound.i18n.value.not detected.label}}",
+                        "value": "No sound",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Sound sensor",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "detected",
-                            "value": "{{i18n.attributes.sound.i18n.value.detected.label}}",
+                            "value": "Sound detected",
                             "type": "active"
                         },
                         {
                             "key": "not detected",
-                            "value": "{{i18n.attributes.sound.i18n.value.not detected.label}}",
+                            "value": "No sound",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/sounds.i18n.en.json b/json/sounds.i18n.en.json
new file mode 100644
index 00000000..56909790
--- /dev/null
+++ b/json/sounds.i18n.en.json
@@ -0,0 +1,26 @@
+{
+    "tag": "en",
+    "label": "Sounds",
+    "attributes": {
+        "selectedSound": {
+            "label": "selectedSound",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "supportedSounds": {
+            "label": "supportedSounds",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "playSound": {
+            "label": "playSound",
+            "arguments": {}
+        },
+        "setSelectedSound": {
+            "label": "setSelectedSound",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/sounds.i18n.fr.json b/json/sounds.i18n.fr.json
new file mode 100644
index 00000000..56909790
--- /dev/null
+++ b/json/sounds.i18n.fr.json
@@ -0,0 +1,26 @@
+{
+    "tag": "en",
+    "label": "Sounds",
+    "attributes": {
+        "selectedSound": {
+            "label": "selectedSound",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "supportedSounds": {
+            "label": "supportedSounds",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "playSound": {
+            "label": "playSound",
+            "arguments": {}
+        },
+        "setSelectedSound": {
+            "label": "setSelectedSound",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/sounds.json b/json/sounds.json
new file mode 100644
index 00000000..6e5cf289
--- /dev/null
+++ b/json/sounds.json
@@ -0,0 +1,70 @@
+{
+    "id": "sounds",
+    "version": 1,
+    "status": "proposed",
+    "name": "Sounds",
+    "ephemeral": false,
+    "attributes": {
+        "selectedSound": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setSelectedSound",
+            "enumCommands": []
+        },
+        "supportedSounds": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "label": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "playSound": {
+            "name": "playSound",
+            "arguments": [],
+            "sensitive": false
+        },
+        "setSelectedSound": {
+            "name": "setSelectedSound",
+            "arguments": [
+                {
+                    "name": "id",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer"
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/speechSynthesis.json b/json/speechSynthesis.json
index a2735e90..1caf5749 100755
--- a/json/speechSynthesis.json
+++ b/json/speechSynthesis.json
@@ -17,7 +17,8 @@
                         "maxLength": 1000
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessAirCleanerModeButton.json b/json/statelessAirCleanerModeButton.json
index ee87ca4a..437dc594 100755
--- a/json/statelessAirCleanerModeButton.json
+++ b/json/statelessAirCleanerModeButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessAirCleanerModeButton",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Air Cleaner Mode Button",
     "ephemeral": false,
     "attributes": {
@@ -39,7 +39,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessAudioMuteButton.json b/json/statelessAudioMuteButton.json
index a8fb73e3..08bb2df5 100755
--- a/json/statelessAudioMuteButton.json
+++ b/json/statelessAudioMuteButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessAudioMuteButton",
     "version": 1,
-    "status": "live",
+    "status": "deprecated",
     "name": "Stateless Audio Mute Button",
     "ephemeral": false,
     "attributes": {
@@ -39,7 +39,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessAudioMuteButtonPresentation.json b/json/statelessAudioMuteButtonPresentation.json
index 68ce608b..8c34a5f8 100755
--- a/json/statelessAudioMuteButtonPresentation.json
+++ b/json/statelessAudioMuteButtonPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Mute",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "setButton",
@@ -13,13 +13,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mute",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "muteToggle",
-                            "value": "{{i18n.label}}",
+                            "value": "Mute",
                             "type": "active"
                         }
                     ],
diff --git a/json/statelessAudioVolumeButton.json b/json/statelessAudioVolumeButton.json
index 37c5fe2f..1d136147 100755
--- a/json/statelessAudioVolumeButton.json
+++ b/json/statelessAudioVolumeButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessAudioVolumeButton",
     "version": 1,
-    "status": "live",
+    "status": "deprecated",
     "name": "Stateless Audio Volume Button",
     "ephemeral": false,
     "attributes": {
@@ -41,7 +41,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessAudioVolumeButtonPresentation.json b/json/statelessAudioVolumeButtonPresentation.json
index a161dd51..bf5b41aa 100755
--- a/json/statelessAudioVolumeButtonPresentation.json
+++ b/json/statelessAudioVolumeButtonPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Volume",
             "displayType": "list",
             "list": {
                 "command": {
@@ -28,7 +28,7 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Volume",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
diff --git a/json/statelessChannelButton.json b/json/statelessChannelButton.json
index 628278e6..a203b5f5 100755
--- a/json/statelessChannelButton.json
+++ b/json/statelessChannelButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessChannelButton",
     "version": 1,
-    "status": "live",
+    "status": "deprecated",
     "name": "Stateless Channel Button",
     "ephemeral": false,
     "attributes": {
@@ -41,7 +41,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessColorTemperatureStep.i18n.en.json b/json/statelessColorTemperatureStep.i18n.en.json
new file mode 100644
index 00000000..1a891847
--- /dev/null
+++ b/json/statelessColorTemperatureStep.i18n.en.json
@@ -0,0 +1,11 @@
+{
+    "tag": "en",
+    "label": "Stateless Color Temperature Step",
+    "attributes": {},
+    "commands": {
+        "stepColorTemperatureByPercent": {
+            "label": "stepColorTemperatureByPercent",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/statelessColorTemperatureStep.i18n.fr.json b/json/statelessColorTemperatureStep.i18n.fr.json
new file mode 100644
index 00000000..1a891847
--- /dev/null
+++ b/json/statelessColorTemperatureStep.i18n.fr.json
@@ -0,0 +1,11 @@
+{
+    "tag": "en",
+    "label": "Stateless Color Temperature Step",
+    "attributes": {},
+    "commands": {
+        "stepColorTemperatureByPercent": {
+            "label": "stepColorTemperatureByPercent",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/statelessColorTemperatureStep.json b/json/statelessColorTemperatureStep.json
new file mode 100644
index 00000000..3490e7d1
--- /dev/null
+++ b/json/statelessColorTemperatureStep.json
@@ -0,0 +1,25 @@
+{
+    "id": "statelessColorTemperatureStep",
+    "version": 1,
+    "status": "proposed",
+    "name": "Stateless Color Temperature Step",
+    "ephemeral": false,
+    "attributes": {},
+    "commands": {
+        "stepColorTemperatureByPercent": {
+            "name": "stepColorTemperatureByPercent",
+            "arguments": [
+                {
+                    "name": "stepSize",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": -100,
+                        "maximum": 100
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/statelessColorTemperatureStepPresentation.json b/json/statelessColorTemperatureStepPresentation.json
new file mode 100644
index 00000000..25236747
--- /dev/null
+++ b/json/statelessColorTemperatureStepPresentation.json
@@ -0,0 +1,21 @@
+{
+    "automation": {
+        "conditions": [],
+        "actions": [
+            {
+                "label": "stepColorTemperatureByPercent",
+                "displayType": "numberField",
+                "numberField": {
+                    "command": "stepColorTemperatureByPercent",
+                    "argumentType": "integer",
+                    "range": [
+                        -50,
+                        50
+                    ]
+                }
+            }
+        ]
+    },
+    "id": "statelessColorTemperatureStep",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/statelessCurtainPowerButton.json b/json/statelessCurtainPowerButton.json
index e193939a..5209842f 100755
--- a/json/statelessCurtainPowerButton.json
+++ b/json/statelessCurtainPowerButton.json
@@ -43,7 +43,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessCurtainPowerButtonPresentation.json b/json/statelessCurtainPowerButtonPresentation.json
index 9cfe07c4..3946e5f9 100755
--- a/json/statelessCurtainPowerButtonPresentation.json
+++ b/json/statelessCurtainPowerButtonPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Curtain",
             "displayType": "list",
             "list": {
                 "command": {
@@ -9,17 +9,17 @@
                     "alternatives": [
                         {
                             "key": "open",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "close",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.close.label}}",
+                            "value": "Close",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         }
                     ],
@@ -33,23 +33,23 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Curtain",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "open",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "close",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.close.label}}",
+                            "value": "Close",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         }
                     ],
diff --git a/json/statelessCustomButton.json b/json/statelessCustomButton.json
index 1adb3031..51d439fd 100755
--- a/json/statelessCustomButton.json
+++ b/json/statelessCustomButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessCustomButton",
     "version": 1,
-    "status": "live",
+    "status": "deprecated",
     "name": "Stateless Custom Button",
     "ephemeral": false,
     "attributes": {
@@ -33,7 +33,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessFanspeedButton.json b/json/statelessFanspeedButton.json
index bef3dfe6..5daf47f4 100755
--- a/json/statelessFanspeedButton.json
+++ b/json/statelessFanspeedButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessFanspeedButton",
     "version": 1,
-    "status": "live",
+    "status": "deprecated",
     "name": "Stateless Fanspeed Button",
     "ephemeral": false,
     "attributes": {
@@ -41,7 +41,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessFanspeedModeButton.json b/json/statelessFanspeedModeButton.json
index 7edf2361..754337f1 100755
--- a/json/statelessFanspeedModeButton.json
+++ b/json/statelessFanspeedModeButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessFanspeedModeButton",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Fanspeed Mode Button",
     "ephemeral": false,
     "attributes": {
@@ -39,7 +39,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessHumidifierModeButton.json b/json/statelessHumidifierModeButton.json
index 754bee5b..6206b4c3 100755
--- a/json/statelessHumidifierModeButton.json
+++ b/json/statelessHumidifierModeButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessHumidifierModeButton",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Humidifier Mode Button",
     "ephemeral": false,
     "attributes": {
@@ -39,7 +39,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessMediaPlaybackButton.json b/json/statelessMediaPlaybackButton.json
index 3ee947fd..704cdbda 100755
--- a/json/statelessMediaPlaybackButton.json
+++ b/json/statelessMediaPlaybackButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessMediaPlaybackButton",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Media Playback Button",
     "ephemeral": false,
     "attributes": {
@@ -49,7 +49,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessMediaPlaybackButtonPresentation.json b/json/statelessMediaPlaybackButtonPresentation.json
index 56a24a44..7aaa558b 100755
--- a/json/statelessMediaPlaybackButtonPresentation.json
+++ b/json/statelessMediaPlaybackButtonPresentation.json
@@ -9,27 +9,27 @@
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         },
                         {
                             "key": "play",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.play.label}}",
+                            "value": "Play",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.stop.label}}",
+                            "value": "Stop",
                             "type": "active"
                         },
                         {
                             "key": "fastForward",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.fastForward.label}}",
+                            "value": "Fast forward",
                             "type": "active"
                         },
                         {
                             "key": "rewind",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.rewind.label}}",
+                            "value": "Rewind",
                             "type": "active"
                         }
                     ],
@@ -49,27 +49,27 @@
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         },
                         {
                             "key": "play",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.play.label}}",
+                            "value": "Play",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.stop.label}}",
+                            "value": "Stop",
                             "type": "active"
                         },
                         {
                             "key": "fastForward",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.fastForward.label}}",
+                            "value": "Fast forward",
                             "type": "active"
                         },
                         {
                             "key": "rewind",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.rewind.label}}",
+                            "value": "Rewind",
                             "type": "active"
                         }
                     ],
diff --git a/json/statelessPowerButton.json b/json/statelessPowerButton.json
index 808cf588..ca9f04e0 100755
--- a/json/statelessPowerButton.json
+++ b/json/statelessPowerButton.json
@@ -41,7 +41,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessPowerButtonPresentation.json b/json/statelessPowerButtonPresentation.json
index 11bcbf8e..c68536e1 100755
--- a/json/statelessPowerButtonPresentation.json
+++ b/json/statelessPowerButtonPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Power",
             "displayType": "list",
             "list": {
                 "command": {
@@ -9,12 +9,12 @@
                     "alternatives": [
                         {
                             "key": "powerOn",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.powerOn.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "powerOff",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.powerOff.label}}",
+                            "value": "Off",
                             "type": "active"
                         }
                     ],
@@ -28,18 +28,18 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Power",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "powerOn",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.powerOn.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "powerOff",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.powerOff.label}}",
+                            "value": "Off",
                             "type": "active"
                         }
                     ],
diff --git a/json/statelessPowerToggleButton.json b/json/statelessPowerToggleButton.json
index a6a3008e..cb83bdfc 100755
--- a/json/statelessPowerToggleButton.json
+++ b/json/statelessPowerToggleButton.json
@@ -39,7 +39,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessPowerToggleButtonPresentation.json b/json/statelessPowerToggleButtonPresentation.json
index 7d9ebcb4..95ef333c 100755
--- a/json/statelessPowerToggleButtonPresentation.json
+++ b/json/statelessPowerToggleButtonPresentation.json
@@ -15,7 +15,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Switch power state",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "setButton",
@@ -28,13 +28,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.commands.setButton.arguments.button.i18n.powerToggle.label}}",
+                "label": "Switch power state",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "powerToggle",
-                            "value": "{{i18n.commands.setButton.arguments.button.i18n.powerToggle.label}}",
+                            "value": "Switch power state",
                             "type": "active"
                         }
                     ],
diff --git a/json/statelessRobotCleanerActionButton.json b/json/statelessRobotCleanerActionButton.json
index d17ad511..4954d715 100755
--- a/json/statelessRobotCleanerActionButton.json
+++ b/json/statelessRobotCleanerActionButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessRobotCleanerActionButton",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Robot Cleaner Action Button",
     "ephemeral": false,
     "attributes": {
@@ -43,7 +43,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessRobotCleanerHomeButton.json b/json/statelessRobotCleanerHomeButton.json
index aa7db3ab..d096d4b9 100755
--- a/json/statelessRobotCleanerHomeButton.json
+++ b/json/statelessRobotCleanerHomeButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessRobotCleanerHomeButton",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Robot Cleaner Home Button",
     "ephemeral": false,
     "attributes": {
@@ -39,7 +39,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessRobotCleanerToggleButton.json b/json/statelessRobotCleanerToggleButton.json
index e7c24d2e..4dd36d6a 100755
--- a/json/statelessRobotCleanerToggleButton.json
+++ b/json/statelessRobotCleanerToggleButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessRobotCleanerToggleButton",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Robot Cleaner Toggle Button",
     "ephemeral": false,
     "attributes": {
@@ -39,7 +39,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessScenes.json b/json/statelessScenes.json
index 0700915a..6815d287 100755
--- a/json/statelessScenes.json
+++ b/json/statelessScenes.json
@@ -35,7 +35,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessSetChannelButton.json b/json/statelessSetChannelButton.json
index 9c16afcb..b76cdbdf 100755
--- a/json/statelessSetChannelButton.json
+++ b/json/statelessSetChannelButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessSetChannelButton",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Set Channel Button",
     "ephemeral": false,
     "attributes": {},
@@ -16,7 +16,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessSetChannelByContentButton.json b/json/statelessSetChannelByContentButton.json
index 4bc58968..dc155c22 100755
--- a/json/statelessSetChannelByContentButton.json
+++ b/json/statelessSetChannelByContentButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessSetChannelByContentButton",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Set Channel By Content Button",
     "ephemeral": false,
     "attributes": {},
@@ -16,7 +16,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessSetChannelByNameButton.json b/json/statelessSetChannelByNameButton.json
index 9866600f..55a7d806 100755
--- a/json/statelessSetChannelByNameButton.json
+++ b/json/statelessSetChannelByNameButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessSetChannelByNameButton",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Set Channel By Name Button",
     "ephemeral": false,
     "attributes": {},
@@ -16,7 +16,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessSwitchLevelStep.i18n.en.json b/json/statelessSwitchLevelStep.i18n.en.json
new file mode 100644
index 00000000..020fd4e8
--- /dev/null
+++ b/json/statelessSwitchLevelStep.i18n.en.json
@@ -0,0 +1,11 @@
+{
+    "tag": "en",
+    "label": "Stateless Switch Level Step",
+    "attributes": {},
+    "commands": {
+        "stepLevel": {
+            "label": "stepLevel",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/statelessSwitchLevelStep.i18n.fr.json b/json/statelessSwitchLevelStep.i18n.fr.json
new file mode 100644
index 00000000..020fd4e8
--- /dev/null
+++ b/json/statelessSwitchLevelStep.i18n.fr.json
@@ -0,0 +1,11 @@
+{
+    "tag": "en",
+    "label": "Stateless Switch Level Step",
+    "attributes": {},
+    "commands": {
+        "stepLevel": {
+            "label": "stepLevel",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/statelessSwitchLevelStep.json b/json/statelessSwitchLevelStep.json
new file mode 100644
index 00000000..163e7f24
--- /dev/null
+++ b/json/statelessSwitchLevelStep.json
@@ -0,0 +1,25 @@
+{
+    "id": "statelessSwitchLevelStep",
+    "version": 1,
+    "status": "proposed",
+    "name": "Stateless Switch Level Step",
+    "ephemeral": false,
+    "attributes": {},
+    "commands": {
+        "stepLevel": {
+            "name": "stepLevel",
+            "arguments": [
+                {
+                    "name": "stepSize",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": -100,
+                        "maximum": 100
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/statelessSwitchLevelStepPresentation.json b/json/statelessSwitchLevelStepPresentation.json
new file mode 100644
index 00000000..dd7c22d6
--- /dev/null
+++ b/json/statelessSwitchLevelStepPresentation.json
@@ -0,0 +1,21 @@
+{
+    "automation": {
+        "conditions": [],
+        "actions": [
+            {
+                "label": "stepLevel",
+                "displayType": "numberField",
+                "numberField": {
+                    "command": "stepLevel",
+                    "argumentType": "integer",
+                    "range": [
+                        -50,
+                        50
+                    ]
+                }
+            }
+        ]
+    },
+    "id": "statelessSwitchLevelStep",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/statelessTemperatureButton.json b/json/statelessTemperatureButton.json
index 50f62ef4..d65af051 100755
--- a/json/statelessTemperatureButton.json
+++ b/json/statelessTemperatureButton.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessTemperatureButton",
     "version": 1,
-    "status": "live",
+    "status": "deprecated",
     "name": "Stateless Temperature Button",
     "ephemeral": false,
     "attributes": {
@@ -41,7 +41,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/statelessVolumeButtonWithRepetition.json b/json/statelessVolumeButtonWithRepetition.json
index ee66f4bf..dfe00dfc 100755
--- a/json/statelessVolumeButtonWithRepetition.json
+++ b/json/statelessVolumeButtonWithRepetition.json
@@ -1,7 +1,7 @@
 {
     "id": "statelessVolumeButtonWithRepetition",
     "version": 1,
-    "status": "proposed",
+    "status": "deprecated",
     "name": "Stateless Volume Button With Repetition",
     "ephemeral": false,
     "attributes": {},
@@ -18,7 +18,8 @@
                         "maximum": 10
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "volumeUp": {
             "name": "volumeUp",
@@ -32,7 +33,8 @@
                         "maximum": 10
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/switch.json b/json/switch.json
index 2364d696..1e27a177 100755
--- a/json/switch.json
+++ b/json/switch.json
@@ -38,11 +38,13 @@
     "commands": {
         "off": {
             "name": "off",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "on": {
             "name": "on",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/switchLevel.json b/json/switchLevel.json
index 4a916c45..8db8e036 100755
--- a/json/switchLevel.json
+++ b/json/switchLevel.json
@@ -96,7 +96,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/switchLevelPresentation.json b/json/switchLevelPresentation.json
index 5d7c095f..c8a7f9c0 100755
--- a/json/switchLevelPresentation.json
+++ b/json/switchLevelPresentation.json
@@ -8,7 +8,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Dimmer",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -30,7 +30,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Dimmer",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -49,7 +49,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Dimmer",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -65,7 +65,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Dimmer",
                 "displayType": "slider",
                 "slider": {
                     "range": [
diff --git a/json/switchPresentation.json b/json/switchPresentation.json
index 0f89b85c..ab24d76d 100755
--- a/json/switchPresentation.json
+++ b/json/switchPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.switch.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.switch.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -37,7 +37,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Power",
             "displayType": "standbyPowerSwitch",
             "standbyPowerSwitch": {
                 "command": {
@@ -52,12 +52,12 @@
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.switch.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.switch.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
@@ -68,18 +68,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Power",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.switch.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.switch.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -91,18 +91,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Power",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.on.label}}",
+                            "value": "Turn on",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.off.label}}",
+                            "value": "Turn off",
                             "type": "inactive"
                         }
                     ]
diff --git a/json/switchStatePresentation.json b/json/switchStatePresentation.json
index 7975d986..d38ffe5d 100644
--- a/json/switchStatePresentation.json
+++ b/json/switchStatePresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.switchState.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.switchState.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Power",
             "displayType": "state",
             "state": {
                 "label": "{{switchState.value}}",
                 "alternatives": [
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.switchState.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.switchState.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Power",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.switchState.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.switchState.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/tV.json b/json/tV.json
index 132aae4c..46489e91 100755
--- a/json/tV.json
+++ b/json/tV.json
@@ -99,19 +99,23 @@
     "commands": {
         "volumeDown": {
             "name": "volumeDown",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "volumeUp": {
             "name": "volumeUp",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "channelDown": {
             "name": "channelDown",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "channelUp": {
             "name": "channelUp",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/tag.e2eEncryption.json b/json/tag.e2eEncryption.json
index 4854e758..e6e58afb 100755
--- a/json/tag.e2eEncryption.json
+++ b/json/tag.e2eEncryption.json
@@ -37,11 +37,13 @@
     "commands": {
         "off": {
             "name": "off",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "on": {
             "name": "on",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/tag.factoryReset.json b/json/tag.factoryReset.json
index be150256..73a0957a 100755
--- a/json/tag.factoryReset.json
+++ b/json/tag.factoryReset.json
@@ -8,7 +8,8 @@
     "commands": {
         "reset": {
             "name": "reset",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/tag.tagButton.json b/json/tag.tagButton.json
index 1e9725c9..d0745023 100755
--- a/json/tag.tagButton.json
+++ b/json/tag.tagButton.json
@@ -43,7 +43,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setButtonTriplePush": {
             "name": "setButtonTriplePush",
@@ -60,7 +61,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setButtonPush": {
             "name": "setButtonPush",
@@ -77,7 +79,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setButtonHold": {
             "name": "setButtonHold",
@@ -94,7 +97,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/tag.tagStatusPresentation.json b/json/tag.tagStatusPresentation.json
index dc07c099..d556f4df 100755
--- a/json/tag.tagStatusPresentation.json
+++ b/json/tag.tagStatusPresentation.json
@@ -6,27 +6,27 @@
                 "alternatives": [
                     {
                         "key": "connected",
-                        "value": "{{i18n.attributes.tagStatus.i18n.value.connected.label}}",
+                        "value": "Nearby",
                         "type": "active"
                     },
                     {
                         "key": "disconnected",
-                        "value": "{{i18n.attributes.tagStatus.i18n.value.disconnected.label}}",
+                        "value": "Not near you",
                         "type": "inactive"
                     },
                     {
                         "key": "d2dConnected",
-                        "value": "{{i18n.attributes.tagStatus.i18n.value.d2dConnected.label}}",
+                        "value": "Connected",
                         "type": "active"
                     },
                     {
                         "key": "d2dScanned",
-                        "value": "{{i18n.attributes.tagStatus.i18n.value.d2dScanned.label}}",
+                        "value": "Nearby",
                         "type": "active"
                     },
                     {
                         "key": "d2dDisconnected",
-                        "value": "{{i18n.attributes.tagStatus.i18n.value.d2dDisconnected.label}}",
+                        "value": "Not near you",
                         "type": "inactive"
                     }
                 ]
diff --git a/json/tag.updatedInfo.json b/json/tag.updatedInfo.json
index 467e940a..6d7a9956 100755
--- a/json/tag.updatedInfo.json
+++ b/json/tag.updatedInfo.json
@@ -27,7 +27,8 @@
     "commands": {
         "update": {
             "name": "update",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/tag.uwbActivation.json b/json/tag.uwbActivation.json
index 916e34d1..d54ecf22 100755
--- a/json/tag.uwbActivation.json
+++ b/json/tag.uwbActivation.json
@@ -37,11 +37,13 @@
     "commands": {
         "off": {
             "name": "off",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "on": {
             "name": "on",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/tamperAlertPresentation.json b/json/tamperAlertPresentation.json
index ecbfc341..634a30a6 100755
--- a/json/tamperAlertPresentation.json
+++ b/json/tamperAlertPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.tamper.i18n.value.detected.label}}",
+                        "value": "Tampered",
                         "type": "active"
                     },
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.tamper.i18n.value.clear.label}}",
+                        "value": "Not tampered",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Tamper alert",
             "displayType": "state",
             "state": {
                 "label": "{{tamper.value}}",
                 "alternatives": [
                     {
                         "key": "detected",
-                        "value": "{{i18n.attributes.tamper.i18n.value.detected.label}}",
+                        "value": "Tampered",
                         "type": "active"
                     },
                     {
                         "key": "clear",
-                        "value": "{{i18n.attributes.tamper.i18n.value.clear.label}}",
+                        "value": "Not tampered",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Tamper alert",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "detected",
-                            "value": "{{i18n.attributes.tamper.i18n.value.detected.label}}",
+                            "value": "Tampered",
                             "type": "active"
                         },
                         {
                             "key": "clear",
-                            "value": "{{i18n.attributes.tamper.i18n.value.clear.label}}",
+                            "value": "Not tampered",
                             "type": "active"
                         }
                     ],
diff --git a/json/temperatureAlarmPresentation.json b/json/temperatureAlarmPresentation.json
index 58676621..de7bf6d0 100755
--- a/json/temperatureAlarmPresentation.json
+++ b/json/temperatureAlarmPresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "cleared",
-                        "value": "{{i18n.attributes.temperatureAlarm.i18n.value.cleared.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "heat",
-                        "value": "{{i18n.attributes.temperatureAlarm.i18n.value.heat.label}}",
+                        "value": "Overheating",
                         "type": "active"
                     },
                     {
                         "key": "freeze",
-                        "value": "{{i18n.attributes.temperatureAlarm.i18n.value.freeze.label}}",
+                        "value": "Freezing",
                         "type": "active"
                     },
                     {
                         "key": "rateOfRise",
-                        "value": "{{i18n.attributes.temperatureAlarm.i18n.value.rateOfRise.label}}",
+                        "value": "Rapidly rising",
                         "type": "active"
                     }
                 ]
@@ -32,29 +32,29 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Temperature alert",
             "displayType": "state",
             "state": {
                 "label": "{{temperatureAlarm.value}}",
                 "alternatives": [
                     {
                         "key": "cleared",
-                        "value": "{{i18n.attributes.temperatureAlarm.i18n.value.cleared.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "heat",
-                        "value": "{{i18n.attributes.temperatureAlarm.i18n.value.heat.label}}",
+                        "value": "Overheating",
                         "type": "active"
                     },
                     {
                         "key": "freeze",
-                        "value": "{{i18n.attributes.temperatureAlarm.i18n.value.freeze.label}}",
+                        "value": "Freezing",
                         "type": "active"
                     },
                     {
                         "key": "rateOfRise",
-                        "value": "{{i18n.attributes.temperatureAlarm.i18n.value.rateOfRise.label}}",
+                        "value": "Rapidly rising",
                         "type": "active"
                     }
                 ]
@@ -64,28 +64,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Temperature alert",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "cleared",
-                            "value": "{{i18n.attributes.temperatureAlarm.i18n.value.cleared.label}}",
+                            "value": "Normal",
                             "type": "inactive"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.attributes.temperatureAlarm.i18n.value.heat.label}}",
+                            "value": "Overheating",
                             "type": "active"
                         },
                         {
                             "key": "freeze",
-                            "value": "{{i18n.attributes.temperatureAlarm.i18n.value.freeze.label}}",
+                            "value": "Freezing",
                             "type": "active"
                         },
                         {
                             "key": "rateOfRise",
-                            "value": "{{i18n.attributes.temperatureAlarm.i18n.value.rateOfRise.label}}",
+                            "value": "Rapidly rising",
                             "type": "active"
                         }
                     ],
diff --git a/json/temperatureLevel.json b/json/temperatureLevel.json
index 17741635..d8353d0c 100755
--- a/json/temperatureLevel.json
+++ b/json/temperatureLevel.json
@@ -49,7 +49,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/temperatureLevelPresentation.json b/json/temperatureLevelPresentation.json
index af4512ed..4824eb3c 100755
--- a/json/temperatureLevelPresentation.json
+++ b/json/temperatureLevelPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Temperature level",
             "displayType": "list",
             "list": {
                 "command": {
@@ -62,7 +62,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Temperature level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
@@ -91,7 +91,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Temperature level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
diff --git a/json/temperatureMeasurementPresentation.json b/json/temperatureMeasurementPresentation.json
index 06a56950..7c0696d0 100755
--- a/json/temperatureMeasurementPresentation.json
+++ b/json/temperatureMeasurementPresentation.json
@@ -27,7 +27,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -44,7 +44,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "temperature.value",
diff --git a/json/temperatureSetpoint.json b/json/temperatureSetpoint.json
index e86f1d99..89d12ad8 100755
--- a/json/temperatureSetpoint.json
+++ b/json/temperatureSetpoint.json
@@ -96,7 +96,8 @@
                         "maximum": 10000
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/temperatureSetpointPresentation.json b/json/temperatureSetpointPresentation.json
index 8cdc7095..286109ac 100755
--- a/json/temperatureSetpointPresentation.json
+++ b/json/temperatureSetpointPresentation.json
@@ -27,7 +27,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Set temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -46,7 +46,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Set temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "temperatureSetpoint.value",
@@ -62,7 +62,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Set temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setTemperatureSetpoint",
diff --git a/json/testCapability.json b/json/testCapability.json
index d4ab2f6a..1812179f 100755
--- a/json/testCapability.json
+++ b/json/testCapability.json
@@ -1,7 +1,7 @@
 {
     "id": "testCapability",
     "version": 1,
-    "status": "live",
+    "status": "deprecated",
     "name": "Test Capability",
     "ephemeral": false,
     "attributes": {},
diff --git a/json/thermostat.json b/json/thermostat.json
index 39720a41..59c1bc8e 100755
--- a/json/thermostat.json
+++ b/json/thermostat.json
@@ -517,7 +517,8 @@
     "commands": {
         "heat": {
             "name": "heat",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setSchedule": {
             "name": "setSchedule",
@@ -530,19 +531,23 @@
                         "type": "object"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "auto": {
             "name": "auto",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "cool": {
             "name": "cool",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "emergencyHeat": {
             "name": "emergencyHeat",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setThermostatFanMode": {
             "name": "setThermostatFanMode",
@@ -561,19 +566,23 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "fanAuto": {
             "name": "fanAuto",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "fanCirculate": {
             "name": "fanCirculate",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "off": {
             "name": "off",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setCoolingSetpoint": {
             "name": "setCoolingSetpoint",
@@ -588,7 +597,8 @@
                         "maximum": 10000
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setHeatingSetpoint": {
             "name": "setHeatingSetpoint",
@@ -603,7 +613,8 @@
                         "maximum": 10000
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "setThermostatMode": {
             "name": "setThermostatMode",
@@ -655,11 +666,13 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "fanOn": {
             "name": "fanOn",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/thermostatCoolingSetpoint.json b/json/thermostatCoolingSetpoint.json
index a2c7c140..7c548733 100755
--- a/json/thermostatCoolingSetpoint.json
+++ b/json/thermostatCoolingSetpoint.json
@@ -96,7 +96,8 @@
                         "maximum": 10000
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/thermostatCoolingSetpointPresentation.json b/json/thermostatCoolingSetpointPresentation.json
index 87896fd5..6b149ffb 100755
--- a/json/thermostatCoolingSetpointPresentation.json
+++ b/json/thermostatCoolingSetpointPresentation.json
@@ -25,7 +25,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Cooling temperature",
                 "displayType": "stepper",
                 "stepper": {
                     "command": {
@@ -40,6 +40,7 @@
                     "supportedValues": "coolingSetpointRange.value",
                     "state": {
                         "value": "coolingSetpoint.value",
+                        "unit": "coolingSetpoint.unit",
                         "valueType": "number",
                         "label": "{{coolingSetpoint.value}} {{coolingSetpoint.unit}}",
                         "alternatives": [
@@ -73,7 +74,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Cooling temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -92,7 +93,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Cooling temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "coolingSetpoint.value",
@@ -108,7 +109,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.commands.setCoolingSetpoint.label}}",
+                "label": "Cooling temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setCoolingSetpoint",
diff --git a/json/thermostatFanMode.json b/json/thermostatFanMode.json
index d34e7df6..b2d8704a 100755
--- a/json/thermostatFanMode.json
+++ b/json/thermostatFanMode.json
@@ -88,7 +88,8 @@
     "commands": {
         "fanOn": {
             "name": "fanOn",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setThermostatFanMode": {
             "name": "setThermostatFanMode",
@@ -107,15 +108,18 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "fanAuto": {
             "name": "fanAuto",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "fanCirculate": {
             "name": "fanCirculate",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/thermostatFanModePresentation.json b/json/thermostatFanModePresentation.json
index b322add9..351d4f6f 100755
--- a/json/thermostatFanModePresentation.json
+++ b/json/thermostatFanModePresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Thermostat fan mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -9,22 +9,22 @@
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.mode.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "circulate",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.mode.i18n.circulate.label}}",
+                            "value": "Circulate",
                             "type": "active"
                         },
                         {
                             "key": "followschedule",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.mode.i18n.followschedule.label}}",
+                            "value": "Schedule",
                             "type": "active"
                         }
                     ],
@@ -35,22 +35,22 @@
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "circulate",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.circulate.label}}",
+                            "value": "Circulate",
                             "type": "active"
                         },
                         {
                             "key": "followschedule",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.followschedule.label}}",
+                            "value": "Schedule",
                             "type": "active"
                         }
                     ]
@@ -61,28 +61,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Thermostat fan mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "circulate",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.circulate.label}}",
+                            "value": "Circulate",
                             "type": "active"
                         },
                         {
                             "key": "followschedule",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.followschedule.label}}",
+                            "value": "Schedule",
                             "type": "active"
                         }
                     ],
@@ -94,28 +94,28 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Thermostat fan mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.mode.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "circulate",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.mode.i18n.circulate.label}}",
+                            "value": "Circulate",
                             "type": "active"
                         },
                         {
                             "key": "followschedule",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.mode.i18n.followschedule.label}}",
+                            "value": "Schedule",
                             "type": "active"
                         }
                     ],
diff --git a/json/thermostatHeatingSetpoint.json b/json/thermostatHeatingSetpoint.json
index b387be30..eadc9bf9 100755
--- a/json/thermostatHeatingSetpoint.json
+++ b/json/thermostatHeatingSetpoint.json
@@ -96,7 +96,8 @@
                         "maximum": 10000
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/thermostatHeatingSetpointPresentation.json b/json/thermostatHeatingSetpointPresentation.json
index 9c468106..70630d35 100755
--- a/json/thermostatHeatingSetpointPresentation.json
+++ b/json/thermostatHeatingSetpointPresentation.json
@@ -27,7 +27,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Heating temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -46,7 +46,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Heating temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "heatingSetpoint.value",
@@ -62,7 +62,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.commands.setHeatingSetpoint.label}}",
+                "label": "Heating temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setHeatingSetpoint",
diff --git a/json/thermostatMode.i18n.en.json b/json/thermostatMode.i18n.en.json
index 61b031c1..4729d52f 100755
--- a/json/thermostatMode.i18n.en.json
+++ b/json/thermostatMode.i18n.en.json
@@ -127,7 +127,7 @@
                         "label": "Resume"
                     },
                     "emergency heat": {
-                        "label": "Emergency heat"
+                        "label": "Emergency Heat"
                     },
                     "cool": {
                         "label": "Cool"
diff --git a/json/thermostatMode.i18n.fr.json b/json/thermostatMode.i18n.fr.json
index 713e0dad..c52797a0 100755
--- a/json/thermostatMode.i18n.fr.json
+++ b/json/thermostatMode.i18n.fr.json
@@ -19,7 +19,7 @@
                         "label": "Éco"
                     },
                     "rush hour": {
-                        "label": "Heure de pointe"
+                        "label": "Rush Hour"
                     },
                     "rushhour": {
                         "label": "rushhour"
@@ -127,7 +127,7 @@
                         "label": "Reprendre"
                     },
                     "emergency heat": {
-                        "label": "Chauffage d'urgence"
+                        "label": "Emergency Heat"
                     },
                     "cool": {
                         "label": "Froid"
diff --git a/json/thermostatMode.json b/json/thermostatMode.json
index 4cb99c45..97a3df43 100755
--- a/json/thermostatMode.json
+++ b/json/thermostatMode.json
@@ -243,11 +243,13 @@
     "commands": {
         "heat": {
             "name": "heat",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "auto": {
             "name": "auto",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setThermostatMode": {
             "name": "setThermostatMode",
@@ -315,19 +317,23 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "cool": {
             "name": "cool",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "emergencyHeat": {
             "name": "emergencyHeat",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "off": {
             "name": "off",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/thermostatModePresentation.json b/json/thermostatModePresentation.json
index 5662a297..7a6489a9 100755
--- a/json/thermostatModePresentation.json
+++ b/json/thermostatModePresentation.json
@@ -6,252 +6,252 @@
                 "alternatives": [
                     {
                         "key": "antifreezing",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.antifreezing.label}}",
+                        "value": "Anti-freezing",
                         "type": "active"
                     },
                     {
                         "key": "asleep",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.asleep.label}}",
+                        "value": "Asleep",
                         "type": "active"
                     },
                     {
                         "key": "auto",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.auto.label}}",
+                        "value": "Auto",
                         "type": "active"
                     },
                     {
                         "key": "autowitheco",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.autowitheco.label}}",
+                        "value": "Auto with eco",
                         "type": "active"
                     },
                     {
                         "key": "autowithreset",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.autowithreset.label}}",
+                        "value": "Auto with reset",
                         "type": "active"
                     },
                     {
                         "key": "autochangeover",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.autochangeover.label}}",
+                        "value": "Auto changeover",
                         "type": "active"
                     },
                     {
                         "key": "autochangeoveractive",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.autochangeoveractive.label}}",
+                        "value": "Auto changeover active",
                         "type": "active"
                     },
                     {
                         "key": "autocool",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.autocool.label}}",
+                        "value": "Auto cool",
                         "type": "active"
                     },
                     {
                         "key": "autoheat",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.autoheat.label}}",
+                        "value": "Auto heat",
                         "type": "active"
                     },
                     {
                         "key": "auxheatonly",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.auxheatonly.label}}",
+                        "value": "Auxillary Heat Only",
                         "type": "active"
                     },
                     {
                         "key": "auxiliaryemergencyheat",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.auxiliaryemergencyheat.label}}",
+                        "value": "Auxillary Emergency Heat",
                         "type": "active"
                     },
                     {
                         "key": "away",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.away.label}}",
+                        "value": "Away",
                         "type": "active"
                     },
                     {
                         "key": "cool",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.cool.label}}",
+                        "value": "Cool",
                         "type": "active"
                     },
                     {
                         "key": "custom",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.custom.label}}",
+                        "value": "Custom",
                         "type": "active"
                     },
                     {
                         "key": "dayoff",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.dayoff.label}}",
+                        "value": "Day off",
                         "type": "active"
                     },
                     {
                         "key": "dryair",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.dryair.label}}",
+                        "value": "Dry air",
                         "type": "active"
                     },
                     {
                         "key": "eco",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.eco.label}}",
+                        "value": "Eco",
                         "type": "active"
                     },
                     {
                         "key": "emergency heat",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheat.label}}",
+                        "value": "Emergency heat",
                         "type": "active"
                     },
                     {
                         "key": "emergencyheat",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheat.label}}",
+                        "value": "Emergency heat",
                         "type": "active"
                     },
                     {
                         "key": "emergencyheatactive",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheatactive.label}}",
+                        "value": "Emergency Heat Active",
                         "type": "active"
                     },
                     {
                         "key": "energysavecool",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.energysavecool.label}}",
+                        "value": "Energy save cool",
                         "type": "active"
                     },
                     {
                         "key": "energysaveheat",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.energysaveheat.label}}",
+                        "value": "Energy save heat",
                         "type": "active"
                     },
                     {
                         "key": "fanonly",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.fanonly.label}}",
+                        "value": "Fan only",
                         "type": "active"
                     },
                     {
                         "key": "frostguard",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.frostguard.label}}",
+                        "value": "Frost guard",
                         "type": "active"
                     },
                     {
                         "key": "furnace",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.furnace.label}}",
+                        "value": "Furnace",
                         "type": "active"
                     },
                     {
                         "key": "heat",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.heat.label}}",
+                        "value": "Heat",
                         "type": "active"
                     },
                     {
                         "key": "heatingoff",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.heatingoff.label}}",
+                        "value": "Heating off",
                         "type": "active"
                     },
                     {
                         "key": "home",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.home.label}}",
+                        "value": "Home",
                         "type": "active"
                     },
                     {
                         "key": "hotwateronly",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.hotwateronly.label}}",
+                        "value": "Hot water only",
                         "type": "active"
                     },
                     {
                         "key": "in",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.in.label}}",
+                        "value": "In",
                         "type": "active"
                     },
                     {
                         "key": "manual",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.manual.label}}",
+                        "value": "Manual",
                         "type": "active"
                     },
                     {
                         "key": "moistair",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.moistair.label}}",
+                        "value": "Moist air",
                         "type": "active"
                     },
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     },
                     {
                         "key": "comfort",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.comfort.label}}",
+                        "value": "Comfort",
                         "type": "active"
                     },
                     {
                         "key": "out",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.out.label}}",
+                        "value": "Out",
                         "type": "active"
                     },
                     {
                         "key": "resume",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.resume.label}}",
+                        "value": "Resume",
                         "type": "active"
                     },
                     {
                         "key": "rush hour",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.rushhour.label}}",
+                        "value": "Rush Hour",
                         "type": "active"
                     },
                     {
                         "key": "rushhour",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.rushhour.label}}",
+                        "value": "Rush Hour",
                         "type": "active"
                     },
                     {
                         "key": "schedule",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.schedule.label}}",
+                        "value": "Scheduled",
                         "type": "active"
                     },
                     {
                         "key": "southernaway",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.southernaway.label}}",
+                        "value": "Southern away",
                         "type": "active"
                     },
                     {
                         "key": "precooling",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.precooling.label}}",
+                        "value": "Pre-cooling",
                         "type": "active"
                     },
                     {
                         "key": "lukewarm",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.lukewarm.label}}",
+                        "value": "Slightly warm",
                         "type": "active"
                     },
                     {
                         "key": "warm",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.warm.label}}",
+                        "value": "Warm",
                         "type": "active"
                     },
                     {
                         "key": "hot",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.hot.label}}",
+                        "value": "Hot",
                         "type": "active"
                     },
                     {
                         "key": "veryhot",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.veryhot.label}}",
+                        "value": "Very hot",
                         "type": "active"
                     },
                     {
                         "key": "ondol",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.ondol.label}}",
+                        "value": "Ondol",
                         "type": "active"
                     },
                     {
                         "key": "bath",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.bath.label}}",
+                        "value": "Bath",
                         "type": "active"
                     },
                     {
                         "key": "iterativeReservation",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.iterativeReservation.label}}",
+                        "value": "Iterative reservation",
                         "type": "active"
                     },
                     {
                         "key": "24hourReservation",
-                        "value": "{{i18n.attributes.thermostatMode.i18n.value.24hourReservation.label}}",
+                        "value": "24-hour reservation",
                         "type": "active"
                     }
                 ]
@@ -262,7 +262,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Thermostat mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -270,252 +270,252 @@
                     "alternatives": [
                         {
                             "key": "antifreezing",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.antifreezing.label}}",
+                            "value": "Anti-freezing",
                             "type": "active"
                         },
                         {
                             "key": "asleep",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.asleep.label}}",
+                            "value": "Asleep",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "autowitheco",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autowitheco.label}}",
+                            "value": "Auto with eco",
                             "type": "active"
                         },
                         {
                             "key": "autowithreset",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autowithreset.label}}",
+                            "value": "Auto with reset",
                             "type": "active"
                         },
                         {
                             "key": "autochangeover",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autochangeover.label}}",
+                            "value": "Auto changeover",
                             "type": "active"
                         },
                         {
                             "key": "autochangeoveractive",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autochangeoveractive.label}}",
+                            "value": "Auto changeover active",
                             "type": "active"
                         },
                         {
                             "key": "autocool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autocool.label}}",
+                            "value": "Auto cool",
                             "type": "active"
                         },
                         {
                             "key": "autoheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autoheat.label}}",
+                            "value": "Auto heat",
                             "type": "active"
                         },
                         {
                             "key": "auxheatonly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auxheatonly.label}}",
+                            "value": "Auxillary Heat Only",
                             "type": "active"
                         },
                         {
                             "key": "auxiliaryemergencyheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auxiliaryemergencyheat.label}}",
+                            "value": "Auxillary Emergency Heat",
                             "type": "active"
                         },
                         {
                             "key": "away",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.away.label}}",
+                            "value": "Away",
                             "type": "active"
                         },
                         {
                             "key": "cool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "custom",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.custom.label}}",
+                            "value": "Custom",
                             "type": "active"
                         },
                         {
                             "key": "dayoff",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.dayoff.label}}",
+                            "value": "Day off",
                             "type": "active"
                         },
                         {
                             "key": "dryair",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.dryair.label}}",
+                            "value": "Dry air",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "emergency heat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheatactive",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheatactive.label}}",
+                            "value": "Emergency Heat Active",
                             "type": "active"
                         },
                         {
                             "key": "energysavecool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.energysavecool.label}}",
+                            "value": "Energy save cool",
                             "type": "active"
                         },
                         {
                             "key": "energysaveheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.energysaveheat.label}}",
+                            "value": "Energy save heat",
                             "type": "active"
                         },
                         {
                             "key": "fanonly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.fanonly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "frostguard",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.frostguard.label}}",
+                            "value": "Frost guard",
                             "type": "active"
                         },
                         {
                             "key": "furnace",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.furnace.label}}",
+                            "value": "Furnace",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "heatingoff",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.heatingoff.label}}",
+                            "value": "Heating off",
                             "type": "active"
                         },
                         {
                             "key": "home",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.home.label}}",
+                            "value": "Home",
                             "type": "active"
                         },
                         {
                             "key": "hotwateronly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.hotwateronly.label}}",
+                            "value": "Hot water only",
                             "type": "active"
                         },
                         {
                             "key": "in",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.in.label}}",
+                            "value": "In",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "moistair",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.moistair.label}}",
+                            "value": "Moist air",
                             "type": "active"
                         },
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "comfort",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.comfort.label}}",
+                            "value": "Comfort",
                             "type": "active"
                         },
                         {
                             "key": "out",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.out.label}}",
+                            "value": "Out",
                             "type": "active"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.resume.label}}",
+                            "value": "Resume",
                             "type": "active"
                         },
                         {
                             "key": "rush hour",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "rushhour",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "schedule",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.schedule.label}}",
+                            "value": "Scheduled",
                             "type": "active"
                         },
                         {
                             "key": "southernaway",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.southernaway.label}}",
+                            "value": "Southern away",
                             "type": "active"
                         },
                         {
                             "key": "precooling",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.precooling.label}}",
+                            "value": "Pre-cooling",
                             "type": "active"
                         },
                         {
                             "key": "lukewarm",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.lukewarm.label}}",
+                            "value": "Slightly warm",
                             "type": "active"
                         },
                         {
                             "key": "warm",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.warm.label}}",
+                            "value": "Warm",
                             "type": "active"
                         },
                         {
                             "key": "hot",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.hot.label}}",
+                            "value": "Hot",
                             "type": "active"
                         },
                         {
                             "key": "veryhot",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.veryhot.label}}",
+                            "value": "Very hot",
                             "type": "active"
                         },
                         {
                             "key": "ondol",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.ondol.label}}",
+                            "value": "Ondol",
                             "type": "active"
                         },
                         {
                             "key": "bath",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.bath.label}}",
+                            "value": "Bath",
                             "type": "active"
                         },
                         {
                             "key": "iterativeReservation",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.iterativeReservation.label}}",
+                            "value": "Iterative reservation",
                             "type": "active"
                         },
                         {
                             "key": "24hourReservation",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.24hourReservation.label}}",
+                            "value": "24-hour reservation",
                             "type": "active"
                         }
                     ],
@@ -528,252 +528,252 @@
                     "alternatives": [
                         {
                             "key": "antifreezing",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.antifreezing.label}}",
+                            "value": "Anti-freezing",
                             "type": "active"
                         },
                         {
                             "key": "asleep",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.asleep.label}}",
+                            "value": "Asleep",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "autowitheco",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autowitheco.label}}",
+                            "value": "Auto with eco",
                             "type": "active"
                         },
                         {
                             "key": "autowithreset",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autowithreset.label}}",
+                            "value": "Auto with reset",
                             "type": "active"
                         },
                         {
                             "key": "autochangeover",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autochangeover.label}}",
+                            "value": "Auto changeover",
                             "type": "active"
                         },
                         {
                             "key": "autochangeoveractive",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autochangeoveractive.label}}",
+                            "value": "Auto changeover active",
                             "type": "active"
                         },
                         {
                             "key": "autocool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autocool.label}}",
+                            "value": "Auto cool",
                             "type": "active"
                         },
                         {
                             "key": "autoheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autoheat.label}}",
+                            "value": "Auto heat",
                             "type": "active"
                         },
                         {
                             "key": "auxheatonly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auxheatonly.label}}",
+                            "value": "Auxillary Heat Only",
                             "type": "active"
                         },
                         {
                             "key": "auxiliaryemergencyheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auxiliaryemergencyheat.label}}",
+                            "value": "Auxillary Emergency Heat",
                             "type": "active"
                         },
                         {
                             "key": "away",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.away.label}}",
+                            "value": "Away",
                             "type": "active"
                         },
                         {
                             "key": "cool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "custom",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.custom.label}}",
+                            "value": "Custom",
                             "type": "active"
                         },
                         {
                             "key": "dayoff",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.dayoff.label}}",
+                            "value": "Day off",
                             "type": "active"
                         },
                         {
                             "key": "dryair",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.dryair.label}}",
+                            "value": "Dry air",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "emergency heat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheatactive",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheatactive.label}}",
+                            "value": "Emergency Heat Active",
                             "type": "active"
                         },
                         {
                             "key": "energysavecool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.energysavecool.label}}",
+                            "value": "Energy save cool",
                             "type": "active"
                         },
                         {
                             "key": "energysaveheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.energysaveheat.label}}",
+                            "value": "Energy save heat",
                             "type": "active"
                         },
                         {
                             "key": "fanonly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.fanonly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "frostguard",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.frostguard.label}}",
+                            "value": "Frost guard",
                             "type": "active"
                         },
                         {
                             "key": "furnace",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.furnace.label}}",
+                            "value": "Furnace",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "heatingoff",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.heatingoff.label}}",
+                            "value": "Heating off",
                             "type": "active"
                         },
                         {
                             "key": "home",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.home.label}}",
+                            "value": "Home",
                             "type": "active"
                         },
                         {
                             "key": "hotwateronly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.hotwateronly.label}}",
+                            "value": "Hot water only",
                             "type": "active"
                         },
                         {
                             "key": "in",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.in.label}}",
+                            "value": "In",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "moistair",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.moistair.label}}",
+                            "value": "Moist air",
                             "type": "active"
                         },
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "comfort",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.comfort.label}}",
+                            "value": "Comfort",
                             "type": "active"
                         },
                         {
                             "key": "out",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.out.label}}",
+                            "value": "Out",
                             "type": "active"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.resume.label}}",
+                            "value": "Resume",
                             "type": "active"
                         },
                         {
                             "key": "rush hour",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "rushhour",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "schedule",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.schedule.label}}",
+                            "value": "Scheduled",
                             "type": "active"
                         },
                         {
                             "key": "southernaway",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.southernaway.label}}",
+                            "value": "Southern away",
                             "type": "active"
                         },
                         {
                             "key": "precooling",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.precooling.label}}",
+                            "value": "Pre-cooling",
                             "type": "active"
                         },
                         {
                             "key": "lukewarm",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.lukewarm.label}}",
+                            "value": "Slightly warm",
                             "type": "active"
                         },
                         {
                             "key": "warm",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.warm.label}}",
+                            "value": "Warm",
                             "type": "active"
                         },
                         {
                             "key": "hot",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.hot.label}}",
+                            "value": "Hot",
                             "type": "active"
                         },
                         {
                             "key": "veryhot",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.veryhot.label}}",
+                            "value": "Very hot",
                             "type": "active"
                         },
                         {
                             "key": "ondol",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.ondol.label}}",
+                            "value": "Ondol",
                             "type": "active"
                         },
                         {
                             "key": "bath",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.bath.label}}",
+                            "value": "Bath",
                             "type": "active"
                         },
                         {
                             "key": "iterativeReservation",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.iterativeReservation.label}}",
+                            "value": "Iterative reservation",
                             "type": "active"
                         },
                         {
                             "key": "24hourReservation",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.24hourReservation.label}}",
+                            "value": "24-hour reservation",
                             "type": "active"
                         }
                     ]
@@ -784,258 +784,258 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Thermostat mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "antifreezing",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.antifreezing.label}}",
+                            "value": "Anti-freezing",
                             "type": "active"
                         },
                         {
                             "key": "asleep",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.asleep.label}}",
+                            "value": "Asleep",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "autowitheco",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autowitheco.label}}",
+                            "value": "Auto with eco",
                             "type": "active"
                         },
                         {
                             "key": "autowithreset",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autowithreset.label}}",
+                            "value": "Auto with reset",
                             "type": "active"
                         },
                         {
                             "key": "autochangeover",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autochangeover.label}}",
+                            "value": "Auto changeover",
                             "type": "active"
                         },
                         {
                             "key": "autochangeoveractive",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autochangeoveractive.label}}",
+                            "value": "Auto changeover active",
                             "type": "active"
                         },
                         {
                             "key": "autocool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autocool.label}}",
+                            "value": "Auto cool",
                             "type": "active"
                         },
                         {
                             "key": "autoheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autoheat.label}}",
+                            "value": "Auto heat",
                             "type": "active"
                         },
                         {
                             "key": "auxheatonly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auxheatonly.label}}",
+                            "value": "Auxillary Heat Only",
                             "type": "active"
                         },
                         {
                             "key": "auxiliaryemergencyheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auxiliaryemergencyheat.label}}",
+                            "value": "Auxillary Emergency Heat",
                             "type": "active"
                         },
                         {
                             "key": "away",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.away.label}}",
+                            "value": "Away",
                             "type": "active"
                         },
                         {
                             "key": "cool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "custom",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.custom.label}}",
+                            "value": "Custom",
                             "type": "active"
                         },
                         {
                             "key": "dayoff",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.dayoff.label}}",
+                            "value": "Day off",
                             "type": "active"
                         },
                         {
                             "key": "dryair",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.dryair.label}}",
+                            "value": "Dry air",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "emergency heat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheatactive",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheatactive.label}}",
+                            "value": "Emergency Heat Active",
                             "type": "active"
                         },
                         {
                             "key": "energysavecool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.energysavecool.label}}",
+                            "value": "Energy save cool",
                             "type": "active"
                         },
                         {
                             "key": "energysaveheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.energysaveheat.label}}",
+                            "value": "Energy save heat",
                             "type": "active"
                         },
                         {
                             "key": "fanonly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.fanonly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "frostguard",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.frostguard.label}}",
+                            "value": "Frost guard",
                             "type": "active"
                         },
                         {
                             "key": "furnace",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.furnace.label}}",
+                            "value": "Furnace",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "heatingoff",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.heatingoff.label}}",
+                            "value": "Heating off",
                             "type": "active"
                         },
                         {
                             "key": "home",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.home.label}}",
+                            "value": "Home",
                             "type": "active"
                         },
                         {
                             "key": "hotwateronly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.hotwateronly.label}}",
+                            "value": "Hot water only",
                             "type": "active"
                         },
                         {
                             "key": "in",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.in.label}}",
+                            "value": "In",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "moistair",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.moistair.label}}",
+                            "value": "Moist air",
                             "type": "active"
                         },
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "comfort",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.comfort.label}}",
+                            "value": "Comfort",
                             "type": "active"
                         },
                         {
                             "key": "out",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.out.label}}",
+                            "value": "Out",
                             "type": "active"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.resume.label}}",
+                            "value": "Resume",
                             "type": "active"
                         },
                         {
                             "key": "rush hour",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "rushhour",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "schedule",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.schedule.label}}",
+                            "value": "Scheduled",
                             "type": "active"
                         },
                         {
                             "key": "southernaway",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.southernaway.label}}",
+                            "value": "Southern away",
                             "type": "active"
                         },
                         {
                             "key": "precooling",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.precooling.label}}",
+                            "value": "Pre-cooling",
                             "type": "active"
                         },
                         {
                             "key": "lukewarm",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.lukewarm.label}}",
+                            "value": "Slightly warm",
                             "type": "active"
                         },
                         {
                             "key": "warm",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.warm.label}}",
+                            "value": "Warm",
                             "type": "active"
                         },
                         {
                             "key": "hot",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.hot.label}}",
+                            "value": "Hot",
                             "type": "active"
                         },
                         {
                             "key": "veryhot",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.veryhot.label}}",
+                            "value": "Very hot",
                             "type": "active"
                         },
                         {
                             "key": "ondol",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.ondol.label}}",
+                            "value": "Ondol",
                             "type": "active"
                         },
                         {
                             "key": "bath",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.bath.label}}",
+                            "value": "Bath",
                             "type": "active"
                         },
                         {
                             "key": "iterativeReservation",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.iterativeReservation.label}}",
+                            "value": "Iterative reservation",
                             "type": "active"
                         },
                         {
                             "key": "24hourReservation",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.24hourReservation.label}}",
+                            "value": "24-hour reservation",
                             "type": "active"
                         }
                     ],
@@ -1048,258 +1048,258 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Thermostat mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "antifreezing",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.antifreezing.label}}",
+                            "value": "Anti-freezing",
                             "type": "active"
                         },
                         {
                             "key": "asleep",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.asleep.label}}",
+                            "value": "Asleep",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "autowitheco",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autowitheco.label}}",
+                            "value": "Auto with eco",
                             "type": "active"
                         },
                         {
                             "key": "autowithreset",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autowithreset.label}}",
+                            "value": "Auto with reset",
                             "type": "active"
                         },
                         {
                             "key": "autochangeover",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autochangeover.label}}",
+                            "value": "Auto changeover",
                             "type": "active"
                         },
                         {
                             "key": "autochangeoveractive",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autochangeoveractive.label}}",
+                            "value": "Auto changeover active",
                             "type": "active"
                         },
                         {
                             "key": "autocool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autocool.label}}",
+                            "value": "Auto cool",
                             "type": "active"
                         },
                         {
                             "key": "autoheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autoheat.label}}",
+                            "value": "Auto heat",
                             "type": "active"
                         },
                         {
                             "key": "auxheatonly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auxheatonly.label}}",
+                            "value": "Auxillary Heat Only",
                             "type": "active"
                         },
                         {
                             "key": "auxiliaryemergencyheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auxiliaryemergencyheat.label}}",
+                            "value": "Auxillary Emergency Heat",
                             "type": "active"
                         },
                         {
                             "key": "away",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.away.label}}",
+                            "value": "Away",
                             "type": "active"
                         },
                         {
                             "key": "cool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "custom",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.custom.label}}",
+                            "value": "Custom",
                             "type": "active"
                         },
                         {
                             "key": "dayoff",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.dayoff.label}}",
+                            "value": "Day off",
                             "type": "active"
                         },
                         {
                             "key": "dryair",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.dryair.label}}",
+                            "value": "Dry air",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "emergency heat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheatactive",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheatactive.label}}",
+                            "value": "Emergency Heat Active",
                             "type": "active"
                         },
                         {
                             "key": "energysavecool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.energysavecool.label}}",
+                            "value": "Energy save cool",
                             "type": "active"
                         },
                         {
                             "key": "energysaveheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.energysaveheat.label}}",
+                            "value": "Energy save heat",
                             "type": "active"
                         },
                         {
                             "key": "fanonly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.fanonly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "frostguard",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.frostguard.label}}",
+                            "value": "Frost guard",
                             "type": "active"
                         },
                         {
                             "key": "furnace",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.furnace.label}}",
+                            "value": "Furnace",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "heatingoff",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.heatingoff.label}}",
+                            "value": "Heating off",
                             "type": "active"
                         },
                         {
                             "key": "home",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.home.label}}",
+                            "value": "Home",
                             "type": "active"
                         },
                         {
                             "key": "hotwateronly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.hotwateronly.label}}",
+                            "value": "Hot water only",
                             "type": "active"
                         },
                         {
                             "key": "in",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.in.label}}",
+                            "value": "In",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "moistair",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.moistair.label}}",
+                            "value": "Moist air",
                             "type": "active"
                         },
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "comfort",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.comfort.label}}",
+                            "value": "Comfort",
                             "type": "active"
                         },
                         {
                             "key": "out",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.out.label}}",
+                            "value": "Out",
                             "type": "active"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.resume.label}}",
+                            "value": "Resume",
                             "type": "active"
                         },
                         {
                             "key": "rush hour",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "rushhour",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "schedule",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.schedule.label}}",
+                            "value": "Scheduled",
                             "type": "active"
                         },
                         {
                             "key": "southernaway",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.southernaway.label}}",
+                            "value": "Southern away",
                             "type": "active"
                         },
                         {
                             "key": "precooling",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.precooling.label}}",
+                            "value": "Pre-cooling",
                             "type": "active"
                         },
                         {
                             "key": "lukewarm",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.lukewarm.label}}",
+                            "value": "Slightly warm",
                             "type": "active"
                         },
                         {
                             "key": "warm",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.warm.label}}",
+                            "value": "Warm",
                             "type": "active"
                         },
                         {
                             "key": "hot",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.hot.label}}",
+                            "value": "Hot",
                             "type": "active"
                         },
                         {
                             "key": "veryhot",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.veryhot.label}}",
+                            "value": "Very hot",
                             "type": "active"
                         },
                         {
                             "key": "ondol",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.ondol.label}}",
+                            "value": "Ondol",
                             "type": "active"
                         },
                         {
                             "key": "bath",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.bath.label}}",
+                            "value": "Bath",
                             "type": "active"
                         },
                         {
                             "key": "iterativeReservation",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.iterativeReservation.label}}",
+                            "value": "Iterative reservation",
                             "type": "active"
                         },
                         {
                             "key": "24hourReservation",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.24hourReservation.label}}",
+                            "value": "24-hour reservation",
                             "type": "active"
                         }
                     ],
diff --git a/json/thermostatOperatingStatePresentation.json b/json/thermostatOperatingStatePresentation.json
index d0f3fac6..0de59d29 100755
--- a/json/thermostatOperatingStatePresentation.json
+++ b/json/thermostatOperatingStatePresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.cooling.label}}",
+                        "value": "Cooling",
                         "type": "active"
                     },
                     {
                         "key": "fan only",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.fan only.label}}",
+                        "value": "Fan only",
                         "type": "active"
                     },
                     {
                         "key": "heating",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.heating.label}}",
+                        "value": "Heating",
                         "type": "active"
                     },
                     {
                         "key": "idle",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.idle.label}}",
+                        "value": "Idle",
                         "type": "inactive"
                     },
                     {
                         "key": "pending cool",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.pending cool.label}}",
+                        "value": "Pending cool",
                         "type": "active"
                     },
                     {
                         "key": "pending heat",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.pending heat.label}}",
+                        "value": "Pending heat",
                         "type": "active"
                     },
                     {
                         "key": "vent economizer",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.vent economizer.label}}",
+                        "value": "Vent economiser",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "State",
             "displayType": "state",
             "state": {
                 "label": "{{thermostatOperatingState.value}}",
                 "alternatives": [
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.cooling.label}}",
+                        "value": "Cooling",
                         "type": "active"
                     },
                     {
                         "key": "fan only",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.fan only.label}}",
+                        "value": "Fan only",
                         "type": "active"
                     },
                     {
                         "key": "heating",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.heating.label}}",
+                        "value": "Heating",
                         "type": "active"
                     },
                     {
                         "key": "idle",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.idle.label}}",
+                        "value": "Idle",
                         "type": "inactive"
                     },
                     {
                         "key": "pending cool",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.pending cool.label}}",
+                        "value": "Pending cool",
                         "type": "active"
                     },
                     {
                         "key": "pending heat",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.pending heat.label}}",
+                        "value": "Pending heat",
                         "type": "active"
                     },
                     {
                         "key": "vent economizer",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.vent economizer.label}}",
+                        "value": "Vent economiser",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "State",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "cooling",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.cooling.label}}",
+                            "value": "Cooling",
                             "type": "active"
                         },
                         {
                             "key": "fan only",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.fan only.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "heating",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.heating.label}}",
+                            "value": "Heating",
                             "type": "active"
                         },
                         {
                             "key": "idle",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.idle.label}}",
+                            "value": "Idle",
                             "type": "inactive"
                         },
                         {
                             "key": "pending cool",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.pending cool.label}}",
+                            "value": "Pending cool",
                             "type": "active"
                         },
                         {
                             "key": "pending heat",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.pending heat.label}}",
+                            "value": "Pending heat",
                             "type": "active"
                         },
                         {
                             "key": "vent economizer",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.vent economizer.label}}",
+                            "value": "Vent economiser",
                             "type": "active"
                         }
                     ],
diff --git a/json/thermostatPresentation.json b/json/thermostatPresentation.json
index 88ff6b5d..56256da5 100755
--- a/json/thermostatPresentation.json
+++ b/json/thermostatPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.attributes.heatingSetpoint.label}}",
+            "label": "Heating temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -16,7 +16,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.coolingSetpoint.label}}",
+            "label": "Cooling temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -31,51 +31,51 @@
             }
         },
         {
-            "label": "{{i18n.attributes.thermostatOperatingState.label}}",
+            "label": "State",
             "displayType": "state",
             "state": {
                 "label": "{{thermostatOperatingState.value}}",
                 "alternatives": [
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.cooling.label}}",
+                        "value": "Cooling",
                         "type": "active"
                     },
                     {
                         "key": "fan only",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.fan only.label}}",
+                        "value": "Fan only",
                         "type": "active"
                     },
                     {
                         "key": "heating",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.heating.label}}",
+                        "value": "Heating",
                         "type": "active"
                     },
                     {
                         "key": "idle",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.idle.label}}",
+                        "value": "Idle",
                         "type": "active"
                     },
                     {
                         "key": "pending cool",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.pending cool.label}}",
+                        "value": "Pending cool",
                         "type": "active"
                     },
                     {
                         "key": "pending heat",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.pending heat.label}}",
+                        "value": "Pending heat",
                         "type": "active"
                     },
                     {
                         "key": "vent economizer",
-                        "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.vent economizer.label}}",
+                        "value": "Vent economiser",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.thermostatMode.label}}",
+            "label": "Thermostat mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -83,197 +83,197 @@
                     "alternatives": [
                         {
                             "key": "antifreezing",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.antifreezing.label}}",
+                            "value": "Anti-freezing",
                             "type": "active"
                         },
                         {
                             "key": "asleep",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.asleep.label}}",
+                            "value": "Asleep",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "autowitheco",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autowitheco.label}}",
+                            "value": "Auto with eco",
                             "type": "active"
                         },
                         {
                             "key": "autowithreset",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autowithreset.label}}",
+                            "value": "Auto with reset",
                             "type": "active"
                         },
                         {
                             "key": "autochangeover",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autochangeover.label}}",
+                            "value": "Auto changeover",
                             "type": "active"
                         },
                         {
                             "key": "autochangeoveractive",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autochangeoveractive.label}}",
+                            "value": "Auto changeover active",
                             "type": "active"
                         },
                         {
                             "key": "autocool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autocool.label}}",
+                            "value": "Auto cool",
                             "type": "active"
                         },
                         {
                             "key": "autoheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autoheat.label}}",
+                            "value": "Auto heat",
                             "type": "active"
                         },
                         {
                             "key": "auxheatonly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auxheatonly.label}}",
+                            "value": "Auxillary Heat Only",
                             "type": "active"
                         },
                         {
                             "key": "auxiliaryemergencyheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auxiliaryemergencyheat.label}}",
+                            "value": "Auxillary Emergency Heat",
                             "type": "active"
                         },
                         {
                             "key": "away",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.away.label}}",
+                            "value": "Away",
                             "type": "active"
                         },
                         {
                             "key": "cool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "custom",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.custom.label}}",
+                            "value": "Custom",
                             "type": "active"
                         },
                         {
                             "key": "dayoff",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.dayoff.label}}",
+                            "value": "Day off",
                             "type": "active"
                         },
                         {
                             "key": "dryair",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.dryair.label}}",
+                            "value": "Dry air",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "emergency heat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheatactive",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheatactive.label}}",
+                            "value": "Emergency Heat Active",
                             "type": "active"
                         },
                         {
                             "key": "energysavecool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.energysavecool.label}}",
+                            "value": "Energy save cool",
                             "type": "active"
                         },
                         {
                             "key": "energysaveheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.energysaveheat.label}}",
+                            "value": "Energy save heat",
                             "type": "active"
                         },
                         {
                             "key": "fanonly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.fanonly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "frostguard",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.frostguard.label}}",
+                            "value": "Frost guard",
                             "type": "active"
                         },
                         {
                             "key": "furnace",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.furnace.label}}",
+                            "value": "Furnace",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "heatingoff",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.heatingoff.label}}",
+                            "value": "Heating off",
                             "type": "active"
                         },
                         {
                             "key": "home",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.home.label}}",
+                            "value": "Home",
                             "type": "active"
                         },
                         {
                             "key": "hotwateronly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.hotwateronly.label}}",
+                            "value": "Hot water only",
                             "type": "active"
                         },
                         {
                             "key": "in",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.in.label}}",
+                            "value": "In",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "moistair",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.moistair.label}}",
+                            "value": "Moist air",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "out",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.out.label}}",
+                            "value": "Out",
                             "type": "active"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.resume.label}}",
+                            "value": "Resume",
                             "type": "active"
                         },
                         {
                             "key": "rush hour",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "rushhour",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "schedule",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.schedule.label}}",
+                            "value": "Scheduled",
                             "type": "active"
                         },
                         {
                             "key": "southernaway",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.southernaway.label}}",
+                            "value": "Southern away",
                             "type": "active"
                         }
                     ],
@@ -286,197 +286,197 @@
                     "alternatives": [
                         {
                             "key": "antifreezing",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.antifreezing.label}}",
+                            "value": "Anti-freezing",
                             "type": "active"
                         },
                         {
                             "key": "asleep",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.asleep.label}}",
+                            "value": "Asleep",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "autowitheco",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autowitheco.label}}",
+                            "value": "Auto with eco",
                             "type": "active"
                         },
                         {
                             "key": "autowithreset",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autowithreset.label}}",
+                            "value": "Auto with reset",
                             "type": "active"
                         },
                         {
                             "key": "autochangeover",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autochangeover.label}}",
+                            "value": "Auto changeover",
                             "type": "active"
                         },
                         {
                             "key": "autochangeoveractive",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autochangeoveractive.label}}",
+                            "value": "Auto changeover active",
                             "type": "active"
                         },
                         {
                             "key": "autocool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autocool.label}}",
+                            "value": "Auto cool",
                             "type": "active"
                         },
                         {
                             "key": "autoheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autoheat.label}}",
+                            "value": "Auto heat",
                             "type": "active"
                         },
                         {
                             "key": "auxheatonly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auxheatonly.label}}",
+                            "value": "Auxillary Heat Only",
                             "type": "active"
                         },
                         {
                             "key": "auxiliaryemergencyheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auxiliaryemergencyheat.label}}",
+                            "value": "Auxillary Emergency Heat",
                             "type": "active"
                         },
                         {
                             "key": "away",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.away.label}}",
+                            "value": "Away",
                             "type": "active"
                         },
                         {
                             "key": "cool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "custom",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.custom.label}}",
+                            "value": "Custom",
                             "type": "active"
                         },
                         {
                             "key": "dayoff",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.dayoff.label}}",
+                            "value": "Day off",
                             "type": "active"
                         },
                         {
                             "key": "dryair",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.dryair.label}}",
+                            "value": "Dry air",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "emergency heat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheatactive",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheatactive.label}}",
+                            "value": "Emergency Heat Active",
                             "type": "active"
                         },
                         {
                             "key": "energysavecool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.energysavecool.label}}",
+                            "value": "Energy save cool",
                             "type": "active"
                         },
                         {
                             "key": "energysaveheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.energysaveheat.label}}",
+                            "value": "Energy save heat",
                             "type": "active"
                         },
                         {
                             "key": "fanonly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.fanonly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "frostguard",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.frostguard.label}}",
+                            "value": "Frost guard",
                             "type": "active"
                         },
                         {
                             "key": "furnace",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.furnace.label}}",
+                            "value": "Furnace",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "heatingoff",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.heatingoff.label}}",
+                            "value": "Heating off",
                             "type": "active"
                         },
                         {
                             "key": "home",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.home.label}}",
+                            "value": "Home",
                             "type": "active"
                         },
                         {
                             "key": "hotwateronly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.hotwateronly.label}}",
+                            "value": "Hot water only",
                             "type": "active"
                         },
                         {
                             "key": "in",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.in.label}}",
+                            "value": "In",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "moistair",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.moistair.label}}",
+                            "value": "Moist air",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "out",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.out.label}}",
+                            "value": "Out",
                             "type": "active"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.resume.label}}",
+                            "value": "Resume",
                             "type": "active"
                         },
                         {
                             "key": "rush hour",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "rushhour",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "schedule",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.schedule.label}}",
+                            "value": "Scheduled",
                             "type": "active"
                         },
                         {
                             "key": "southernaway",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.southernaway.label}}",
+                            "value": "Southern away",
                             "type": "active"
                         }
                     ]
@@ -484,7 +484,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.thermostatFanMode.label}}",
+            "label": "Fan mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -492,22 +492,22 @@
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.fanmode.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.fanmode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "circulate",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.fanmode.i18n.circulate.label}}",
+                            "value": "Circulate",
                             "type": "active"
                         },
                         {
                             "key": "followschedule",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.fanmode.i18n.followschedule.label}}",
+                            "value": "Schedule",
                             "type": "active"
                         },
                         {
@@ -555,22 +555,22 @@
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "circulate",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.circulate.label}}",
+                            "value": "Circulate",
                             "type": "active"
                         },
                         {
                             "key": "followschedule",
-                            "value": "{{i18n.attributes.thermostatFanMode.i18n.value.followschedule.label}}",
+                            "value": "Schedule",
                             "type": "active"
                         },
                         {
@@ -616,7 +616,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.heatingSetpoint.label}}",
+                "label": "Heating temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "heatingSetpoint.value",
@@ -629,7 +629,7 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.coolingSetpoint.label}}",
+                "label": "Cooling temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "coolingSetpoint.value",
@@ -642,43 +642,43 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.thermostatOperatingState.label}}",
+                "label": "State",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "cooling",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.cooling.label}}",
+                            "value": "Cooling",
                             "type": "active"
                         },
                         {
                             "key": "fan only",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.fan only.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "heating",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.heating.label}}",
+                            "value": "Heating",
                             "type": "active"
                         },
                         {
                             "key": "idle",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.idle.label}}",
+                            "value": "Idle",
                             "type": "active"
                         },
                         {
                             "key": "pending cool",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.pending cool.label}}",
+                            "value": "Pending cool",
                             "type": "active"
                         },
                         {
                             "key": "pending heat",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.pending heat.label}}",
+                            "value": "Pending heat",
                             "type": "active"
                         },
                         {
                             "key": "vent economizer",
-                            "value": "{{i18n.attributes.thermostatOperatingState.i18n.value.vent economizer.label}}",
+                            "value": "Vent economiser",
                             "type": "active"
                         }
                     ],
@@ -688,203 +688,203 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.thermostatMode.label}}",
+                "label": "Thermostat mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "antifreezing",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.antifreezing.label}}",
+                            "value": "Anti-freezing",
                             "type": "active"
                         },
                         {
                             "key": "asleep",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.asleep.label}}",
+                            "value": "Asleep",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "autowitheco",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autowitheco.label}}",
+                            "value": "Auto with eco",
                             "type": "active"
                         },
                         {
                             "key": "autowithreset",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autowithreset.label}}",
+                            "value": "Auto with reset",
                             "type": "active"
                         },
                         {
                             "key": "autochangeover",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autochangeover.label}}",
+                            "value": "Auto changeover",
                             "type": "active"
                         },
                         {
                             "key": "autochangeoveractive",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autochangeoveractive.label}}",
+                            "value": "Auto changeover active",
                             "type": "active"
                         },
                         {
                             "key": "autocool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autocool.label}}",
+                            "value": "Auto cool",
                             "type": "active"
                         },
                         {
                             "key": "autoheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.autoheat.label}}",
+                            "value": "Auto heat",
                             "type": "active"
                         },
                         {
                             "key": "auxheatonly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auxheatonly.label}}",
+                            "value": "Auxillary Heat Only",
                             "type": "active"
                         },
                         {
                             "key": "auxiliaryemergencyheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.auxiliaryemergencyheat.label}}",
+                            "value": "Auxillary Emergency Heat",
                             "type": "active"
                         },
                         {
                             "key": "away",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.away.label}}",
+                            "value": "Away",
                             "type": "active"
                         },
                         {
                             "key": "cool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "custom",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.custom.label}}",
+                            "value": "Custom",
                             "type": "active"
                         },
                         {
                             "key": "dayoff",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.dayoff.label}}",
+                            "value": "Day off",
                             "type": "active"
                         },
                         {
                             "key": "dryair",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.dryair.label}}",
+                            "value": "Dry air",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "emergency heat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheatactive",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.emergencyheatactive.label}}",
+                            "value": "Emergency Heat Active",
                             "type": "active"
                         },
                         {
                             "key": "energysavecool",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.energysavecool.label}}",
+                            "value": "Energy save cool",
                             "type": "active"
                         },
                         {
                             "key": "energysaveheat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.energysaveheat.label}}",
+                            "value": "Energy save heat",
                             "type": "active"
                         },
                         {
                             "key": "fanonly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.fanonly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "frostguard",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.frostguard.label}}",
+                            "value": "Frost guard",
                             "type": "active"
                         },
                         {
                             "key": "furnace",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.furnace.label}}",
+                            "value": "Furnace",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "heatingoff",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.heatingoff.label}}",
+                            "value": "Heating off",
                             "type": "active"
                         },
                         {
                             "key": "home",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.home.label}}",
+                            "value": "Home",
                             "type": "active"
                         },
                         {
                             "key": "hotwateronly",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.hotwateronly.label}}",
+                            "value": "Hot water only",
                             "type": "active"
                         },
                         {
                             "key": "in",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.in.label}}",
+                            "value": "In",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "moistair",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.moistair.label}}",
+                            "value": "Moist air",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "out",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.out.label}}",
+                            "value": "Out",
                             "type": "active"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.resume.label}}",
+                            "value": "Resume",
                             "type": "active"
                         },
                         {
                             "key": "rush hour",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "rushhour",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "schedule",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.schedule.label}}",
+                            "value": "Scheduled",
                             "type": "active"
                         },
                         {
                             "key": "southernaway",
-                            "value": "{{i18n.attributes.thermostatMode.i18n.value.southernaway.label}}",
+                            "value": "Southern away",
                             "type": "active"
                         }
                     ],
@@ -897,7 +897,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.heatingSetpoint.label}}",
+                "label": "Heating temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setHeatingSetpoint",
@@ -910,7 +910,7 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.coolingSetpoint.label}}",
+                "label": "Cooling temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setCoolingSetpoint",
@@ -923,203 +923,203 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.thermostatMode.label}}",
+                "label": "Thermostat mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "antifreezing",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.antifreezing.label}}",
+                            "value": "Anti-freezing",
                             "type": "active"
                         },
                         {
                             "key": "asleep",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.asleep.label}}",
+                            "value": "Asleep",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "autowitheco",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autowitheco.label}}",
+                            "value": "Auto with eco",
                             "type": "active"
                         },
                         {
                             "key": "autowithreset",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autowithreset.label}}",
+                            "value": "Auto with reset",
                             "type": "active"
                         },
                         {
                             "key": "autochangeover",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autochangeover.label}}",
+                            "value": "Auto changeover",
                             "type": "active"
                         },
                         {
                             "key": "autochangeoveractive",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autochangeoveractive.label}}",
+                            "value": "Auto changeover active",
                             "type": "active"
                         },
                         {
                             "key": "autocool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autocool.label}}",
+                            "value": "Auto cool",
                             "type": "active"
                         },
                         {
                             "key": "autoheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.autoheat.label}}",
+                            "value": "Auto heat",
                             "type": "active"
                         },
                         {
                             "key": "auxheatonly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auxheatonly.label}}",
+                            "value": "Auxillary Heat Only",
                             "type": "active"
                         },
                         {
                             "key": "auxiliaryemergencyheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.auxiliaryemergencyheat.label}}",
+                            "value": "Auxillary Emergency Heat",
                             "type": "active"
                         },
                         {
                             "key": "away",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.away.label}}",
+                            "value": "Away",
                             "type": "active"
                         },
                         {
                             "key": "cool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.cool.label}}",
+                            "value": "Cool",
                             "type": "active"
                         },
                         {
                             "key": "custom",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.custom.label}}",
+                            "value": "Custom",
                             "type": "active"
                         },
                         {
                             "key": "dayoff",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.dayoff.label}}",
+                            "value": "Day off",
                             "type": "active"
                         },
                         {
                             "key": "dryair",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.dryair.label}}",
+                            "value": "Dry air",
                             "type": "active"
                         },
                         {
                             "key": "eco",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.eco.label}}",
+                            "value": "Eco",
                             "type": "active"
                         },
                         {
                             "key": "emergency heat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheat.label}}",
+                            "value": "Emergency heat",
                             "type": "active"
                         },
                         {
                             "key": "emergencyheatactive",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.emergencyheatactive.label}}",
+                            "value": "Emergency Heat Active",
                             "type": "active"
                         },
                         {
                             "key": "energysavecool",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.energysavecool.label}}",
+                            "value": "Energy save cool",
                             "type": "active"
                         },
                         {
                             "key": "energysaveheat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.energysaveheat.label}}",
+                            "value": "Energy save heat",
                             "type": "active"
                         },
                         {
                             "key": "fanonly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.fanonly.label}}",
+                            "value": "Fan only",
                             "type": "active"
                         },
                         {
                             "key": "frostguard",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.frostguard.label}}",
+                            "value": "Frost guard",
                             "type": "active"
                         },
                         {
                             "key": "furnace",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.furnace.label}}",
+                            "value": "Furnace",
                             "type": "active"
                         },
                         {
                             "key": "heat",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.heat.label}}",
+                            "value": "Heat",
                             "type": "active"
                         },
                         {
                             "key": "heatingoff",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.heatingoff.label}}",
+                            "value": "Heating off",
                             "type": "active"
                         },
                         {
                             "key": "home",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.home.label}}",
+                            "value": "Home",
                             "type": "active"
                         },
                         {
                             "key": "hotwateronly",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.hotwateronly.label}}",
+                            "value": "Hot water only",
                             "type": "active"
                         },
                         {
                             "key": "in",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.in.label}}",
+                            "value": "In",
                             "type": "active"
                         },
                         {
                             "key": "manual",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.manual.label}}",
+                            "value": "Manual",
                             "type": "active"
                         },
                         {
                             "key": "moistair",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.moistair.label}}",
+                            "value": "Moist air",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         },
                         {
                             "key": "out",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.out.label}}",
+                            "value": "Out",
                             "type": "active"
                         },
                         {
                             "key": "resume",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.resume.label}}",
+                            "value": "Resume",
                             "type": "active"
                         },
                         {
                             "key": "rush hour",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "rushhour",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.rushhour.label}}",
+                            "value": "Rush Hour",
                             "type": "active"
                         },
                         {
                             "key": "schedule",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.schedule.label}}",
+                            "value": "Scheduled",
                             "type": "active"
                         },
                         {
                             "key": "southernaway",
-                            "value": "{{i18n.commands.setThermostatMode.arguments.mode.i18n.southernaway.label}}",
+                            "value": "Southern away",
                             "type": "active"
                         }
                     ],
@@ -1129,28 +1129,28 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.thermostatFanMode.label}}",
+                "label": "Fan mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.fanmode.i18n.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "auto",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.fanmode.i18n.auto.label}}",
+                            "value": "Auto",
                             "type": "active"
                         },
                         {
                             "key": "circulate",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.fanmode.i18n.circulate.label}}",
+                            "value": "Circulate",
                             "type": "active"
                         },
                         {
                             "key": "followschedule",
-                            "value": "{{i18n.commands.setThermostatFanMode.arguments.fanmode.i18n.followschedule.label}}",
+                            "value": "Schedule",
                             "type": "active"
                         },
                         {
diff --git a/json/thermostatSchedule.json b/json/thermostatSchedule.json
index b8d395d1..a32ef88d 100755
--- a/json/thermostatSchedule.json
+++ b/json/thermostatSchedule.json
@@ -33,7 +33,8 @@
                         "type": "object"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/thermostatSetpointPresentation.json b/json/thermostatSetpointPresentation.json
index 17be4382..2cb32822 100755
--- a/json/thermostatSetpointPresentation.json
+++ b/json/thermostatSetpointPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Set temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
diff --git a/json/thermostatWaterHeatingSetpoint.json b/json/thermostatWaterHeatingSetpoint.json
index 408dc0cc..7d4842b4 100755
--- a/json/thermostatWaterHeatingSetpoint.json
+++ b/json/thermostatWaterHeatingSetpoint.json
@@ -96,7 +96,8 @@
                         "maximum": 10000
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/thermostatWaterHeatingSetpointPresentation.json b/json/thermostatWaterHeatingSetpointPresentation.json
index f5477dc8..f5931a3b 100644
--- a/json/thermostatWaterHeatingSetpointPresentation.json
+++ b/json/thermostatWaterHeatingSetpointPresentation.json
@@ -22,12 +22,12 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Set water temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
-                    0,
-                    40
+                    40,
+                    60
                 ],
                 "unit": "heatingSetpoint.unit",
                 "supportedValues": "heatingSetpointRange.value",
@@ -41,15 +41,15 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Set water temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "heatingSetpoint.value",
                     "valueType": "number",
                     "unit": "heatingSetpoint.unit",
                     "range": [
-                        0,
-                        40
+                        40,
+                        60
                     ],
                     "supportedValues": "heatingSetpointRange.value"
                 }
@@ -57,15 +57,15 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Set water temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "command": "setHeatingSetpoint",
                     "argumentType": "number",
                     "unit": "heatingSetpoint.unit",
                     "range": [
-                        0,
-                        40
+                        40,
+                        60
                     ],
                     "supportedValues": "heatingSetpointRange.value"
                 }
diff --git a/json/threadBorderRouter.i18n.en.json b/json/threadBorderRouter.i18n.en.json
new file mode 100644
index 00000000..e539267a
--- /dev/null
+++ b/json/threadBorderRouter.i18n.en.json
@@ -0,0 +1,31 @@
+{
+    "tag": "en",
+    "label": "Thread Border Router",
+    "attributes": {
+        "threadVersion": {
+            "label": "threadVersion",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "borderRouterName": {
+            "label": "borderRouterName",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "threadInterfaceState": {
+            "label": "threadInterfaceState",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/threadBorderRouter.i18n.fr.json b/json/threadBorderRouter.i18n.fr.json
new file mode 100644
index 00000000..e539267a
--- /dev/null
+++ b/json/threadBorderRouter.i18n.fr.json
@@ -0,0 +1,31 @@
+{
+    "tag": "en",
+    "label": "Thread Border Router",
+    "attributes": {
+        "threadVersion": {
+            "label": "threadVersion",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "borderRouterName": {
+            "label": "borderRouterName",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "threadInterfaceState": {
+            "label": "threadInterfaceState",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "disabled": {
+                        "label": "disabled"
+                    },
+                    "enabled": {
+                        "label": "enabled"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/threadBorderRouter.json b/json/threadBorderRouter.json
new file mode 100644
index 00000000..26620ac6
--- /dev/null
+++ b/json/threadBorderRouter.json
@@ -0,0 +1,61 @@
+{
+    "id": "threadBorderRouter",
+    "version": 1,
+    "status": "proposed",
+    "name": "Thread Border Router",
+    "ephemeral": false,
+    "attributes": {
+        "threadVersion": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "pattern": "^[0-9]+\\.[0-9]+(\\.[0-9])?$"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "borderRouterName": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "threadInterfaceState": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "disabled",
+                            "enabled"
+                        ],
+                        "default": "disabled"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/threadNetwork.i18n.en.json b/json/threadNetwork.i18n.en.json
new file mode 100644
index 00000000..bb59f67b
--- /dev/null
+++ b/json/threadNetwork.i18n.en.json
@@ -0,0 +1,32 @@
+{
+    "tag": "en",
+    "label": "Thread Network",
+    "attributes": {
+        "panId": {
+            "label": "panId",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "extendedPanId": {
+            "label": "extendedPanId",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "networkName": {
+            "label": "networkName",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "channel": {
+            "label": "channel",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "networkKey": {
+            "label": "networkKey",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/threadNetwork.i18n.fr.json b/json/threadNetwork.i18n.fr.json
new file mode 100644
index 00000000..bb59f67b
--- /dev/null
+++ b/json/threadNetwork.i18n.fr.json
@@ -0,0 +1,32 @@
+{
+    "tag": "en",
+    "label": "Thread Network",
+    "attributes": {
+        "panId": {
+            "label": "panId",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "extendedPanId": {
+            "label": "extendedPanId",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "networkName": {
+            "label": "networkName",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "channel": {
+            "label": "channel",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "networkKey": {
+            "label": "networkKey",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/threadNetwork.json b/json/threadNetwork.json
new file mode 100644
index 00000000..733f2b93
--- /dev/null
+++ b/json/threadNetwork.json
@@ -0,0 +1,94 @@
+{
+    "id": "threadNetwork",
+    "version": 1,
+    "status": "proposed",
+    "name": "Thread Network",
+    "ephemeral": false,
+    "attributes": {
+        "panId": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 0,
+                        "maximum": 65535
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "extendedPanId": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "pattern": "^[0-9a-fA-F]{16}$"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "networkName": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "String",
+                        "type": "string",
+                        "maxLength": 255
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "channel": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 11,
+                        "maximum": 26
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "networkKey": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "pattern": "^[0-9a-fA-F]{32}$"
+                    }
+                },
+                "sensitive": true,
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/threeAxisPresentation.json b/json/threeAxisPresentation.json
index 99203792..e5a03c52 100755
--- a/json/threeAxisPresentation.json
+++ b/json/threeAxisPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "3-axis sensor",
             "displayType": "state",
             "state": {
                 "label": "{{threeAxis.value}}",
diff --git a/json/timedSession.json b/json/timedSession.json
index fb45e958..18188cb9 100755
--- a/json/timedSession.json
+++ b/json/timedSession.json
@@ -65,15 +65,18 @@
     "commands": {
         "cancel": {
             "name": "cancel",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "stop": {
             "name": "stop",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "start": {
             "name": "start",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setCompletionTime": {
             "name": "setCompletionTime",
@@ -87,11 +90,13 @@
                         "pattern": "^(?:[1-9]\\d{3}-?(?:(?:0[1-9]|1[0-2])-?(?:0[1-9]|1\\d|2[0-8])|(?:0[13-9]|1[0-2])-?(?:29|30)|(?:0[13578]|1[02])-?31)|(?:[1-9]\\d(?:0[48]|[2468][048]|[13579][26])|(?:[2468][048]|[13579][26])00)-?02-?29)T(?:[01]\\d|2[0-3]):?[0-5]\\d:?[0-5]\\d(?:\\.\\d{3})?(?:Z|[+-][01]\\d(?::?[0-5]\\d)?)$"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "pause": {
             "name": "pause",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/tone.json b/json/tone.json
index c493de2b..3cb93a9e 100755
--- a/json/tone.json
+++ b/json/tone.json
@@ -8,7 +8,8 @@
     "commands": {
         "beep": {
             "name": "beep",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/tonePresentation.json b/json/tonePresentation.json
index 17751444..1f15fead 100755
--- a/json/tonePresentation.json
+++ b/json/tonePresentation.json
@@ -13,7 +13,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Play sound",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "beep"
@@ -24,13 +24,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Play sound",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "beep",
-                            "value": "{{i18n.commands.beep.label}}",
+                            "value": "Play sound",
                             "type": "active"
                         }
                     ]
diff --git a/json/tvChannel.json b/json/tvChannel.json
index dfa2bd49..fb360223 100755
--- a/json/tvChannel.json
+++ b/json/tvChannel.json
@@ -41,7 +41,8 @@
     "commands": {
         "channelDown": {
             "name": "channelDown",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setTvChannel": {
             "name": "setTvChannel",
@@ -55,11 +56,13 @@
                         "maxLength": 255
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "channelUp": {
             "name": "channelUp",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "setTvChannelName": {
             "name": "setTvChannelName",
@@ -73,7 +76,8 @@
                         "maxLength": 255
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/tvChannelPresentation.json b/json/tvChannelPresentation.json
index e265fddd..f71d3a67 100755
--- a/json/tvChannelPresentation.json
+++ b/json/tvChannelPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Channel",
             "displayType": "textField",
             "textField": {
                 "command": "setTvChannel"
@@ -20,7 +20,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Channel",
                 "displayType": "textField",
                 "textField": {
                     "value": "tvChannel.value"
@@ -29,7 +29,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Channel",
                 "displayType": "textField",
                 "textField": {
                     "command": "setTvChannel"
diff --git a/json/tvocHealthConcernPresentation.json b/json/tvocHealthConcernPresentation.json
index d9804332..850870bb 100755
--- a/json/tvocHealthConcernPresentation.json
+++ b/json/tvocHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "TVOC level",
             "displayType": "state",
             "state": {
                 "label": "{{tvocHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "TVOC level",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.tvocHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/tvocMeasurementPresentation.json b/json/tvocMeasurementPresentation.json
index c5f63b42..ff610d8e 100755
--- a/json/tvocMeasurementPresentation.json
+++ b/json/tvocMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "TVOC",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "TVOC",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "tvocLevel.value",
diff --git a/json/ultravioletIndexPresentation.json b/json/ultravioletIndexPresentation.json
index 59eb1108..6af3df8a 100755
--- a/json/ultravioletIndexPresentation.json
+++ b/json/ultravioletIndexPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "UV index",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -16,7 +16,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "UV index",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "ultravioletIndex.value",
diff --git a/json/valve.json b/json/valve.json
index 06b3b794..b239c24b 100755
--- a/json/valve.json
+++ b/json/valve.json
@@ -37,11 +37,13 @@
     "commands": {
         "close": {
             "name": "close",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "open": {
             "name": "open",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/valvePresentation.json b/json/valvePresentation.json
index 1bd51868..84bb5c2c 100755
--- a/json/valvePresentation.json
+++ b/json/valvePresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "open",
-                        "value": "{{i18n.attributes.valve.i18n.value.open.label}}",
+                        "value": "Open",
                         "type": "active"
                     },
                     {
                         "key": "closed",
-                        "value": "{{i18n.attributes.valve.i18n.value.closed.label}}",
+                        "value": "Closed",
                         "type": "inactive"
                     }
                 ]
@@ -37,7 +37,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Valve",
             "displayType": "toggleSwitch",
             "toggleSwitch": {
                 "command": {
@@ -52,12 +52,12 @@
                     "alternatives": [
                         {
                             "key": "open",
-                            "value": "{{i18n.attributes.valve.i18n.value.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "closed",
-                            "value": "{{i18n.attributes.valve.i18n.value.closed.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         }
                     ]
@@ -68,18 +68,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Valve",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "open",
-                            "value": "{{i18n.attributes.valve.i18n.value.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "closed",
-                            "value": "{{i18n.attributes.valve.i18n.value.closed.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         }
                     ],
@@ -90,18 +90,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Valve",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "open",
-                            "value": "{{i18n.commands.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "close",
-                            "value": "{{i18n.commands.close.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         }
                     ]
diff --git a/json/vehicleBattery.i18n.en.json b/json/vehicleBattery.i18n.en.json
new file mode 100644
index 00000000..40c38dc9
--- /dev/null
+++ b/json/vehicleBattery.i18n.en.json
@@ -0,0 +1,89 @@
+{
+    "tag": "en",
+    "label": "Vehicle Battery",
+    "attributes": {
+        "chargingRemainTime": {
+            "label": "chargingRemainTime",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "chargingDetail": {
+            "label": "chargingDetail",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "v2xDischarge": {
+                        "label": "v2xDischarge"
+                    },
+                    "reseveredCharging": {
+                        "label": "reseveredCharging"
+                    },
+                    "v2lCharging": {
+                        "label": "v2lCharging"
+                    },
+                    "v2lDischarge": {
+                        "label": "v2lDischarge"
+                    },
+                    "v2xCharging": {
+                        "label": "v2xCharging"
+                    },
+                    "v2lStop": {
+                        "label": "v2lStop"
+                    },
+                    "noCharging": {
+                        "label": "noCharging"
+                    },
+                    "veryFastCharging": {
+                        "label": "veryFastCharging"
+                    },
+                    "fastCharging": {
+                        "label": "fastCharging"
+                    }
+                }
+            }
+        },
+        "chargingPlug": {
+            "label": "chargingPlug",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "connected": {
+                        "label": "connected"
+                    },
+                    "disconnected": {
+                        "label": "disconnected"
+                    }
+                }
+            }
+        },
+        "batteryLevel": {
+            "label": "batteryLevel",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "chargingState": {
+            "label": "chargingState",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "stopped": {
+                        "label": "stopped"
+                    },
+                    "charging": {
+                        "label": "charging"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "charge": {
+            "label": "charge",
+            "arguments": {}
+        },
+        "stop": {
+            "label": "stop",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/vehicleBattery.i18n.fr.json b/json/vehicleBattery.i18n.fr.json
new file mode 100644
index 00000000..40c38dc9
--- /dev/null
+++ b/json/vehicleBattery.i18n.fr.json
@@ -0,0 +1,89 @@
+{
+    "tag": "en",
+    "label": "Vehicle Battery",
+    "attributes": {
+        "chargingRemainTime": {
+            "label": "chargingRemainTime",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "chargingDetail": {
+            "label": "chargingDetail",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "v2xDischarge": {
+                        "label": "v2xDischarge"
+                    },
+                    "reseveredCharging": {
+                        "label": "reseveredCharging"
+                    },
+                    "v2lCharging": {
+                        "label": "v2lCharging"
+                    },
+                    "v2lDischarge": {
+                        "label": "v2lDischarge"
+                    },
+                    "v2xCharging": {
+                        "label": "v2xCharging"
+                    },
+                    "v2lStop": {
+                        "label": "v2lStop"
+                    },
+                    "noCharging": {
+                        "label": "noCharging"
+                    },
+                    "veryFastCharging": {
+                        "label": "veryFastCharging"
+                    },
+                    "fastCharging": {
+                        "label": "fastCharging"
+                    }
+                }
+            }
+        },
+        "chargingPlug": {
+            "label": "chargingPlug",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "connected": {
+                        "label": "connected"
+                    },
+                    "disconnected": {
+                        "label": "disconnected"
+                    }
+                }
+            }
+        },
+        "batteryLevel": {
+            "label": "batteryLevel",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "chargingState": {
+            "label": "chargingState",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "stopped": {
+                        "label": "stopped"
+                    },
+                    "charging": {
+                        "label": "charging"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "charge": {
+            "label": "charge",
+            "arguments": {}
+        },
+        "stop": {
+            "label": "stop",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/vehicleBattery.json b/json/vehicleBattery.json
new file mode 100644
index 00000000..e63431f6
--- /dev/null
+++ b/json/vehicleBattery.json
@@ -0,0 +1,145 @@
+{
+    "id": "vehicleBattery",
+    "version": 1,
+    "status": "proposed",
+    "name": "Vehicle Battery",
+    "ephemeral": false,
+    "attributes": {
+        "chargingRemainTime": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "PositiveInteger",
+                        "type": "integer",
+                        "minimum": 0
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "mins"
+                        ],
+                        "default": "mins"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "chargingDetail": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "VehicleChargingDetail",
+                        "type": "string",
+                        "enum": [
+                            "noCharging",
+                            "charging",
+                            "veryFastCharging",
+                            "fastCharging",
+                            "v2lDischarge",
+                            "v2lCharging",
+                            "v2lStop",
+                            "v2xDischarge",
+                            "v2xCharging",
+                            "reseveredCharging"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "chargingPlug": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "connected",
+                            "disconnected"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "batteryLevel": {
+            "schema": {
+                "title": "IntegerPercent",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 0,
+                        "maximum": 100
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "%"
+                        ],
+                        "default": "%"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "chargingState": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "charging",
+                            "stopped"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": [
+                {
+                    "command": "charge",
+                    "value": "charging"
+                },
+                {
+                    "command": "stop",
+                    "value": "stopped"
+                }
+            ]
+        }
+    },
+    "commands": {
+        "charge": {
+            "name": "charge",
+            "arguments": [],
+            "sensitive": false
+        },
+        "stop": {
+            "name": "stop",
+            "arguments": [],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/vehicleBatteryPresentation.json b/json/vehicleBatteryPresentation.json
new file mode 100644
index 00000000..f7886eee
--- /dev/null
+++ b/json/vehicleBatteryPresentation.json
@@ -0,0 +1,220 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{batteryLevel.value}} {{batteryLevel.unit}}"
+            }
+        ],
+        "actions": [
+            {
+                "displayType": "toggleSwitch",
+                "toggleSwitch": {
+                    "command": {
+                        "on": "charge",
+                        "off": "stop"
+                    },
+                    "state": {
+                        "value": "chargingState.value",
+                        "on": "charging",
+                        "off": "stopped",
+                        "valueType": "string"
+                    }
+                }
+            }
+        ],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "{{i18n.attributes.batteryLevel.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{batteryLeveL.value}}",
+                "unit": "batteryLevel.unit"
+            }
+        },
+        {
+            "label": "{{i18n.attributes.chargingState.label}}",
+            "displayType": "toggleSwitch",
+            "toggleSwitch": {
+                "command": {
+                    "on": "charge",
+                    "off": "stop"
+                },
+                "state": {
+                    "value": "chargingState.value",
+                    "valueType": "string",
+                    "on": "charging",
+                    "off": "stopped",
+                    "alternatives": [
+                        {
+                            "key": "charging",
+                            "value": "{{i18n.attributes.chargingState.i18n.value.charging.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "stopped",
+                            "value": "{{i18n.attributes.chargingState.i18n.value.stopped.label}}",
+                            "type": "inactive"
+                        }
+                    ]
+                }
+            }
+        },
+        {
+            "label": "{{i18n.attributes.chargingRemainTime.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{chargingRemainTime.value}}",
+                "unit": "chargingRemainTime.unit"
+            }
+        },
+        {
+            "label": "{{i18n.attributes.chargingDetail.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{chargingDetail.value}}",
+                "alternatives": [
+                    {
+                        "key": "noCharging",
+                        "value": "{{i18n.attributes.chargingDetail.i18n.value.noCharging.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "charging",
+                        "value": "{{i18n.attributes.chargingDetail.i18n.value.charging.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "veryFastCharging",
+                        "value": "{{i18n.attributes.chargingDetail.i18n.value.veryFastCharging.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "fastCharging",
+                        "value": "{{i18n.attributes.chargingDetail.i18n.value.fastCharging.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "v2lDischarge",
+                        "value": "{{i18n.attributes.chargingDetail.i18n.value.v2lDischarge.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "v2lCharging",
+                        "value": "{{i18n.attributes.chargingDetail.i18n.value.v2lCharging.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "v2lStop",
+                        "value": "{{i18n.attributes.chargingDetail.i18n.value.v2lStop.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "v2xDischarge",
+                        "value": "{{i18n.attributes.chargingDetail.i18n.value.v2xDischarge.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "v2xCharging",
+                        "value": "{{i18n.attributes.chargingDetail.i18n.value.v2xCharging.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "reseveredCharging",
+                        "value": "{{i18n.attributes.chargingDetail.i18n.value.reseveredCharging.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "{{i18n.attributes.chargingPlug.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{chargingPlug.value}}",
+                "alternatives": [
+                    {
+                        "key": "connected",
+                        "value": "{{i18n.attributes.chargingPlug.i18n.value.connected.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "disconnected",
+                        "value": "{{i18n.attributes.chargingPlug.i18n.value.disconnected.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "{{i18n.attributes.batteryLevel.label}}",
+                "displayType": "slider",
+                "slider": {
+                    "range": [
+                        0,
+                        100
+                    ],
+                    "unit": "batteryLevel.unit",
+                    "value": "batteryLevel.value",
+                    "valueType": "integer"
+                }
+            },
+            {
+                "label": "{{i18n.attributes.chargingState.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "charging",
+                            "value": "{{i18n.attributes.chargingState.i18n.value.charging.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "stopped",
+                            "value": "{{i18n.attributes.chargingState.i18n.value.stopped.label}}",
+                            "type": "inactive"
+                        }
+                    ],
+                    "value": "chargingState.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "{{i18n.attributes.chargingRemainTime.label}}",
+                "displayType": "numberField",
+                "numberField": {
+                    "value": "chargingRemainTime.value",
+                    "valueType": "integer",
+                    "unit": "chargingRemainTime.unit"
+                }
+            }
+        ],
+        "actions": [
+            {
+                "label": "{{i18n.commands.charge.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "charge",
+                            "value": "{{i18n.commands.charge.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "stop",
+                            "value": "{{i18n.commands.stop.label}}",
+                            "type": "inactive"
+                        }
+                    ]
+                }
+            }
+        ]
+    },
+    "id": "vehicleBattery",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/vehicleDoorState.i18n.en.json b/json/vehicleDoorState.i18n.en.json
new file mode 100644
index 00000000..697b089d
--- /dev/null
+++ b/json/vehicleDoorState.i18n.en.json
@@ -0,0 +1,106 @@
+{
+    "tag": "en",
+    "label": "Vehicle Door State",
+    "attributes": {
+        "frontLeftDoor": {
+            "label": "frontLeftDoor",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "locked": {
+                        "label": "locked"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "rearRightDoor": {
+            "label": "rearRightDoor",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "locked": {
+                        "label": "locked"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "rearLeftDoor": {
+            "label": "rearLeftDoor",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "locked": {
+                        "label": "locked"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "lockState": {
+            "label": "lockState",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "locked": {
+                        "label": "locked"
+                    },
+                    "unlocked": {
+                        "label": "unlocked"
+                    },
+                    "unknown": {
+                        "label": "unknown"
+                    }
+                }
+            }
+        },
+        "frontRightDoor": {
+            "label": "frontRightDoor",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "locked": {
+                        "label": "locked"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "unlock": {
+            "label": "unlock",
+            "arguments": {}
+        },
+        "lock": {
+            "label": "lock",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/vehicleDoorState.i18n.fr.json b/json/vehicleDoorState.i18n.fr.json
new file mode 100644
index 00000000..697b089d
--- /dev/null
+++ b/json/vehicleDoorState.i18n.fr.json
@@ -0,0 +1,106 @@
+{
+    "tag": "en",
+    "label": "Vehicle Door State",
+    "attributes": {
+        "frontLeftDoor": {
+            "label": "frontLeftDoor",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "locked": {
+                        "label": "locked"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "rearRightDoor": {
+            "label": "rearRightDoor",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "locked": {
+                        "label": "locked"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "rearLeftDoor": {
+            "label": "rearLeftDoor",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "locked": {
+                        "label": "locked"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "lockState": {
+            "label": "lockState",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "locked": {
+                        "label": "locked"
+                    },
+                    "unlocked": {
+                        "label": "unlocked"
+                    },
+                    "unknown": {
+                        "label": "unknown"
+                    }
+                }
+            }
+        },
+        "frontRightDoor": {
+            "label": "frontRightDoor",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "locked": {
+                        "label": "locked"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {
+        "unlock": {
+            "label": "unlock",
+            "arguments": {}
+        },
+        "lock": {
+            "label": "lock",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/vehicleDoorState.json b/json/vehicleDoorState.json
new file mode 100644
index 00000000..4bd30636
--- /dev/null
+++ b/json/vehicleDoorState.json
@@ -0,0 +1,159 @@
+{
+    "id": "vehicleDoorState",
+    "version": 1,
+    "status": "proposed",
+    "name": "Vehicle Door State",
+    "ephemeral": false,
+    "attributes": {
+        "frontLeftDoor": {
+            "schema": {
+                "title": "VehicleDoorState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "open",
+                            "closed",
+                            "locked"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "rearRightDoor": {
+            "schema": {
+                "title": "VehicleDoorState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "open",
+                            "closed",
+                            "locked"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "rearLeftDoor": {
+            "schema": {
+                "title": "VehicleDoorState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "open",
+                            "closed",
+                            "locked"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedAttributes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "frontLeftDoor",
+                                "frontRightDoor",
+                                "rearLeftDoor",
+                                "rearRightDoor"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "lockState": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "VehicleDoorLockState",
+                        "type": "string",
+                        "enum": [
+                            "locked",
+                            "unknown",
+                            "unlocked"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": [
+                {
+                    "command": "lock",
+                    "value": "locked"
+                },
+                {
+                    "command": "unlock",
+                    "value": "unlocked"
+                }
+            ]
+        },
+        "frontRightDoor": {
+            "schema": {
+                "title": "VehicleDoorState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "open",
+                            "closed",
+                            "locked"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "unlock": {
+            "name": "unlock",
+            "arguments": [],
+            "sensitive": false
+        },
+        "lock": {
+            "name": "lock",
+            "arguments": [],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/vehicleDoorStatePresentation.json b/json/vehicleDoorStatePresentation.json
new file mode 100644
index 00000000..e4d981d6
--- /dev/null
+++ b/json/vehicleDoorStatePresentation.json
@@ -0,0 +1,314 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{lockState.value}}",
+                "alternatives": [
+                    {
+                        "key": "locked",
+                        "value": "{{i18n.attributes.lockState.i18n.value.locked.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "unlocked",
+                        "value": "{{i18n.attributes.lockState.i18n.value.unlocked.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "unknown",
+                        "value": "{{i18n.attributes.lockState.i18n.value.unknown.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        ],
+        "actions": [
+            {
+                "displayType": "toggleSwitch",
+                "toggleSwitch": {
+                    "command": {
+                        "on": "lock",
+                        "off": "unlock"
+                    },
+                    "state": {
+                        "value": "lockState.value",
+                        "on": "locked",
+                        "off": "unlocked",
+                        "valueType": "string"
+                    }
+                }
+            }
+        ],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "{{i18n.attributes.lockState.label}}",
+            "displayType": "toggleSwitch",
+            "toggleSwitch": {
+                "command": {
+                    "on": "lock",
+                    "off": "unlock"
+                },
+                "state": {
+                    "value": "lockState.value",
+                    "valueType": "string",
+                    "on": "locked",
+                    "off": "unlocked"
+                }
+            }
+        },
+        {
+            "label": "{{i18n.attributes.frontLeftDoor.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{frontLeftDoor.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "{{i18n.attributes.frontLeftDoor.i18n.value.open.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "{{i18n.attributes.frontLeftDoor.i18n.value.closed.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "locked",
+                        "value": "{{i18n.attributes.frontLeftDoor.i18n.value.locked.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "{{i18n.attributes.frontRightDoor.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{frontRightDoor.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "{{i18n.attributes.frontRightDoor.i18n.value.open.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "{{i18n.attributes.frontRightDoor.i18n.value.closed.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "locked",
+                        "value": "{{i18n.attributes.frontRightDoor.i18n.value.locked.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "{{i18n.attributes.rearLeftDoor.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{rearLeftDoor.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "{{i18n.attributes.rearLeftDoor.i18n.value.open.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "{{i18n.attributes.rearLeftDoor.i18n.value.closed.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "locked",
+                        "value": "{{i18n.attributes.rearLeftDoor.i18n.value.locked.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "{{i18n.attributes.rearRightDoor.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{rearRightDoor.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "{{i18n.attributes.rearRightDoor.i18n.value.open.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "{{i18n.attributes.rearRightDoor.i18n.value.closed.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "locked",
+                        "value": "{{i18n.attributes.rearRightDoor.i18n.value.locked.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "{{i18n.attributes.lockState.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "locked",
+                            "value": "{{i18n.attributes.lockState.i18n.value.locked.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "unlocked",
+                            "value": "{{i18n.attributes.lockState.i18n.value.unlocked.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "unknown",
+                            "value": "{{i18n.attributes.lockState.i18n.value.unknown.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "lockState.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "{{i18n.attributes.frontLeftDoor.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "{{i18n.attributes.frontLeftDoor.i18n.value.open.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "{{i18n.attributes.frontLeftDoor.i18n.value.closed.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "locked",
+                            "value": "{{i18n.attributes.frontLeftDoor.i18n.value.locked.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "frontLeftDoor.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "{{i18n.attributes.frontRightDoor.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "{{i18n.attributes.frontRightDoor.i18n.value.open.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "{{i18n.attributes.frontRightDoor.i18n.value.closed.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "locked",
+                            "value": "{{i18n.attributes.frontRightDoor.i18n.value.locked.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "frontRightDoor.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "{{i18n.attributes.rearLeftDoor.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "{{i18n.attributes.rearLeftDoor.i18n.value.open.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "{{i18n.attributes.rearLeftDoor.i18n.value.closed.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "locked",
+                            "value": "{{i18n.attributes.rearLeftDoor.i18n.value.locked.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "rearLeftDoor.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "{{i18n.attributes.rearRightDoor.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "{{i18n.attributes.rearRightDoor.i18n.value.open.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "{{i18n.attributes.rearRightDoor.i18n.value.closed.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "locked",
+                            "value": "{{i18n.attributes.rearRightDoor.i18n.value.locked.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "rearRightDoor.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": [
+            {
+                "label": "{{i18n.attributes.lockState.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "lock",
+                            "value": "{{i18n.commands.lock.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "unlock",
+                            "value": "{{i18n.commands.unlock.label}}",
+                            "type": "active"
+                        }
+                    ]
+                }
+            }
+        ]
+    },
+    "id": "vehicleDoorState",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/vehicleEngine.json b/json/vehicleEngine.json
index 9d6b611c..9957528a 100755
--- a/json/vehicleEngine.json
+++ b/json/vehicleEngine.json
@@ -39,11 +39,13 @@
     "commands": {
         "startEngine": {
             "name": "startEngine",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "stopEngine": {
             "name": "stopEngine",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/vehicleEnginePresentation.json b/json/vehicleEnginePresentation.json
index 0b68db68..5e0ddd99 100755
--- a/json/vehicleEnginePresentation.json
+++ b/json/vehicleEnginePresentation.json
@@ -6,22 +6,22 @@
                 "alternatives": [
                     {
                         "key": "starting",
-                        "value": "{{i18n.attributes.engineState.i18n.value.starting.label}}",
+                        "value": "Starting",
                         "type": "active"
                     },
                     {
                         "key": "running",
-                        "value": "{{i18n.attributes.engineState.i18n.value.running.label}}",
+                        "value": "Running",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.engineState.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "inactive"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.engineState.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -47,7 +47,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Engine",
             "displayType": "standbyPowerSwitch",
             "standbyPowerSwitch": {
                 "command": {
@@ -62,22 +62,22 @@
                     "alternatives": [
                         {
                             "key": "starting",
-                            "value": "{{i18n.attributes.engineState.i18n.value.starting.label}}",
+                            "value": "Starting",
                             "type": "active"
                         },
                         {
                             "key": "running",
-                            "value": "{{i18n.attributes.engineState.i18n.value.running.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.engineState.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "inactive"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.engineState.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
@@ -88,28 +88,28 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Engine",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "starting",
-                            "value": "{{i18n.attributes.engineState.i18n.value.starting.label}}",
+                            "value": "Starting",
                             "type": "active"
                         },
                         {
                             "key": "running",
-                            "value": "{{i18n.attributes.engineState.i18n.value.running.label}}",
+                            "value": "Running",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.engineState.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "inactive"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.engineState.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -120,18 +120,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Engine",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "startEngine",
-                            "value": "{{i18n.commands.startEngine.label}}",
+                            "value": "Start",
                             "type": "active"
                         },
                         {
                             "key": "stopEngine",
-                            "value": "{{i18n.commands.stopEngine.label}}",
+                            "value": "Stop",
                             "type": "active"
                         }
                     ]
diff --git a/json/vehicleFuelLevelPresentation.json b/json/vehicleFuelLevelPresentation.json
index deae3747..ca958b8b 100755
--- a/json/vehicleFuelLevelPresentation.json
+++ b/json/vehicleFuelLevelPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Fuel level",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -26,7 +26,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Fuel level",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "fuelLevel.value",
diff --git a/json/vehicleHvac.i18n.en.json b/json/vehicleHvac.i18n.en.json
new file mode 100644
index 00000000..fa425edf
--- /dev/null
+++ b/json/vehicleHvac.i18n.en.json
@@ -0,0 +1,55 @@
+{
+    "tag": "en",
+    "label": "Vehicle Hvac",
+    "attributes": {
+        "temperatureRange": {
+            "label": "temperatureRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "defogState": {
+            "label": "defogState",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "off": {
+                        "label": "off"
+                    },
+                    "on": {
+                        "label": "on"
+                    }
+                }
+            }
+        },
+        "hvacSpeedRange": {
+            "label": "hvacSpeedRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "temperature": {
+            "label": "temperature",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "hvacState": {
+            "label": "hvacState",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "off": {
+                        "label": "off"
+                    },
+                    "on": {
+                        "label": "on"
+                    }
+                }
+            }
+        },
+        "hvacSpeed": {
+            "label": "hvacSpeed",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/vehicleHvac.i18n.fr.json b/json/vehicleHvac.i18n.fr.json
new file mode 100644
index 00000000..fa425edf
--- /dev/null
+++ b/json/vehicleHvac.i18n.fr.json
@@ -0,0 +1,55 @@
+{
+    "tag": "en",
+    "label": "Vehicle Hvac",
+    "attributes": {
+        "temperatureRange": {
+            "label": "temperatureRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "defogState": {
+            "label": "defogState",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "off": {
+                        "label": "off"
+                    },
+                    "on": {
+                        "label": "on"
+                    }
+                }
+            }
+        },
+        "hvacSpeedRange": {
+            "label": "hvacSpeedRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "temperature": {
+            "label": "temperature",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "hvacState": {
+            "label": "hvacState",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "off": {
+                        "label": "off"
+                    },
+                    "on": {
+                        "label": "on"
+                    }
+                }
+            }
+        },
+        "hvacSpeed": {
+            "label": "hvacSpeed",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/vehicleHvac.json b/json/vehicleHvac.json
new file mode 100644
index 00000000..34e18189
--- /dev/null
+++ b/json/vehicleHvac.json
@@ -0,0 +1,166 @@
+{
+    "id": "vehicleHvac",
+    "version": 1,
+    "status": "proposed",
+    "name": "Vehicle Hvac",
+    "ephemeral": false,
+    "attributes": {
+        "temperatureRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "title": "TemperatureValue",
+                                "type": "number",
+                                "minimum": -460,
+                                "maximum": 10000
+                            },
+                            "maximum": {
+                                "title": "TemperatureValue",
+                                "type": "number",
+                                "minimum": -460,
+                                "maximum": 10000
+                            },
+                            "step": {
+                                "title": "TemperatureValue",
+                                "type": "number",
+                                "minimum": -460,
+                                "maximum": 10000
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "F",
+                            "C"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value",
+                    "unit"
+                ]
+            },
+            "enumCommands": []
+        },
+        "defogState": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "on",
+                            "off"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "hvacSpeedRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer"
+                            },
+                            "maximum": {
+                                "type": "integer"
+                            },
+                            "step": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
+        "temperature": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "title": "TemperatureValue",
+                        "type": "number",
+                        "minimum": -460,
+                        "maximum": 10000
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "F",
+                            "C"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value",
+                    "unit"
+                ]
+            },
+            "enumCommands": []
+        },
+        "hvacState": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "on",
+                            "off"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "hvacSpeed": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/vehicleHvacPresentation.json b/json/vehicleHvacPresentation.json
new file mode 100644
index 00000000..be8fed53
--- /dev/null
+++ b/json/vehicleHvacPresentation.json
@@ -0,0 +1,141 @@
+{
+    "dashboard": {
+        "states": [
+            {
+                "label": "{{hvacState.value}}",
+                "alternatives": [
+                    {
+                        "key": "on",
+                        "value": "{{i18n.attributes.hvacState.i18n.value.on.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "off",
+                        "value": "{{i18n.attributes.hvacState.i18n.value.off.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        ],
+        "actions": [],
+        "panelItems": []
+    },
+    "detailView": [
+        {
+            "label": "{{i18n.attributes.hvacState.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{hvacState.value}}",
+                "alternatives": [
+                    {
+                        "key": "on",
+                        "value": "{{i18n.attributes.hvacState.i18n.value.on.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "off",
+                        "value": "{{i18n.attributes.hvacState.i18n.value.off.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "{{i18n.attributes.hvacSpeed.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{hvacSpeed.value}}"
+            }
+        },
+        {
+            "label": "{{i18n.attributes.temperature.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{temperature.value}}",
+                "unit": "temperature.unit"
+            }
+        },
+        {
+            "label": "{{i18n.attributes.defogState.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{defogState.value}}",
+                "alternatives": [
+                    {
+                        "key": "on",
+                        "value": "{{i18n.attributes.defogState.i18n.value.on.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "off",
+                        "value": "{{i18n.attributes.defogState.i18n.value.off.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "{{i18n.attributes.hvacState.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "on",
+                            "value": "{{i18n.attributes.hvacState.i18n.value.on.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "off",
+                            "value": "{{i18n.attributes.hvacState.i18n.value.off.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "hvacState.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "{{i18n.attributes.temperature.label}}",
+                "displayType": "slider",
+                "slider": {
+                    "range": [
+                        -20,
+                        50
+                    ],
+                    "unit": "temperature.unit",
+                    "supportedValues": "temperatureRange.value",
+                    "value": "temperature.value",
+                    "valueType": "number"
+                }
+            },
+            {
+                "label": "{{i18n.attributes.defogState.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "on",
+                            "value": "{{i18n.attributes.defogState.i18n.value.on.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "off",
+                            "value": "{{i18n.attributes.defogState.i18n.value.off.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "defogState.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": []
+    },
+    "id": "vehicleHvac",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/vehicleHvacRemoteSwitch.i18n.en.json b/json/vehicleHvacRemoteSwitch.i18n.en.json
new file mode 100644
index 00000000..a3cb90fb
--- /dev/null
+++ b/json/vehicleHvacRemoteSwitch.i18n.en.json
@@ -0,0 +1,51 @@
+{
+    "tag": "en",
+    "label": "Climate/engine control",
+    "description": "Allows for the control of a vehicle hvac by remote",
+    "attributes": {},
+    "commands": {
+        "off": {
+            "label": "Turn off Climate control/engine",
+            "description": "Turn a hvac off by remote",
+            "arguments": {}
+        },
+        "on": {
+            "label": "Turn on Climate control/engine",
+            "description": "Turn a hvac on by remote",
+            "arguments": {
+                "hvacRemote": {
+                    "i18n": {
+                        "ignitionduration description": {
+                            "label": "Ignition Duration"
+                        },
+                        "temperatureunit": {
+                            "label": "Temperature unit"
+                        },
+                        "defogon": {
+                            "label": "Turn on"
+                        },
+                        "defog description": {
+                            "label": "Defog"
+                        },
+                        "temperature description": {
+                            "label": "Temperature"
+                        },
+                        "defogoff": {
+                            "label": "Turn off"
+                        },
+                        "ignitionduration": {
+                            "label": "Engine running (min)"
+                        },
+                        "temperature": {
+                            "label": "Temperature"
+                        },
+                        "defog": {
+                            "label": "Front defrost"
+                        }
+                    },
+                    "description": "The settings to use when turning on hvac on by remote"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/vehicleHvacRemoteSwitch.i18n.fr.json b/json/vehicleHvacRemoteSwitch.i18n.fr.json
new file mode 100644
index 00000000..b5a03330
--- /dev/null
+++ b/json/vehicleHvacRemoteSwitch.i18n.fr.json
@@ -0,0 +1,51 @@
+{
+    "tag": "fr",
+    "label": "Contrôle des conditions intérieures/du moteur",
+    "description": "Allows for the control of a vehicle hvac by remote",
+    "attributes": {},
+    "commands": {
+        "off": {
+            "label": "Éteindre le contrôle de la climatisation/moteur",
+            "description": "Turn a hvac off by remote",
+            "arguments": {}
+        },
+        "on": {
+            "label": "Allumer le contrôle de la climatisation/moteur",
+            "description": "Turn a hvac on by remote",
+            "arguments": {
+                "hvacRemote": {
+                    "i18n": {
+                        "ignitionduration description": {
+                            "label": "Ignition Duration"
+                        },
+                        "temperatureunit": {
+                            "label": "Unité de température"
+                        },
+                        "defogon": {
+                            "label": "Activer"
+                        },
+                        "defog description": {
+                            "label": "Defog"
+                        },
+                        "temperature description": {
+                            "label": "Temperature"
+                        },
+                        "defogoff": {
+                            "label": "Désactiver"
+                        },
+                        "ignitionduration": {
+                            "label": "Moteur en fonctionnement (min)"
+                        },
+                        "temperature": {
+                            "label": "Température"
+                        },
+                        "defog": {
+                            "label": "Dégivrage avant"
+                        }
+                    },
+                    "description": "The settings to use when turning on hvac on by remote"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/vehicleHvacRemoteSwitch.json b/json/vehicleHvacRemoteSwitch.json
new file mode 100644
index 00000000..bcb7c096
--- /dev/null
+++ b/json/vehicleHvacRemoteSwitch.json
@@ -0,0 +1,69 @@
+{
+    "id": "vehicleHvacRemoteSwitch",
+    "version": 1,
+    "status": "proposed",
+    "name": "Vehicle Hvac Remote Switch",
+    "ephemeral": false,
+    "attributes": {},
+    "commands": {
+        "off": {
+            "name": "off",
+            "arguments": [],
+            "sensitive": false
+        },
+        "on": {
+            "name": "on",
+            "arguments": [
+                {
+                    "name": "hvacRemote",
+                    "optional": false,
+                    "schema": {
+                        "title": "HvacRemoteMap",
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "ignitionDuration": {
+                                "title": "PositiveInteger",
+                                "type": "integer",
+                                "minimum": 0
+                            },
+                            "temperature": {
+                                "title": "Temperature",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "value": {
+                                        "title": "TemperatureValue",
+                                        "type": "number",
+                                        "minimum": -460,
+                                        "maximum": 10000
+                                    },
+                                    "unit": {
+                                        "title": "TemperatureUnit",
+                                        "type": "string",
+                                        "enum": [
+                                            "F",
+                                            "C"
+                                        ]
+                                    }
+                                },
+                                "required": [
+                                    "value",
+                                    "unit"
+                                ]
+                            },
+                            "defog": {
+                                "type": "string",
+                                "enum": [
+                                    "on",
+                                    "off"
+                                ]
+                            }
+                        }
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/vehicleHvacRemoteSwitchPresentation.json b/json/vehicleHvacRemoteSwitchPresentation.json
new file mode 100644
index 00000000..99700cbd
--- /dev/null
+++ b/json/vehicleHvacRemoteSwitchPresentation.json
@@ -0,0 +1,169 @@
+{
+    "detailView": [
+        {
+            "label": "Engine running (min)",
+            "displayType": "slider",
+            "slider": {
+                "range": [
+                    0,
+                    100
+                ],
+                "alternatives": [
+                    {
+                        "key": "{{ARGUMENT_NAME}}",
+                        "value": "hvacRemote.ignitionDuration",
+                        "type": "active"
+                    }
+                ],
+                "command": "on",
+                "argumentType": "object"
+            }
+        },
+        {
+            "label": "Temperature",
+            "displayType": "slider",
+            "slider": {
+                "range": [
+                    16,
+                    30
+                ],
+                "alternatives": [
+                    {
+                        "key": "{{ARGUMENT_NAME}}",
+                        "value": "hvacRemote.temperature",
+                        "type": "active"
+                    }
+                ],
+                "command": "on",
+                "argumentType": "object"
+            }
+        },
+        {
+            "label": "Front defrost",
+            "displayType": "list",
+            "list": {
+                "command": {
+                    "name": "on",
+                    "alternatives": [
+                        {
+                            "key": "off",
+                            "value": "Turn off",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "on",
+                            "value": "Turn on",
+                            "type": "inactive"
+                        },
+                        {
+                            "key": "{{ARGUMENT_NAME}}",
+                            "value": "hvacRemote.defog",
+                            "type": "active"
+                        }
+                    ],
+                    "argumentType": "object"
+                }
+            }
+        },
+        {
+            "label": "Turn off Climate control/engine",
+            "displayType": "pushButton",
+            "pushButton": {
+                "command": "off"
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [],
+        "actions": [
+            {
+                "label": "Turn on Climate control/engine",
+                "displayType": "multiArgCommand",
+                "multiArgCommand": {
+                    "command": "on",
+                    "arguments": [
+                        {
+                            "label": "Engine running (min)",
+                            "displayType": "slider",
+                            "slider": {
+                                "range": [
+                                    2,
+                                    10
+                                ],
+                                "name": "hvacRemote.ignitionDuration",
+                                "argumentType": "integer"
+                            }
+                        },
+                        {
+                            "label": "Temperature",
+                            "displayType": "slider",
+                            "slider": {
+                                "range": [
+                                    16,
+                                    30
+                                ],
+                                "name": "hvacRemote.temperature.value",
+                                "argumentType": "number"
+                            }
+                        },
+                        {
+                            "label": "Temperature unit",
+                            "displayType": "list",
+                            "list": {
+                                "alternatives": [
+                                    {
+                                        "key": "C",
+                                        "value": "°C",
+                                        "type": "active"
+                                    },
+                                    {
+                                        "key": "F",
+                                        "value": "°F",
+                                        "type": "active"
+                                    }
+                                ],
+                                "name": "hvacRemote.temperature.unit",
+                                "argumentType": "string"
+                            }
+                        },
+                        {
+                            "label": "Front defrost",
+                            "displayType": "list",
+                            "list": {
+                                "alternatives": [
+                                    {
+                                        "key": "off",
+                                        "value": "Turn off",
+                                        "type": "inactive"
+                                    },
+                                    {
+                                        "key": "on",
+                                        "value": "Turn on",
+                                        "type": "active"
+                                    }
+                                ],
+                                "name": "hvacRemote.defog",
+                                "argumentType": "string"
+                            }
+                        }
+                    ]
+                }
+            },
+            {
+                "label": "Turn off Climate control/engine",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "off",
+                            "value": "Turn off Climate control/engine",
+                            "type": "inactive"
+                        }
+                    ]
+                }
+            }
+        ]
+    },
+    "id": "vehicleHvacRemoteSwitch",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/vehicleInformationPresentation.json b/json/vehicleInformationPresentation.json
index 9cd17b1b..edfc49d0 100755
--- a/json/vehicleInformationPresentation.json
+++ b/json/vehicleInformationPresentation.json
@@ -1,56 +1,56 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.attributes.vehicleColor.label}}",
+            "label": "Vehicle Color",
             "displayType": "state",
             "state": {
                 "label": "{{vehicleColor.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.vehicleYear.label}}",
+            "label": "Vehicle Year",
             "displayType": "state",
             "state": {
                 "label": "{{vehicleYear.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.vehicleImage.label}}",
+            "label": "Vehicle Image",
             "displayType": "state",
             "state": {
                 "label": "{{vehicleImage.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.vehicleTrim.label}}",
+            "label": "Vehicle Trim",
             "displayType": "state",
             "state": {
                 "label": "{{vehicleTrim.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.vehiclePlate.label}}",
+            "label": "Number plate",
             "displayType": "state",
             "state": {
                 "label": "{{vehiclePlate.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.vehicleModel.label}}",
+            "label": "Vehicle Model",
             "displayType": "state",
             "state": {
                 "label": "{{vehicleModel.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.vehicleId.label}}",
+            "label": "VIN",
             "displayType": "state",
             "state": {
                 "label": "{{vehicleId.value}}"
             }
         },
         {
-            "label": "{{i18n.attributes.vehicleMake.label}}",
+            "label": "Vehicle Make",
             "displayType": "state",
             "state": {
                 "label": "{{vehicleMake.value}}"
diff --git a/json/vehicleOdometer.json b/json/vehicleOdometer.json
index cbc61a8b..20b9c830 100755
--- a/json/vehicleOdometer.json
+++ b/json/vehicleOdometer.json
@@ -21,7 +21,8 @@
                             "mi",
                             "km",
                             "m"
-                        ]
+                        ],
+                        "default": "km"
                     }
                 },
                 "additionalProperties": false,
diff --git a/json/vehicleOdometerPresentation.json b/json/vehicleOdometerPresentation.json
index 0b19f6fe..cc22c84a 100755
--- a/json/vehicleOdometerPresentation.json
+++ b/json/vehicleOdometerPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Odometer",
             "displayType": "state",
             "state": {
                 "label": "{{odometerReading.value}} {{odometerReading.unit}}"
@@ -20,7 +20,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Odometer",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "odometerReading.value",
diff --git a/json/vehicleRange.json b/json/vehicleRange.json
index a2098709..dc6f0cf0 100755
--- a/json/vehicleRange.json
+++ b/json/vehicleRange.json
@@ -21,7 +21,8 @@
                             "mi",
                             "km",
                             "m"
-                        ]
+                        ],
+                        "default": "km"
                     }
                 },
                 "additionalProperties": false,
diff --git a/json/vehicleRangePresentation.json b/json/vehicleRangePresentation.json
index 21e27e56..ea13ef2b 100755
--- a/json/vehicleRangePresentation.json
+++ b/json/vehicleRangePresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Range",
             "displayType": "state",
             "state": {
                 "label": "{{estimatedRemainingRange.value}} {{estimatedRemainingRange.unit}}"
@@ -20,12 +20,16 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Range",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "estimatedRemainingRange.value",
                     "valueType": "number",
-                    "unit": "estimatedRemainingRange.unit"
+                    "unit": "estimatedRemainingRange.unit",
+                    "range": [
+                        1,
+                        4094
+                    ]
                 }
             }
         ],
diff --git a/json/vehicleTirePressureMonitorPresentation.json b/json/vehicleTirePressureMonitorPresentation.json
index 1247d25d..b1804743 100755
--- a/json/vehicleTirePressureMonitorPresentation.json
+++ b/json/vehicleTirePressureMonitorPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.tirePressureState.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "warn",
-                        "value": "{{i18n.attributes.tirePressureState.i18n.value.warn.label}}",
+                        "value": "Warning",
                         "type": "active"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Tyre pressure",
             "displayType": "state",
             "state": {
                 "label": "{{tirePressureState.value}}",
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.tirePressureState.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "warn",
-                        "value": "{{i18n.attributes.tirePressureState.i18n.value.warn.label}}",
+                        "value": "Warning",
                         "type": "active"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Tyre pressure",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.tirePressureState.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "inactive"
                         },
                         {
                             "key": "warn",
-                            "value": "{{i18n.attributes.tirePressureState.i18n.value.warn.label}}",
+                            "value": "Warning",
                             "type": "active"
                         }
                     ],
diff --git a/json/vehicleWarning.i18n.en.json b/json/vehicleWarning.i18n.en.json
new file mode 100644
index 00000000..513cdb2c
--- /dev/null
+++ b/json/vehicleWarning.i18n.en.json
@@ -0,0 +1,194 @@
+{
+    "tag": "en",
+    "label": "Warnings",
+    "description": "Get the warning state of a vehicle",
+    "attributes": {
+        "fuel": {
+            "label": "Fuel level",
+            "description": "Current warning state of the fuel",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Low fuel level"
+                    }
+                }
+            }
+        },
+        "tirePressureFrontLeft": {
+            "label": "Tyre pressure: Front left",
+            "description": "Current warning state of the tire pressure of front left",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Tyre pressure warning: Front left"
+                    }
+                }
+            }
+        },
+        "electricVehicleBattery": {
+            "label": "Vehicle battery",
+            "description": "Current warning state of the EV battery",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Low battery"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "Supported attributes",
+            "description": "List of attributes this vehicle supports",
+            "displayTemplate": "{{device.label}} supports the following attributes: {{value}}",
+            "i18n": {}
+        },
+        "lampWire": {
+            "label": "Lamp wire",
+            "description": "Current warning state of the lamp wire",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Check lamp wire"
+                    }
+                }
+            }
+        },
+        "auxiliaryBattery": {
+            "label": "Auxiliary battery",
+            "description": "Current warning state of the auxiliary battery",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Low auxiliary battery"
+                    }
+                }
+            }
+        },
+        "brakeFluid": {
+            "label": "Brake fluid",
+            "description": "Current warning state of the brake fluid",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Check brake fluid"
+                    }
+                }
+            }
+        },
+        "tirePressureFrontRight": {
+            "label": "Tyre pressure: Front right",
+            "description": "Current warning state of the pressure of front right",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Tyre pressure warning: Front right"
+                    }
+                }
+            }
+        },
+        "washerFluid": {
+            "label": "Washer fluid",
+            "description": "Current warning state of the washer fluid",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Low washer fluid"
+                    }
+                }
+            }
+        },
+        "smartKeyBattery": {
+            "label": "Smart key battery",
+            "description": "Current warning state of the smart key battery",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Low fob battery"
+                    }
+                }
+            }
+        },
+        "engineOil": {
+            "label": "Engine oil",
+            "description": "Current warning state of the engine oil",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Check engine oil"
+                    }
+                }
+            }
+        },
+        "tirePressureRearLeft": {
+            "label": "Tyre pressure: Rear left",
+            "description": "Current warning state of the pressure of rear left",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Tyre pressure warning: Rear left"
+                    }
+                }
+            }
+        },
+        "tirePressureRearRight": {
+            "label": "Tyre pressure: Rear right",
+            "description": "Current warning state of the pressure of rear right",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Tyre pressure warning: Rear right"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/vehicleWarning.i18n.fr.json b/json/vehicleWarning.i18n.fr.json
new file mode 100644
index 00000000..1c6ffcf4
--- /dev/null
+++ b/json/vehicleWarning.i18n.fr.json
@@ -0,0 +1,194 @@
+{
+    "tag": "fr",
+    "label": "Avertissements",
+    "description": "Get the warning state of a vehicle",
+    "attributes": {
+        "fuel": {
+            "label": "Niveau de carburant",
+            "description": "Current warning state of the fuel",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Niveau de carburant bas"
+                    }
+                }
+            }
+        },
+        "tirePressureFrontLeft": {
+            "label": "Pression des pneus : avant gauche",
+            "description": "Current warning state of the tire pressure of front left",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Avertissement sur la pression des pneus : avant gauche"
+                    }
+                }
+            }
+        },
+        "electricVehicleBattery": {
+            "label": "Batterie du véhicule",
+            "description": "Current warning state of the EV battery",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Batterie faible"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "Supported attributes",
+            "description": "List of attributes this vehicle supports",
+            "displayTemplate": "{{device.label}} supports the following attributes: {{value}}",
+            "i18n": {}
+        },
+        "lampWire": {
+            "label": "Câble de lampe",
+            "description": "Current warning state of the lamp wire",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Vérifier le câble de lampe"
+                    }
+                }
+            }
+        },
+        "auxiliaryBattery": {
+            "label": "Batterie auxiliaire",
+            "description": "Current warning state of the auxiliary battery",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Batterie auxiliaire faible"
+                    }
+                }
+            }
+        },
+        "brakeFluid": {
+            "label": "Liquide de freins",
+            "description": "Current warning state of the brake fluid",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Vérifier le liquide de frein"
+                    }
+                }
+            }
+        },
+        "tirePressureFrontRight": {
+            "label": "Pression des pneus : avant droit",
+            "description": "Current warning state of the pressure of front right",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Avertissement sur la pression des pneus : avant droit"
+                    }
+                }
+            }
+        },
+        "washerFluid": {
+            "label": "Liquide lave-glace",
+            "description": "Current warning state of the washer fluid",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Niveau de liquide lave-glace faible"
+                    }
+                }
+            }
+        },
+        "smartKeyBattery": {
+            "label": "Batterie de la clé intelligente",
+            "description": "Current warning state of the smart key battery",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Pile de clé faible"
+                    }
+                }
+            }
+        },
+        "engineOil": {
+            "label": "Huile de moteur",
+            "description": "Current warning state of the engine oil",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Vérifier l'huile moteur"
+                    }
+                }
+            }
+        },
+        "tirePressureRearLeft": {
+            "label": "Pression des pneus : arrière gauche",
+            "description": "Current warning state of the pressure of rear left",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Avertissement sur la pression des pneus : arrière gauche"
+                    }
+                }
+            }
+        },
+        "tirePressureRearRight": {
+            "label": "Pression des pneus : arrière droit",
+            "description": "Current warning state of the pressure of rear right",
+            "displayTemplate": "{{device.label}} {{attribute}} was {{value}}",
+            "i18n": {
+                "value": {
+                    "normal": {
+                        "label": "Normal"
+                    },
+                    "warning": {
+                        "label": "Avertissement sur la pression des pneus : arrière droit"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/vehicleWarning.json b/json/vehicleWarning.json
new file mode 100644
index 00000000..2ba18110
--- /dev/null
+++ b/json/vehicleWarning.json
@@ -0,0 +1,283 @@
+{
+    "id": "vehicleWarning",
+    "version": 1,
+    "status": "proposed",
+    "name": "Vehicle Warning",
+    "ephemeral": false,
+    "attributes": {
+        "fuel": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "tirePressureFrontLeft": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "electricVehicleBattery": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedAttributes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "VehicleWarning",
+                            "type": "string",
+                            "enum": [
+                                "fuel",
+                                "smartKeyBattery",
+                                "washerFluid",
+                                "brakeFluid",
+                                "engineOil",
+                                "lampWire",
+                                "tirePressureFrontLeft",
+                                "tirePressureFrontRight",
+                                "tirePressureRearLeft",
+                                "tirePressureRearRight",
+                                "electricVehicleBattery",
+                                "auxiliaryBattery"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "lampWire": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "auxiliaryBattery": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "brakeFluid": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "tirePressureFrontRight": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "washerFluid": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "smartKeyBattery": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "engineOil": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "tirePressureRearLeft": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "tirePressureRearRight": {
+            "schema": {
+                "title": "VehicleWarningState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "normal",
+                            "warning"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/vehicleWarningPresentation.json b/json/vehicleWarningPresentation.json
new file mode 100644
index 00000000..108a09e4
--- /dev/null
+++ b/json/vehicleWarningPresentation.json
@@ -0,0 +1,491 @@
+{
+    "detailView": [
+        {
+            "label": "Fuel level",
+            "displayType": "state",
+            "state": {
+                "label": "{{fuel.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Low fuel level",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Vehicle battery",
+            "displayType": "state",
+            "state": {
+                "label": "{{electricVehicleBattery.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Low battery",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Smart key battery",
+            "displayType": "state",
+            "state": {
+                "label": "{{smartKeyBattery.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Low fob battery",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Washer fluid",
+            "displayType": "state",
+            "state": {
+                "label": "{{washerFluid.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Low washer fluid",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Brake fluid",
+            "displayType": "state",
+            "state": {
+                "label": "{{brakeFluid.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Check brake fluid",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Engine oil",
+            "displayType": "state",
+            "state": {
+                "label": "{{engineOil.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Check engine oil",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Lamp wire",
+            "displayType": "state",
+            "state": {
+                "label": "{{lampWire.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Check lamp wire",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Tyre pressure: Front left",
+            "displayType": "state",
+            "state": {
+                "label": "{{tirePressureFrontLeft.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Tyre pressure warning: Front left",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Tyre pressure: Front right",
+            "displayType": "state",
+            "state": {
+                "label": "{{tirePressureFrontRight.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Tyre pressure warning: Front right",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Tyre pressure: Rear left",
+            "displayType": "state",
+            "state": {
+                "label": "{{tirePressureRearLeft.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Tyre pressure warning: Rear left",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Tyre pressure: Rear right",
+            "displayType": "state",
+            "state": {
+                "label": "{{tirePressureRearRight.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Tyre pressure warning: Rear right",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "Auxiliary battery",
+            "displayType": "state",
+            "state": {
+                "label": "{{auxiliaryBattery.value}}",
+                "alternatives": [
+                    {
+                        "key": "normal",
+                        "value": "Normal",
+                        "type": "active"
+                    },
+                    {
+                        "key": "warning",
+                        "value": "Low auxiliary battery",
+                        "type": "active"
+                    }
+                ]
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "Fuel level",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Low fuel level",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "fuel.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Vehicle battery",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Low battery",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "electricVehicleBattery.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Smart key battery",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Low fob battery",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "smartKeyBattery.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Washer fluid",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Low washer fluid",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "washerFluid.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Brake fluid",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Check brake fluid",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "brakeFluid.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Engine oil",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Check engine oil",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "engineOil.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Lamp wire",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Check lamp wire",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "lampWire.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Tyre pressure: Front left",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Tyre pressure warning: Front left",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "tirePressureFrontLeft.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Tyre pressure: Front right",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Tyre pressure warning: Front right",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "tirePressureFrontRight.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Tyre pressure: Rear left",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Tyre pressure warning: Rear left",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "tirePressureRearLeft.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Tyre pressure: Rear right",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Tyre pressure warning: Rear right",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "tirePressureRearRight.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "Auxiliary battery",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "normal",
+                            "value": "Normal",
+                            "type": "active"
+                        },
+                        {
+                            "key": "warning",
+                            "value": "Low auxiliary battery",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "auxiliaryBattery.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": []
+    },
+    "id": "vehicleWarning",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/vehicleWindowState.i18n.en.json b/json/vehicleWindowState.i18n.en.json
new file mode 100644
index 00000000..7537752d
--- /dev/null
+++ b/json/vehicleWindowState.i18n.en.json
@@ -0,0 +1,68 @@
+{
+    "tag": "en",
+    "label": "Vehicle Window State",
+    "attributes": {
+        "frontRightWindow": {
+            "label": "frontRightWindow",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "rearRightWindow": {
+            "label": "rearRightWindow",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "frontLeftWindow": {
+            "label": "frontLeftWindow",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "rearLeftWindow": {
+            "label": "rearLeftWindow",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/vehicleWindowState.i18n.fr.json b/json/vehicleWindowState.i18n.fr.json
new file mode 100644
index 00000000..7537752d
--- /dev/null
+++ b/json/vehicleWindowState.i18n.fr.json
@@ -0,0 +1,68 @@
+{
+    "tag": "en",
+    "label": "Vehicle Window State",
+    "attributes": {
+        "frontRightWindow": {
+            "label": "frontRightWindow",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "rearRightWindow": {
+            "label": "rearRightWindow",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "supportedAttributes": {
+            "label": "supportedAttributes",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "frontLeftWindow": {
+            "label": "frontLeftWindow",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        },
+        "rearLeftWindow": {
+            "label": "rearLeftWindow",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {
+                "value": {
+                    "closed": {
+                        "label": "closed"
+                    },
+                    "open": {
+                        "label": "open"
+                    }
+                }
+            }
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/vehicleWindowState.json b/json/vehicleWindowState.json
new file mode 100644
index 00000000..d9040ae9
--- /dev/null
+++ b/json/vehicleWindowState.json
@@ -0,0 +1,114 @@
+{
+    "id": "vehicleWindowState",
+    "version": 1,
+    "status": "proposed",
+    "name": "Vehicle Window State",
+    "ephemeral": false,
+    "attributes": {
+        "frontRightWindow": {
+            "schema": {
+                "title": "VehicleWindowState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "open",
+                            "closed"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "rearRightWindow": {
+            "schema": {
+                "title": "VehicleWindowState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "open",
+                            "closed"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedAttributes": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "frontLeftWindow",
+                                "frontRightWindow",
+                                "rearLeftWindow",
+                                "rearRightWindow"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "frontLeftWindow": {
+            "schema": {
+                "title": "VehicleWindowState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "open",
+                            "closed"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "rearLeftWindow": {
+            "schema": {
+                "title": "VehicleWindowState",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "open",
+                            "closed"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {}
+}
\ No newline at end of file
diff --git a/json/vehicleWindowStatePresentation.json b/json/vehicleWindowStatePresentation.json
new file mode 100644
index 00000000..31c83b59
--- /dev/null
+++ b/json/vehicleWindowStatePresentation.json
@@ -0,0 +1,171 @@
+{
+    "detailView": [
+        {
+            "label": "{{i18n.attributes.frontLeftWindow.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{frontLeftWindow.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "{{i18n.attributes.frontLeftWindow.i18n.value.open.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "{{i18n.attributes.frontLeftWindow.i18n.value.closed.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "{{i18n.attributes.frontRightWindow.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{frontRightWindow.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "{{i18n.attributes.frontRightWindow.i18n.value.open.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "{{i18n.attributes.frontRightWindow.i18n.value.closed.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "{{i18n.attributes.rearLeftWindow.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{rearLeftWindow.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "{{i18n.attributes.rearLeftWindow.i18n.value.open.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "{{i18n.attributes.rearLeftWindow.i18n.value.closed.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        },
+        {
+            "label": "{{i18n.attributes.rearRightWindow.label}}",
+            "displayType": "state",
+            "state": {
+                "label": "{{rearRightWindow.value}}",
+                "alternatives": [
+                    {
+                        "key": "open",
+                        "value": "{{i18n.attributes.rearRightWindow.i18n.value.open.label}}",
+                        "type": "active"
+                    },
+                    {
+                        "key": "closed",
+                        "value": "{{i18n.attributes.rearRightWindow.i18n.value.closed.label}}",
+                        "type": "active"
+                    }
+                ]
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [
+            {
+                "label": "{{i18n.attributes.frontLeftWindow.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "{{i18n.attributes.frontLeftWindow.i18n.value.open.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "{{i18n.attributes.frontLeftWindow.i18n.value.closed.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "frontLeftWindow.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "{{i18n.attributes.frontRightWindow.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "{{i18n.attributes.frontRightWindow.i18n.value.open.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "{{i18n.attributes.frontRightWindow.i18n.value.closed.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "frontRightWindow.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "{{i18n.attributes.rearLeftWindow.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "{{i18n.attributes.rearLeftWindow.i18n.value.open.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "{{i18n.attributes.rearLeftWindow.i18n.value.closed.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "rearLeftWindow.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            },
+            {
+                "label": "{{i18n.attributes.rearRightWindow.label}}",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "open",
+                            "value": "{{i18n.attributes.rearRightWindow.i18n.value.open.label}}",
+                            "type": "active"
+                        },
+                        {
+                            "key": "closed",
+                            "value": "{{i18n.attributes.rearRightWindow.i18n.value.closed.label}}",
+                            "type": "active"
+                        }
+                    ],
+                    "value": "rearRightWindow.value",
+                    "valueType": "string",
+                    "multiSelectable": false
+                }
+            }
+        ],
+        "actions": []
+    },
+    "id": "vehicleWindowState",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/veryFineDustHealthConcernPresentation.json b/json/veryFineDustHealthConcernPresentation.json
index 1a7b9476..075e3dec 100755
--- a/json/veryFineDustHealthConcernPresentation.json
+++ b/json/veryFineDustHealthConcernPresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -47,44 +47,44 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Very fine dust",
             "displayType": "state",
             "state": {
                 "label": "{{veryFineDustHealthConcern.value}}",
                 "alternatives": [
                     {
                         "key": "good",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.good.label}}",
+                        "value": "Good",
                         "type": "active"
                     },
                     {
                         "key": "moderate",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.moderate.label}}",
+                        "value": "Moderate",
                         "type": "active"
                     },
                     {
                         "key": "slightlyUnhealthy",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                        "value": "Slightly unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "unhealthy",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.unhealthy.label}}",
+                        "value": "Unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "veryUnhealthy",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.veryUnhealthy.label}}",
+                        "value": "Very unhealthy",
                         "type": "active"
                     },
                     {
                         "key": "hazardous",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.hazardous.label}}",
+                        "value": "Hazardous",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     }
                 ]
@@ -94,43 +94,43 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Very fine dust",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "good",
-                            "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.good.label}}",
+                            "value": "Good",
                             "type": "active"
                         },
                         {
                             "key": "moderate",
-                            "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.moderate.label}}",
+                            "value": "Moderate",
                             "type": "active"
                         },
                         {
                             "key": "slightlyUnhealthy",
-                            "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.slightlyUnhealthy.label}}",
+                            "value": "Slightly unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "unhealthy",
-                            "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.unhealthy.label}}",
+                            "value": "Unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "veryUnhealthy",
-                            "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.veryUnhealthy.label}}",
+                            "value": "Very unhealthy",
                             "type": "active"
                         },
                         {
                             "key": "hazardous",
-                            "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.hazardous.label}}",
+                            "value": "Hazardous",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.veryFineDustHealthConcern.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         }
                     ],
diff --git a/json/veryFineDustSensorPresentation.json b/json/veryFineDustSensorPresentation.json
index 3e499d25..2d005dd1 100755
--- a/json/veryFineDustSensorPresentation.json
+++ b/json/veryFineDustSensorPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "PM 1.0",
             "displayType": "state",
             "state": {
                 "label": "{{veryFineDustLevel.value}}",
@@ -21,7 +21,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "PM 1.0",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "veryFineDustLevel.value",
diff --git a/json/videoCamera.json b/json/videoCamera.json
index 25eea978..a1e2b01c 100755
--- a/json/videoCamera.json
+++ b/json/videoCamera.json
@@ -95,23 +95,28 @@
     "commands": {
         "mute": {
             "name": "mute",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "unmute": {
             "name": "unmute",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "flip": {
             "name": "flip",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "off": {
             "name": "off",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "on": {
             "name": "on",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/videoCameraPresentation.json b/json/videoCameraPresentation.json
index 627c6924..7434983d 100755
--- a/json/videoCameraPresentation.json
+++ b/json/videoCameraPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "on",
-                        "value": "{{i18n.attributes.camera.i18n.value.on.label}}",
+                        "value": "On",
                         "type": "active"
                     },
                     {
                         "key": "off",
-                        "value": "{{i18n.attributes.camera.i18n.value.off.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -37,7 +37,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Power",
             "displayType": "toggleSwitch",
             "toggleSwitch": {
                 "command": {
@@ -52,12 +52,12 @@
                     "alternatives": [
                         {
                             "key": "on",
-                            "value": "{{i18n.attributes.camera.i18n.value.on.label}}",
+                            "value": "On",
                             "type": "active"
                         },
                         {
                             "key": "off",
-                            "value": "{{i18n.attributes.camera.i18n.value.off.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
diff --git a/json/videoCapture.json b/json/videoCapture.json
index fc8563de..4aa3425d 100755
--- a/json/videoCapture.json
+++ b/json/videoCapture.json
@@ -87,7 +87,8 @@
                         "maxLength": 255
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/videoCapture2.i18n.en.json b/json/videoCapture2.i18n.en.json
index 5029a8af..cd2289ce 100644
--- a/json/videoCapture2.i18n.en.json
+++ b/json/videoCapture2.i18n.en.json
@@ -1,28 +1,67 @@
 {
     "tag": "en",
-    "label": "Video Capture 2",
+    "label": "Record",
+    "description": "Allows for the control of the video capture.",
     "attributes": {
         "clip": {
             "label": "clip",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "description": "Video clip details",
+            "displayTemplate": "{{device.label}} {{attribute}} was updated",
             "i18n": {}
         }
     },
     "commands": {
         "uploadComplete": {
             "label": "uploadComplete",
+            "description": "Sent by the Cloud to the device when the upload of a clip has completed",
             "arguments": {}
         },
         "capture": {
-            "label": "capture",
-            "arguments": {}
+            "label": "Record",
+            "description": "Ask the device to take a clip and upload it to ST",
+            "arguments": {
+                "duration": {
+                    "i18n": {},
+                    "description": "Duration, in seconds, of the clip to be captured"
+                },
+                "prebuffer": {
+                    "i18n": {},
+                    "description": "The amount of time to include in the clip before the capture request was received"
+                },
+                "mediaUrl": {
+                    "i18n": {},
+                    "description": "URL where the device should upload the clip to (when using tokens)"
+                },
+                "imageUrl": {
+                    "i18n": {},
+                    "description": "URL where the device should upload an attached image to"
+                },
+                "triggerId": {
+                    "i18n": {},
+                    "description": "Identify the trigger"
+                },
+                "clipId": {
+                    "i18n": {},
+                    "description": "The id of the clip to capture, if known"
+                },
+                "mediaUrlMtls": {
+                    "i18n": {},
+                    "description": "URL where the device should upload the clip to (when using client certificate)"
+                },
+                "triggerType": {
+                    "i18n": {},
+                    "description": "What triggered the capture request"
+                }
+            }
         },
         "uploadFailed": {
             "label": "uploadFailed",
+            "description": "Sent by the Cloud to the device when the upload of a clip has failed",
             "arguments": {}
         },
         "stopCapture": {
             "label": "stopCapture",
+            "description": "Stop an ongoing clip capture activity",
             "arguments": {}
         }
     }
diff --git a/json/videoCapture2.i18n.fr.json b/json/videoCapture2.i18n.fr.json
index 5029a8af..3bbf634a 100644
--- a/json/videoCapture2.i18n.fr.json
+++ b/json/videoCapture2.i18n.fr.json
@@ -1,28 +1,67 @@
 {
-    "tag": "en",
-    "label": "Video Capture 2",
+    "tag": "fr",
+    "label": "Enregistrer",
+    "description": "Allows for the control of the video capture.",
     "attributes": {
         "clip": {
             "label": "clip",
-            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "description": "Video clip details",
+            "displayTemplate": "{{device.label}} {{attribute}} was updated",
             "i18n": {}
         }
     },
     "commands": {
         "uploadComplete": {
             "label": "uploadComplete",
+            "description": "Sent by the Cloud to the device when the upload of a clip has completed",
             "arguments": {}
         },
         "capture": {
-            "label": "capture",
-            "arguments": {}
+            "label": "Enregistrer",
+            "description": "Ask the device to take a clip and upload it to ST",
+            "arguments": {
+                "duration": {
+                    "i18n": {},
+                    "description": "Duration, in seconds, of the clip to be captured"
+                },
+                "prebuffer": {
+                    "i18n": {},
+                    "description": "The amount of time to include in the clip before the capture request was received"
+                },
+                "mediaUrl": {
+                    "i18n": {},
+                    "description": "URL where the device should upload the clip to (when using tokens)"
+                },
+                "imageUrl": {
+                    "i18n": {},
+                    "description": "URL where the device should upload an attached image to"
+                },
+                "triggerId": {
+                    "i18n": {},
+                    "description": "Identify the trigger"
+                },
+                "clipId": {
+                    "i18n": {},
+                    "description": "The id of the clip to capture, if known"
+                },
+                "mediaUrlMtls": {
+                    "i18n": {},
+                    "description": "URL where the device should upload the clip to (when using client certificate)"
+                },
+                "triggerType": {
+                    "i18n": {},
+                    "description": "What triggered the capture request"
+                }
+            }
         },
         "uploadFailed": {
             "label": "uploadFailed",
+            "description": "Sent by the Cloud to the device when the upload of a clip has failed",
             "arguments": {}
         },
         "stopCapture": {
             "label": "stopCapture",
+            "description": "Stop an ongoing clip capture activity",
             "arguments": {}
         }
     }
diff --git a/json/videoCapture2.json b/json/videoCapture2.json
index b0411fde..00ef5456 100644
--- a/json/videoCapture2.json
+++ b/json/videoCapture2.json
@@ -43,6 +43,11 @@
                                 "type": "string",
                                 "pattern": "^(https?):\\/\\/((?:[a-zA-Z0-9.-]|%[0-9A-F]{2}){3,})(?::(\\d+))?((?:\\/(?:[a-zA-Z0-9-._~!$&'()*+,;=:@]|%[0-9A-F]{2})*)*)(?:\\?((?:[a-zA-Z0-9-._~!$&'()*+,;=:\\/?@]|%[0-9A-F]{2})*))?(?:#((?:[a-zA-Z0-9-._~!$&'()*+,;=:\\/?@]|%[0-9A-F]{2})*))?$"
                             },
+                            "mediaUrlMtls": {
+                                "title": "URL",
+                                "type": "string",
+                                "pattern": "^(https?):\\/\\/((?:[a-zA-Z0-9.-]|%[0-9A-F]{2}){3,})(?::(\\d+))?((?:\\/(?:[a-zA-Z0-9-._~!$&'()*+,;=:@]|%[0-9A-F]{2})*)*)(?:\\?((?:[a-zA-Z0-9-._~!$&'()*+,;=:\\/?@]|%[0-9A-F]{2})*))?(?:#((?:[a-zA-Z0-9-._~!$&'()*+,;=:\\/?@]|%[0-9A-F]{2})*))?$"
+                            },
                             "thumbUrl": {
                                 "title": "URL",
                                 "type": "string",
@@ -141,7 +146,8 @@
                         }
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "capture": {
             "name": "capture",
@@ -204,8 +210,18 @@
                     "schema": {
                         "type": "integer"
                     }
+                },
+                {
+                    "name": "mediaUrlMtls",
+                    "optional": true,
+                    "schema": {
+                        "title": "URL",
+                        "type": "string",
+                        "pattern": "^(https?):\\/\\/((?:[a-zA-Z0-9.-]|%[0-9A-F]{2}){3,})(?::(\\d+))?((?:\\/(?:[a-zA-Z0-9-._~!$&'()*+,;=:@]|%[0-9A-F]{2})*)*)(?:\\?((?:[a-zA-Z0-9-._~!$&'()*+,;=:\\/?@]|%[0-9A-F]{2})*))?(?:#((?:[a-zA-Z0-9-._~!$&'()*+,;=:\\/?@]|%[0-9A-F]{2})*))?$"
+                    }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "uploadFailed": {
             "name": "uploadFailed",
@@ -227,7 +243,8 @@
                         "type": "object"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "stopCapture": {
             "name": "stopCapture",
@@ -241,7 +258,8 @@
                         "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/videoCapture2Presentation.json b/json/videoCapture2Presentation.json
new file mode 100644
index 00000000..379e84a0
--- /dev/null
+++ b/json/videoCapture2Presentation.json
@@ -0,0 +1,31 @@
+{
+    "detailView": [
+        {
+            "label": "Video Capture 2",
+            "displayType": "pushButton",
+            "pushButton": {
+                "command": "capture"
+            }
+        }
+    ],
+    "automation": {
+        "conditions": [],
+        "actions": [
+            {
+                "label": "Video Capture 2",
+                "displayType": "list",
+                "list": {
+                    "alternatives": [
+                        {
+                            "key": "capture",
+                            "value": "___PO_CODE_CAPABILITY.SMARTTHINGS.VIDEOCAPTURE2_DEFAULT_COMMANDS_CAPTURE",
+                            "type": "active"
+                        }
+                    ]
+                }
+            }
+        ]
+    },
+    "id": "videoCapture2",
+    "version": 1
+}
\ No newline at end of file
diff --git a/json/videoCapturePresentation.json b/json/videoCapturePresentation.json
index aee9a8eb..44e9c453 100755
--- a/json/videoCapturePresentation.json
+++ b/json/videoCapturePresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Record",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "capture"
@@ -12,13 +12,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Record",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "capture",
-                            "value": "{{i18n.label}}",
+                            "value": "Record",
                             "type": "active"
                         }
                     ]
diff --git a/json/videoClips.json b/json/videoClips.json
index 581f04ca..f0f6dc89 100755
--- a/json/videoClips.json
+++ b/json/videoClips.json
@@ -88,7 +88,8 @@
                         "minimum": 0
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/videoStream.json b/json/videoStream.json
index 41f40492..51f4df76 100755
--- a/json/videoStream.json
+++ b/json/videoStream.json
@@ -62,11 +62,13 @@
     "commands": {
         "stopStream": {
             "name": "stopStream",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "startStream": {
             "name": "startStream",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/videoStreamSettings.i18n.en.json b/json/videoStreamSettings.i18n.en.json
new file mode 100644
index 00000000..122eda1a
--- /dev/null
+++ b/json/videoStreamSettings.i18n.en.json
@@ -0,0 +1,27 @@
+{
+    "tag": "en",
+    "label": "Video Stream Settings",
+    "attributes": {
+        "supportedFeatures": {
+            "label": "supportedFeatures",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "videoStreams": {
+            "label": "videoStreams",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "supportedResolutions": {
+            "label": "supportedResolutions",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setStream": {
+            "label": "setStream",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/videoStreamSettings.i18n.fr.json b/json/videoStreamSettings.i18n.fr.json
new file mode 100644
index 00000000..122eda1a
--- /dev/null
+++ b/json/videoStreamSettings.i18n.fr.json
@@ -0,0 +1,27 @@
+{
+    "tag": "en",
+    "label": "Video Stream Settings",
+    "attributes": {
+        "supportedFeatures": {
+            "label": "supportedFeatures",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "videoStreams": {
+            "label": "videoStreams",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "supportedResolutions": {
+            "label": "supportedResolutions",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "setStream": {
+            "label": "setStream",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/videoStreamSettings.json b/json/videoStreamSettings.json
new file mode 100644
index 00000000..369abe7f
--- /dev/null
+++ b/json/videoStreamSettings.json
@@ -0,0 +1,330 @@
+{
+    "id": "videoStreamSettings",
+    "version": 1,
+    "status": "proposed",
+    "name": "Video Stream Settings",
+    "ephemeral": false,
+    "attributes": {
+        "supportedFeatures": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "liveStreaming",
+                                "clipRecording",
+                                "perStreamViewports",
+                                "watermark",
+                                "onScreenDisplay"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "videoStreams": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "VideoStream",
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "streamId": {
+                                    "type": "integer"
+                                },
+                                "data": {
+                                    "type": "object",
+                                    "additionalProperties": false,
+                                    "properties": {
+                                        "label": {
+                                            "type": "string"
+                                        },
+                                        "type": {
+                                            "type": "string",
+                                            "enum": [
+                                                "liveStream",
+                                                "clipRecording"
+                                            ]
+                                        },
+                                        "resolution": {
+                                            "title": "VideoResolution",
+                                            "type": "object",
+                                            "additionalProperties": false,
+                                            "properties": {
+                                                "width": {
+                                                    "type": "integer"
+                                                },
+                                                "height": {
+                                                    "type": "integer"
+                                                },
+                                                "fps": {
+                                                    "type": "integer"
+                                                }
+                                            },
+                                            "required": [
+                                                "width",
+                                                "height"
+                                            ]
+                                        },
+                                        "viewport": {
+                                            "title": "Viewport",
+                                            "type": "object",
+                                            "additionalProperties": false,
+                                            "properties": {
+                                                "upperLeftVertex": {
+                                                    "title": "CartesianCoordinate",
+                                                    "type": "object",
+                                                    "additionalProperties": false,
+                                                    "properties": {
+                                                        "x": {
+                                                            "type": "integer"
+                                                        },
+                                                        "y": {
+                                                            "type": "integer"
+                                                        }
+                                                    },
+                                                    "required": [
+                                                        "x",
+                                                        "y"
+                                                    ]
+                                                },
+                                                "lowerRightVertex": {
+                                                    "title": "CartesianCoordinate",
+                                                    "type": "object",
+                                                    "additionalProperties": false,
+                                                    "properties": {
+                                                        "x": {
+                                                            "type": "integer"
+                                                        },
+                                                        "y": {
+                                                            "type": "integer"
+                                                        }
+                                                    },
+                                                    "required": [
+                                                        "x",
+                                                        "y"
+                                                    ]
+                                                }
+                                            },
+                                            "required": [
+                                                "upperLeftVertex",
+                                                "lowerRightVertex"
+                                            ]
+                                        },
+                                        "watermark": {
+                                            "title": "EnableState",
+                                            "type": "string",
+                                            "enum": [
+                                                "enabled",
+                                                "disabled"
+                                            ]
+                                        },
+                                        "onScreenDisplay": {
+                                            "title": "EnableState",
+                                            "type": "string",
+                                            "enum": [
+                                                "enabled",
+                                                "disabled"
+                                            ]
+                                        }
+                                    },
+                                    "required": [
+                                        "label",
+                                        "type",
+                                        "resolution"
+                                    ]
+                                }
+                            },
+                            "required": [
+                                "streamId",
+                                "data"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "supportedResolutions": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "VideoResolution",
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                },
+                                "fps": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "width",
+                                "height"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "setStream": {
+            "name": "setStream",
+            "arguments": [
+                {
+                    "name": "streamId",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer"
+                    }
+                },
+                {
+                    "name": "type",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "enum": [
+                            "liveStream",
+                            "clipRecording"
+                        ]
+                    }
+                },
+                {
+                    "name": "label",
+                    "optional": true,
+                    "schema": {
+                        "type": "string"
+                    }
+                },
+                {
+                    "name": "resolution",
+                    "optional": true,
+                    "schema": {
+                        "title": "VideoResolution",
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "width": {
+                                "type": "integer"
+                            },
+                            "height": {
+                                "type": "integer"
+                            },
+                            "fps": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "width",
+                            "height"
+                        ]
+                    }
+                },
+                {
+                    "name": "viewport",
+                    "optional": true,
+                    "schema": {
+                        "title": "Viewport",
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "upperLeftVertex": {
+                                "title": "CartesianCoordinate",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "x": {
+                                        "type": "integer"
+                                    },
+                                    "y": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "x",
+                                    "y"
+                                ]
+                            },
+                            "lowerRightVertex": {
+                                "title": "CartesianCoordinate",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "x": {
+                                        "type": "integer"
+                                    },
+                                    "y": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "x",
+                                    "y"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "upperLeftVertex",
+                            "lowerRightVertex"
+                        ]
+                    }
+                },
+                {
+                    "name": "watermark",
+                    "optional": true,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                },
+                {
+                    "name": "onScreenDisplay",
+                    "optional": true,
+                    "schema": {
+                        "title": "EnableState",
+                        "type": "string",
+                        "enum": [
+                            "enabled",
+                            "disabled"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/voltageMeasurementPresentation.json b/json/voltageMeasurementPresentation.json
index 8a797a74..bd478975 100755
--- a/json/voltageMeasurementPresentation.json
+++ b/json/voltageMeasurementPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Voltage",
             "displayType": "state",
             "state": {
                 "label": "{{voltage.value}}",
@@ -21,7 +21,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Voltage",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "voltage.value",
diff --git a/json/washerMode.json b/json/washerMode.json
index 0d143956..78deea01 100755
--- a/json/washerMode.json
+++ b/json/washerMode.json
@@ -47,7 +47,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/washerModePresentation.json b/json/washerModePresentation.json
index 990c459f..22b0e4d4 100755
--- a/json/washerModePresentation.json
+++ b/json/washerModePresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "regular",
-                        "value": "{{i18n.attributes.washerMode.i18n.value.regular.label}}",
+                        "value": "Regular",
                         "type": "active"
                     },
                     {
                         "key": "heavy",
-                        "value": "{{i18n.attributes.washerMode.i18n.value.heavy.label}}",
+                        "value": "Heavy",
                         "type": "active"
                     },
                     {
                         "key": "rinse",
-                        "value": "{{i18n.attributes.washerMode.i18n.value.rinse.label}}",
+                        "value": "Rinse",
                         "type": "active"
                     },
                     {
@@ -32,7 +32,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -40,17 +40,17 @@
                     "alternatives": [
                         {
                             "key": "regular",
-                            "value": "{{i18n.commands.setWasherMode.arguments.mode.i18n.regular.label}}",
+                            "value": "Regular",
                             "type": "active"
                         },
                         {
                             "key": "heavy",
-                            "value": "{{i18n.commands.setWasherMode.arguments.mode.i18n.heavy.label}}",
+                            "value": "Heavy",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.commands.setWasherMode.arguments.mode.i18n.rinse.label}}",
+                            "value": "Rinse",
                             "type": "active"
                         },
                         {
@@ -65,17 +65,17 @@
                     "alternatives": [
                         {
                             "key": "regular",
-                            "value": "{{i18n.attributes.washerMode.i18n.value.regular.label}}",
+                            "value": "Regular",
                             "type": "active"
                         },
                         {
                             "key": "heavy",
-                            "value": "{{i18n.attributes.washerMode.i18n.value.heavy.label}}",
+                            "value": "Heavy",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.attributes.washerMode.i18n.value.rinse.label}}",
+                            "value": "Rinse",
                             "type": "active"
                         },
                         {
@@ -91,23 +91,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "regular",
-                            "value": "{{i18n.attributes.washerMode.i18n.value.regular.label}}",
+                            "value": "Regular",
                             "type": "active"
                         },
                         {
                             "key": "heavy",
-                            "value": "{{i18n.attributes.washerMode.i18n.value.heavy.label}}",
+                            "value": "Heavy",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.attributes.washerMode.i18n.value.rinse.label}}",
+                            "value": "Rinse",
                             "type": "active"
                         },
                         {
@@ -123,23 +123,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "regular",
-                            "value": "{{i18n.commands.setWasherMode.arguments.mode.i18n.regular.label}}",
+                            "value": "Regular",
                             "type": "active"
                         },
                         {
                             "key": "heavy",
-                            "value": "{{i18n.commands.setWasherMode.arguments.mode.i18n.heavy.label}}",
+                            "value": "Heavy",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.commands.setWasherMode.arguments.mode.i18n.rinse.label}}",
+                            "value": "Rinse",
                             "type": "active"
                         },
                         {
diff --git a/json/washerOperatingState.json b/json/washerOperatingState.json
index dc2cedea..e73be667 100755
--- a/json/washerOperatingState.json
+++ b/json/washerOperatingState.json
@@ -117,7 +117,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/washerOperatingStatePresentation.json b/json/washerOperatingStatePresentation.json
index 40f7cf8a..31883936 100755
--- a/json/washerOperatingStatePresentation.json
+++ b/json/washerOperatingStatePresentation.json
@@ -6,97 +6,97 @@
                 "alternatives": [
                     {
                         "key": "airWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.airWash.label}}",
+                        "value": "Air Wash",
                         "type": "active"
                     },
                     {
                         "key": "aIRinse",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.aIRinse.label}}",
+                        "value": "AI rinse",
                         "type": "active"
                     },
                     {
                         "key": "aISpin",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.aISpin.label}}",
+                        "value": "AI spin",
                         "type": "active"
                     },
                     {
                         "key": "aIWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.aIWash.label}}",
+                        "value": "AI wash",
                         "type": "active"
                     },
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.cooling.label}}",
+                        "value": "Cooling down",
                         "type": "active"
                     },
                     {
                         "key": "delayWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.delayWash.label}}",
+                        "value": "Delay end",
                         "type": "active"
                     },
                     {
                         "key": "drying",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.drying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "finish",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.finish.label}}",
+                        "value": "Finished",
                         "type": "active"
                     },
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.none.label}}",
+                        "value": "None",
                         "type": "active"
                     },
                     {
                         "key": "preWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.wash.label}}",
+                        "value": "Wash",
                         "type": "active"
                     },
                     {
                         "key": "rinse",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.rinse.label}}",
+                        "value": "Rinse",
                         "type": "active"
                     },
                     {
                         "key": "spin",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.spin.label}}",
+                        "value": "Spin",
                         "type": "active"
                     },
                     {
                         "key": "wash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.wash.label}}",
+                        "value": "Wash",
                         "type": "active"
                     },
                     {
                         "key": "weightSensing",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.weightSensing.label}}",
+                        "value": "Checking weight",
                         "type": "active"
                     },
                     {
                         "key": "wrinklePrevent",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.wrinklePrevent.label}}",
+                        "value": "Wrinkle Prevent",
                         "type": "active"
                     },
                     {
                         "key": "freezeProtection",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.freezeProtection.label}}",
+                        "value": "Freeze protection",
                         "type": "active"
                     },
                     {
                         "key": "unableToStartOrResume",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.unableToStartOrResume.label}}",
+                        "value": "Couldn't start",
                         "type": "active"
                     },
                     {
                         "key": "unableToCompleteOperation",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.unableToCompleteOperation.label}}",
+                        "value": "Couldn't complete",
                         "type": "active"
                     },
                     {
                         "key": "commandInvalidInState",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.commandInvalidInState.label}}",
+                        "value": "Couldn't do action",
                         "type": "active"
                     }
                 ]
@@ -106,17 +106,17 @@
                 "alternatives": [
                     {
                         "key": "pause",
-                        "value": "{{i18n.attributes.machineState.i18n.value.pause.label}}",
+                        "value": "Paused",
                         "type": "active"
                     },
                     {
                         "key": "run",
-                        "value": "{{i18n.attributes.machineState.i18n.value.run.label}}",
+                        "value": "Wash",
                         "type": "active"
                     },
                     {
                         "key": "stop",
-                        "value": "{{i18n.attributes.machineState.i18n.value.stop.label}}",
+                        "value": "Stopped",
                         "type": "active"
                     }
                 ]
@@ -165,111 +165,111 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Washing machine",
             "displayType": "state",
             "state": {
                 "label": "{{washerJobState.value}}",
                 "alternatives": [
                     {
                         "key": "airWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.airWash.label}}",
+                        "value": "Air Wash",
                         "type": "active"
                     },
                     {
                         "key": "aIRinse",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.aIRinse.label}}",
+                        "value": "AI rinse",
                         "type": "active"
                     },
                     {
                         "key": "aISpin",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.aISpin.label}}",
+                        "value": "AI spin",
                         "type": "active"
                     },
                     {
                         "key": "aIWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.aIWash.label}}",
+                        "value": "AI wash",
                         "type": "active"
                     },
                     {
                         "key": "cooling",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.cooling.label}}",
+                        "value": "Cooling down",
                         "type": "active"
                     },
                     {
                         "key": "delayWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.delayWash.label}}",
+                        "value": "Delay end",
                         "type": "active"
                     },
                     {
                         "key": "drying",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.drying.label}}",
+                        "value": "Drying",
                         "type": "active"
                     },
                     {
                         "key": "finish",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.finish.label}}",
+                        "value": "Finished",
                         "type": "active"
                     },
                     {
                         "key": "none",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.none.label}}",
+                        "value": "None",
                         "type": "active"
                     },
                     {
                         "key": "preWash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.wash.label}}",
+                        "value": "Wash",
                         "type": "active"
                     },
                     {
                         "key": "rinse",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.rinse.label}}",
+                        "value": "Rinse",
                         "type": "active"
                     },
                     {
                         "key": "spin",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.spin.label}}",
+                        "value": "Spin",
                         "type": "active"
                     },
                     {
                         "key": "wash",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.wash.label}}",
+                        "value": "Wash",
                         "type": "active"
                     },
                     {
                         "key": "weightSensing",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.weightSensing.label}}",
+                        "value": "Checking weight",
                         "type": "active"
                     },
                     {
                         "key": "wrinklePrevent",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.wrinklePrevent.label}}",
+                        "value": "Wrinkle Prevent",
                         "type": "active"
                     },
                     {
                         "key": "freezeProtection",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.freezeProtection.label}}",
+                        "value": "Freeze protection",
                         "type": "active"
                     },
                     {
                         "key": "unableToStartOrResume",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.unableToStartOrResume.label}}",
+                        "value": "Couldn't start",
                         "type": "active"
                     },
                     {
                         "key": "unableToCompleteOperation",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.unableToCompleteOperation.label}}",
+                        "value": "Couldn't complete",
                         "type": "active"
                     },
                     {
                         "key": "commandInvalidInState",
-                        "value": "{{i18n.attributes.washerJobState.i18n.value.commandInvalidInState.label}}",
+                        "value": "Couldn't do action",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.machineState.label}}",
+            "label": "Device status",
             "displayType": "list",
             "list": {
                 "command": {
@@ -277,17 +277,17 @@
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.run.label}}",
+                            "value": "Wash",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.stop.label}}",
+                            "value": "Stopped",
                             "type": "active"
                         }
                     ],
@@ -300,17 +300,17 @@
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.machineState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.attributes.machineState.i18n.value.run.label}}",
+                            "value": "Wash",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.machineState.i18n.value.stop.label}}",
+                            "value": "Stopped",
                             "type": "active"
                         }
                     ]
@@ -318,7 +318,7 @@
             }
         },
         {
-            "label": "{{i18n.label}}",
+            "label": "Washing machine",
             "displayType": "state",
             "state": {
                 "label": "{{completionTime.value}}"
@@ -328,23 +328,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.machineState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.attributes.machineState.i18n.value.pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.attributes.machineState.i18n.value.run.label}}",
+                            "value": "Wash",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.attributes.machineState.i18n.value.stop.label}}",
+                            "value": "Stopped",
                             "type": "active"
                         }
                     ],
@@ -354,103 +354,103 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.washerJobState.label}}",
+                "label": "Washing machine",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "airWash",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.airWash.label}}",
+                            "value": "Air Wash",
                             "type": "active"
                         },
                         {
                             "key": "aIRinse",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.aIRinse.label}}",
+                            "value": "AI rinse",
                             "type": "active"
                         },
                         {
                             "key": "aISpin",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.aISpin.label}}",
+                            "value": "AI spin",
                             "type": "active"
                         },
                         {
                             "key": "aIWash",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.aIWash.label}}",
+                            "value": "AI wash",
                             "type": "active"
                         },
                         {
                             "key": "cooling",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.cooling.label}}",
+                            "value": "Cooling down",
                             "type": "active"
                         },
                         {
                             "key": "delayWash",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.delayWash.label}}",
+                            "value": "Delay end",
                             "type": "active"
                         },
                         {
                             "key": "drying",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.drying.label}}",
+                            "value": "Drying",
                             "type": "active"
                         },
                         {
                             "key": "finish",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.finish.label}}",
+                            "value": "Finished",
                             "type": "active"
                         },
                         {
                             "key": "none",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.none.label}}",
+                            "value": "None",
                             "type": "active"
                         },
                         {
                             "key": "preWash",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.wash.label}}",
+                            "value": "Wash",
                             "type": "active"
                         },
                         {
                             "key": "rinse",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.rinse.label}}",
+                            "value": "Rinse",
                             "type": "active"
                         },
                         {
                             "key": "spin",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.spin.label}}",
+                            "value": "Spin",
                             "type": "active"
                         },
                         {
                             "key": "wash",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.wash.label}}",
+                            "value": "Wash",
                             "type": "active"
                         },
                         {
                             "key": "weightSensing",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.weightSensing.label}}",
+                            "value": "Checking weight",
                             "type": "active"
                         },
                         {
                             "key": "wrinklePrevent",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.wrinklePrevent.label}}",
+                            "value": "Wrinkle Prevent",
                             "type": "active"
                         },
                         {
                             "key": "freezeProtection",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.freezeProtection.label}}",
+                            "value": "Freeze protection",
                             "type": "active"
                         },
                         {
                             "key": "unableToStartOrResume",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.unableToStartOrResume.label}}",
+                            "value": "Couldn't start",
                             "type": "active"
                         },
                         {
                             "key": "unableToCompleteOperation",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.unableToCompleteOperation.label}}",
+                            "value": "Couldn't complete",
                             "type": "active"
                         },
                         {
                             "key": "commandInvalidInState",
-                            "value": "{{i18n.attributes.washerJobState.i18n.value.commandInvalidInState.label}}",
+                            "value": "Couldn't do action",
                             "type": "active"
                         }
                     ],
@@ -462,23 +462,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.attributes.machineState.label}}",
+                "label": "Device status",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.pause.label}}",
+                            "value": "Paused",
                             "type": "active"
                         },
                         {
                             "key": "run",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.run.label}}",
+                            "value": "Wash",
                             "type": "active"
                         },
                         {
                             "key": "stop",
-                            "value": "{{i18n.commands.setMachineState.arguments.state.i18n.stop.label}}",
+                            "value": "Stopped",
                             "type": "active"
                         }
                     ],
diff --git a/json/washerOperationalState.json b/json/washerOperationalState.json
index 9b79bd54..882dbb96 100755
--- a/json/washerOperationalState.json
+++ b/json/washerOperationalState.json
@@ -113,7 +113,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/waterFlowAlarmPresentation.json b/json/waterFlowAlarmPresentation.json
index fdccc748..a4ba3ec5 100755
--- a/json/waterFlowAlarmPresentation.json
+++ b/json/waterFlowAlarmPresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.volumeAlarm.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "warning",
-                        "value": "{{i18n.attributes.volumeAlarm.i18n.value.warning.label}}",
+                        "value": "Warning",
                         "type": "active"
                     },
                     {
                         "key": "alarm",
-                        "value": "{{i18n.attributes.volumeAlarm.i18n.value.alarm.label}}",
+                        "value": "Critical",
                         "type": "active"
                     }
                 ]
@@ -26,17 +26,17 @@
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.durationAlarm.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "warning",
-                        "value": "{{i18n.attributes.durationAlarm.i18n.value.warning.label}}",
+                        "value": "Warning",
                         "type": "active"
                     },
                     {
                         "key": "alarm",
-                        "value": "{{i18n.attributes.durationAlarm.i18n.value.alarm.label}}",
+                        "value": "Critical",
                         "type": "active"
                     }
                 ]
@@ -46,17 +46,17 @@
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.rateAlarm.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "warning",
-                        "value": "{{i18n.attributes.rateAlarm.i18n.value.warning.label}}",
+                        "value": "Warning",
                         "type": "active"
                     },
                     {
                         "key": "alarm",
-                        "value": "{{i18n.attributes.rateAlarm.i18n.value.alarm.label}}",
+                        "value": "Critical",
                         "type": "active"
                     }
                 ]
@@ -67,72 +67,72 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.volumeAlarm.label}}",
+            "label": "Volume",
             "displayType": "state",
             "state": {
                 "label": "{{volumeAlarm.value}}",
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.volumeAlarm.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "warning",
-                        "value": "{{i18n.attributes.volumeAlarm.i18n.value.warning.label}}",
+                        "value": "Warning",
                         "type": "active"
                     },
                     {
                         "key": "alarm",
-                        "value": "{{i18n.attributes.volumeAlarm.i18n.value.alarm.label}}",
+                        "value": "Critical",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.durationAlarm.label}}",
+            "label": "Duration",
             "displayType": "state",
             "state": {
                 "label": "{{durationAlarm.value}}",
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.durationAlarm.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "warning",
-                        "value": "{{i18n.attributes.durationAlarm.i18n.value.warning.label}}",
+                        "value": "Warning",
                         "type": "active"
                     },
                     {
                         "key": "alarm",
-                        "value": "{{i18n.attributes.durationAlarm.i18n.value.alarm.label}}",
+                        "value": "Critical",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.rateAlarm.label}}",
+            "label": "Rate",
             "displayType": "state",
             "state": {
                 "label": "{{rateAlarm.value}}",
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.rateAlarm.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "warning",
-                        "value": "{{i18n.attributes.rateAlarm.i18n.value.warning.label}}",
+                        "value": "Warning",
                         "type": "active"
                     },
                     {
                         "key": "alarm",
-                        "value": "{{i18n.attributes.rateAlarm.i18n.value.alarm.label}}",
+                        "value": "Critical",
                         "type": "active"
                     }
                 ]
@@ -142,23 +142,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.volumeAlarm.label}}",
+                "label": "Volume",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.volumeAlarm.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "inactive"
                         },
                         {
                             "key": "warning",
-                            "value": "{{i18n.attributes.volumeAlarm.i18n.value.warning.label}}",
+                            "value": "Warning",
                             "type": "active"
                         },
                         {
                             "key": "alarm",
-                            "value": "{{i18n.attributes.volumeAlarm.i18n.value.alarm.label}}",
+                            "value": "Critical",
                             "type": "active"
                         }
                     ],
@@ -169,23 +169,23 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.durationAlarm.label}}",
+                "label": "Duration",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.durationAlarm.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "inactive"
                         },
                         {
                             "key": "warning",
-                            "value": "{{i18n.attributes.durationAlarm.i18n.value.warning.label}}",
+                            "value": "Warning",
                             "type": "active"
                         },
                         {
                             "key": "alarm",
-                            "value": "{{i18n.attributes.durationAlarm.i18n.value.alarm.label}}",
+                            "value": "Critical",
                             "type": "active"
                         }
                     ],
@@ -196,23 +196,23 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.rateAlarm.label}}",
+                "label": "Rate",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.rateAlarm.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "inactive"
                         },
                         {
                             "key": "warning",
-                            "value": "{{i18n.attributes.rateAlarm.i18n.value.warning.label}}",
+                            "value": "Warning",
                             "type": "active"
                         },
                         {
                             "key": "alarm",
-                            "value": "{{i18n.attributes.rateAlarm.i18n.value.alarm.label}}",
+                            "value": "Critical",
                             "type": "active"
                         }
                     ],
diff --git a/json/waterMeterPresentation.json b/json/waterMeterPresentation.json
index 6383c96b..c9bda0e6 100755
--- a/json/waterMeterPresentation.json
+++ b/json/waterMeterPresentation.json
@@ -16,7 +16,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.lastHour.label}}",
+            "label": "Last hour",
             "displayType": "state",
             "state": {
                 "label": "{{lastHour.value}}",
@@ -24,7 +24,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.lastTwentyFourHours.label}}",
+            "label": "Last 24 hours",
             "displayType": "state",
             "state": {
                 "label": "{{lastTwentyFourHours.value}}",
@@ -32,7 +32,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.lastSevenDays.label}}",
+            "label": "Last 7 days",
             "displayType": "state",
             "state": {
                 "label": "{{lastSevenDays.value}}",
@@ -43,7 +43,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.lastHour.label}}",
+                "label": "Last hour",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "lastHour.value",
@@ -56,7 +56,7 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.lastTwentyFourHours.label}}",
+                "label": "Last 24 hours",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "lastTwentyFourHours.value",
@@ -69,7 +69,7 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.lastSevenDays.label}}",
+                "label": "Last 7 days",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "lastSevenDays.value",
diff --git a/json/waterPressureMeasurementPresentation.json b/json/waterPressureMeasurementPresentation.json
index 6fa470cc..b29d6a2e 100755
--- a/json/waterPressureMeasurementPresentation.json
+++ b/json/waterPressureMeasurementPresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.pressureAlarm.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "low",
-                        "value": "{{i18n.attributes.pressureAlarm.i18n.value.low.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "high",
-                        "value": "{{i18n.attributes.pressureAlarm.i18n.value.high.label}}",
+                        "value": "High",
                         "type": "active"
                     }
                 ]
@@ -30,31 +30,31 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.pressureAlarm.label}}",
+            "label": "Pressure alarm",
             "displayType": "state",
             "state": {
                 "label": "{{pressureAlarm.value}}",
                 "alternatives": [
                     {
                         "key": "normal",
-                        "value": "{{i18n.attributes.pressureAlarm.i18n.value.normal.label}}",
+                        "value": "Normal",
                         "type": "inactive"
                     },
                     {
                         "key": "low",
-                        "value": "{{i18n.attributes.pressureAlarm.i18n.value.low.label}}",
+                        "value": "Low",
                         "type": "active"
                     },
                     {
                         "key": "high",
-                        "value": "{{i18n.attributes.pressureAlarm.i18n.value.high.label}}",
+                        "value": "High",
                         "type": "active"
                     }
                 ]
             }
         },
         {
-            "label": "{{i18n.attributes.pressure.label}}",
+            "label": "Pressure",
             "displayType": "state",
             "state": {
                 "label": "{{pressure.value}}",
@@ -65,23 +65,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.pressureAlarm.label}}",
+                "label": "Pressure alarm",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "normal",
-                            "value": "{{i18n.attributes.pressureAlarm.i18n.value.normal.label}}",
+                            "value": "Normal",
                             "type": "inactive"
                         },
                         {
                             "key": "low",
-                            "value": "{{i18n.attributes.pressureAlarm.i18n.value.low.label}}",
+                            "value": "Low",
                             "type": "active"
                         },
                         {
                             "key": "high",
-                            "value": "{{i18n.attributes.pressureAlarm.i18n.value.high.label}}",
+                            "value": "High",
                             "type": "active"
                         }
                     ],
@@ -91,7 +91,7 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.pressure.label}}",
+                "label": "Pressure",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "pressure.value",
diff --git a/json/waterSensorPresentation.json b/json/waterSensorPresentation.json
index 88072beb..af5e8369 100755
--- a/json/waterSensorPresentation.json
+++ b/json/waterSensorPresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "wet",
-                        "value": "{{i18n.attributes.water.i18n.value.wet.label}}",
+                        "value": "Wet",
                         "type": "active"
                     },
                     {
                         "key": "dry",
-                        "value": "{{i18n.attributes.water.i18n.value.dry.label}}",
+                        "value": "Dry",
                         "type": "inactive"
                     }
                 ]
@@ -22,19 +22,19 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Water sensor",
             "displayType": "state",
             "state": {
                 "label": "{{water.value}}",
                 "alternatives": [
                     {
                         "key": "wet",
-                        "value": "{{i18n.attributes.water.i18n.value.wet.label}}",
+                        "value": "Wet",
                         "type": "active"
                     },
                     {
                         "key": "dry",
-                        "value": "{{i18n.attributes.water.i18n.value.dry.label}}",
+                        "value": "Dry",
                         "type": "inactive"
                     }
                 ]
@@ -44,18 +44,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Water sensor",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "wet",
-                            "value": "{{i18n.attributes.water.i18n.value.wet.label}}",
+                            "value": "Wet",
                             "type": "active"
                         },
                         {
                             "key": "dry",
-                            "value": "{{i18n.attributes.water.i18n.value.dry.label}}",
+                            "value": "Dry",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/waterTemperatureMeasurementPresentation.json b/json/waterTemperatureMeasurementPresentation.json
index f24190d7..a4d8bc47 100644
--- a/json/waterTemperatureMeasurementPresentation.json
+++ b/json/waterTemperatureMeasurementPresentation.json
@@ -22,7 +22,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Water temperature",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -39,7 +39,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Water temperature",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "temperature.value",
diff --git a/json/waterUsageMeterPresentation.json b/json/waterUsageMeterPresentation.json
index b055e8dc..33fd025f 100755
--- a/json/waterUsageMeterPresentation.json
+++ b/json/waterUsageMeterPresentation.json
@@ -13,7 +13,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.attributes.waterUsageDay.label}}",
+            "label": "Today",
             "displayType": "state",
             "state": {
                 "label": "{{waterUsageDay.value}}",
@@ -21,7 +21,7 @@
             }
         },
         {
-            "label": "{{i18n.attributes.waterUsageMonth.label}}",
+            "label": "This month",
             "displayType": "state",
             "state": {
                 "label": "{{waterUsageMonth.value}}",
@@ -32,7 +32,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.attributes.waterUsageDay.label}}",
+                "label": "Today",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "waterUsageDay.value",
@@ -41,7 +41,7 @@
                 }
             },
             {
-                "label": "{{i18n.attributes.waterUsageMonth.label}}",
+                "label": "This month",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "waterUsageMonth.value",
diff --git a/json/webrtc.i18n.en.json b/json/webrtc.i18n.en.json
index c9c8edcb..ce8e15be 100755
--- a/json/webrtc.i18n.en.json
+++ b/json/webrtc.i18n.en.json
@@ -5,7 +5,7 @@
     "attributes": {
         "sdpAnswer": {
             "label": "live stream",
-            "description": "Signaling info for a video source",
+            "description": "Signaling info for a video source as the response to an offer",
             "displayTemplate": "{{device.label}} {{attribute}} was updated",
             "i18n": {}
         },
@@ -27,12 +27,33 @@
             "displayTemplate": "{{device.label}} {{attribute}} was updated",
             "i18n": {}
         },
+        "sdpOffer": {
+            "label": "SDP offer",
+            "description": "Signaling info for a video source as the initiator of the webrtc connection, in response to a `solicitOffer` command",
+            "displayTemplate": "{{device.label}} {{attribute}} was updated",
+            "i18n": {}
+        },
         "deviceIce": {
             "label": "ice candidate",
             "description": "An ICE candidate from the video source",
             "displayTemplate": "{{device.label}} {{attribute}} was updated",
             "i18n": {}
         },
+        "talkbackDuplex": {
+            "label": "Talkback duplex",
+            "description": "Indicates whether talkback is supported as half duplex or full duplex. Half duplex\nallows audio in one direction at a time, such as a push-to-speak service like\na buzzer into a building, or a walkie-talkie. Full duplex supports audio in both\ndirections simultaneously.\n\nThe 'audio' value in the supportedFeatures attribute is what indicates support for the talkback\nfeature as a whole.\n",
+            "displayTemplate": "{{device.label}} {{attribute}} was updated",
+            "i18n": {
+                "value": {
+                    "fullDuplex": {
+                        "label": "fullDuplex"
+                    },
+                    "halfDuplex": {
+                        "label": "halfDuplex"
+                    }
+                }
+            }
+        },
         "audioOnly": {
             "label": "audio only",
             "description": "The stream is audio only",
@@ -44,6 +65,12 @@
             "description": "URL used for STUN connection from the client",
             "displayTemplate": "{{device.label}} {{attribute}} was updated",
             "i18n": {}
+        },
+        "standbyMode": {
+            "label": "Standby mode",
+            "description": "Dynamic mode of the video source when it may be in a low power state and may not immediately accept an offer.\nIf this value is set to true, the client should solicit the offer from the device using `solicitOffer` command.\nOtherwise, if false, or if the value is absent, the device is assumed to be always ready to accept an offer and\nthe client can directly generate one and send via `sdpOffer` command.\n",
+            "displayTemplate": "{{device.label}} {{attribute}} was updated",
+            "i18n": {}
         }
     },
     "commands": {
@@ -52,6 +79,11 @@
             "description": "Start the talkback",
             "arguments": {}
         },
+        "sdpAnswer": {
+            "label": "sdpAnswer",
+            "description": "Responding to an offer from video source in standby mode",
+            "arguments": {}
+        },
         "clientIce": {
             "label": "clientIce",
             "description": "Provide an ICE candidate to the video source",
@@ -59,7 +91,12 @@
         },
         "sdpOffer": {
             "label": "sdpOffer",
-            "description": "Start the live stream",
+            "description": "Start the webrtc session establishment by sending the signaling info to the video source not in standby mode",
+            "arguments": {}
+        },
+        "solicitOffer": {
+            "label": "solicitOffer",
+            "description": "Start the webrtc session establishment by soliciting the signaling info from a video source in standby mode",
             "arguments": {}
         },
         "stopTalkback": {
diff --git a/json/webrtc.i18n.fr.json b/json/webrtc.i18n.fr.json
index cb20334e..46c1593f 100755
--- a/json/webrtc.i18n.fr.json
+++ b/json/webrtc.i18n.fr.json
@@ -5,7 +5,7 @@
     "attributes": {
         "sdpAnswer": {
             "label": "live stream",
-            "description": "Signaling info for a video source",
+            "description": "Signaling info for a video source as the response to an offer",
             "displayTemplate": "{{device.label}} {{attribute}} was updated",
             "i18n": {}
         },
@@ -27,12 +27,33 @@
             "displayTemplate": "{{device.label}} {{attribute}} was updated",
             "i18n": {}
         },
+        "sdpOffer": {
+            "label": "SDP offer",
+            "description": "Signaling info for a video source as the initiator of the webrtc connection, in response to a `solicitOffer` command",
+            "displayTemplate": "{{device.label}} {{attribute}} was updated",
+            "i18n": {}
+        },
         "deviceIce": {
             "label": "ice candidate",
             "description": "An ICE candidate from the video source",
             "displayTemplate": "{{device.label}} {{attribute}} was updated",
             "i18n": {}
         },
+        "talkbackDuplex": {
+            "label": "Talkback duplex",
+            "description": "Indicates whether talkback is supported as half duplex or full duplex. Half duplex\nallows audio in one direction at a time, such as a push-to-speak service like\na buzzer into a building, or a walkie-talkie. Full duplex supports audio in both\ndirections simultaneously.\n\nThe 'audio' value in the supportedFeatures attribute is what indicates support for the talkback\nfeature as a whole.\n",
+            "displayTemplate": "{{device.label}} {{attribute}} was updated",
+            "i18n": {
+                "value": {
+                    "fullDuplex": {
+                        "label": "fullDuplex"
+                    },
+                    "halfDuplex": {
+                        "label": "halfDuplex"
+                    }
+                }
+            }
+        },
         "audioOnly": {
             "label": "audio only",
             "description": "The stream is audio only",
@@ -44,6 +65,12 @@
             "description": "URL used for STUN connection from the client",
             "displayTemplate": "{{device.label}} {{attribute}} was updated",
             "i18n": {}
+        },
+        "standbyMode": {
+            "label": "Standby mode",
+            "description": "Dynamic mode of the video source when it may be in a low power state and may not immediately accept an offer.\nIf this value is set to true, the client should solicit the offer from the device using `solicitOffer` command.\nOtherwise, if false, or if the value is absent, the device is assumed to be always ready to accept an offer and\nthe client can directly generate one and send via `sdpOffer` command.\n",
+            "displayTemplate": "{{device.label}} {{attribute}} was updated",
+            "i18n": {}
         }
     },
     "commands": {
@@ -52,6 +79,11 @@
             "description": "Start the talkback",
             "arguments": {}
         },
+        "sdpAnswer": {
+            "label": "sdpAnswer",
+            "description": "Responding to an offer from video source in standby mode",
+            "arguments": {}
+        },
         "clientIce": {
             "label": "clientIce",
             "description": "Provide an ICE candidate to the video source",
@@ -59,7 +91,12 @@
         },
         "sdpOffer": {
             "label": "sdpOffer",
-            "description": "Start the live stream",
+            "description": "Start the webrtc session establishment by sending the signaling info to the video source not in standby mode",
+            "arguments": {}
+        },
+        "solicitOffer": {
+            "label": "solicitOffer",
+            "description": "Start the webrtc session establishment by soliciting the signaling info from a video source in standby mode",
             "arguments": {}
         },
         "stopTalkback": {
diff --git a/json/webrtc.json b/json/webrtc.json
index c38349ea..fa088a67 100755
--- a/json/webrtc.json
+++ b/json/webrtc.json
@@ -147,6 +147,34 @@
             },
             "enumCommands": []
         },
+        "sdpOffer": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "id": {
+                                "type": "string"
+                            },
+                            "sdp": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "sdp"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
         "deviceIce": {
             "schema": {
                 "type": "object",
@@ -192,6 +220,25 @@
             },
             "enumCommands": []
         },
+        "talkbackDuplex": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string",
+                        "enum": [
+                            "halfDuplex",
+                            "fullDuplex"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
         "audioOnly": {
             "schema": {
                 "type": "object",
@@ -223,6 +270,21 @@
                 ]
             },
             "enumCommands": []
+        },
+        "standbyMode": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "boolean"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
         }
     },
     "commands": {
@@ -236,7 +298,28 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
+        },
+        "sdpAnswer": {
+            "name": "sdpAnswer",
+            "arguments": [
+                {
+                    "name": "id",
+                    "optional": false,
+                    "schema": {
+                        "type": "string"
+                    }
+                },
+                {
+                    "name": "sdp",
+                    "optional": false,
+                    "schema": {
+                        "type": "string"
+                    }
+                }
+            ],
+            "sensitive": false
         },
         "clientIce": {
             "name": "clientIce",
@@ -272,7 +355,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "sdpOffer": {
             "name": "sdpOffer",
@@ -316,7 +400,46 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
+        },
+        "solicitOffer": {
+            "name": "solicitOffer",
+            "arguments": [
+                {
+                    "name": "id",
+                    "optional": false,
+                    "schema": {
+                        "type": "string"
+                    }
+                },
+                {
+                    "name": "iceServers",
+                    "optional": true,
+                    "schema": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "urls": {
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            },
+                            "username": {
+                                "type": "string"
+                            },
+                            "password": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "urls"
+                        ]
+                    }
+                }
+            ],
+            "sensitive": false
         },
         "stopTalkback": {
             "name": "stopTalkback",
@@ -328,7 +451,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "requestTurnInfo": {
             "name": "requestTurnInfo",
@@ -340,7 +464,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "end": {
             "name": "end",
@@ -352,7 +477,8 @@
                         "type": "string"
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/webrtcPresentation.json b/json/webrtcPresentation.json
index 5b57b486..ffa3f241 100755
--- a/json/webrtcPresentation.json
+++ b/json/webrtcPresentation.json
@@ -1,7 +1,7 @@
 {
     "detailView": [
         {
-            "label": "{{i18n.attributes.stunUrl.label}}",
+            "label": "STUN URL",
             "displayType": "state",
             "state": {
                 "label": "{{stunUrl.value}}"
diff --git a/json/wifiInformation.json b/json/wifiInformation.json
index fc2d2173..3c1b3fd8 100644
--- a/json/wifiInformation.json
+++ b/json/wifiInformation.json
@@ -21,7 +21,8 @@
                                 "WPA2-PSK",
                                 "EAP",
                                 "SAE",
-                                "OWE"
+                                "OWE",
+                                "FT-PSK"
                             ]
                         }
                     }
diff --git a/json/wifiMeshRouter.json b/json/wifiMeshRouter.json
index 45fe5432..542ebc09 100755
--- a/json/wifiMeshRouter.json
+++ b/json/wifiMeshRouter.json
@@ -154,19 +154,23 @@
     "commands": {
         "enableWifiGuestNetwork": {
             "name": "enableWifiGuestNetwork",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "disableWifiNetwork": {
             "name": "disableWifiNetwork",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "enableWifiNetwork": {
             "name": "enableWifiNetwork",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "disableWifiGuestNetwork": {
             "name": "disableWifiGuestNetwork",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/windMode.json b/json/windMode.json
index 4bc437fb..54d4f9b8 100755
--- a/json/windMode.json
+++ b/json/windMode.json
@@ -45,7 +45,6 @@
                     "value"
                 ]
             },
-            "setter": "setWindMode",
             "enumCommands": []
         }
     },
@@ -66,7 +65,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/json/windModePresentation.json b/json/windModePresentation.json
index 456d11af..f82b3a8d 100755
--- a/json/windModePresentation.json
+++ b/json/windModePresentation.json
@@ -6,17 +6,17 @@
                 "alternatives": [
                     {
                         "key": "sleepWind",
-                        "value": "{{i18n.attributes.windMode.i18n.value.sleepWind.label}}",
+                        "value": "Sleep wind",
                         "type": "active"
                     },
                     {
                         "key": "naturalWind",
-                        "value": "{{i18n.attributes.windMode.i18n.value.naturalWind.label}}",
+                        "value": "Natural wind",
                         "type": "active"
                     },
                     {
                         "key": "noWind",
-                        "value": "{{i18n.attributes.windMode.i18n.value.noWind.label}}",
+                        "value": "Off",
                         "type": "inactive"
                     }
                 ]
@@ -45,7 +45,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Wind mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -53,17 +53,17 @@
                     "alternatives": [
                         {
                             "key": "sleepWind",
-                            "value": "{{i18n.commands.setWindMode.arguments.windMode.i18n.sleepWind.label}}",
+                            "value": "Sleep wind",
                             "type": "active"
                         },
                         {
                             "key": "naturalWind",
-                            "value": "{{i18n.commands.setWindMode.arguments.windMode.i18n.naturalWind.label}}",
+                            "value": "Natural wind",
                             "type": "active"
                         },
                         {
                             "key": "noWind",
-                            "value": "{{i18n.commands.setWindMode.arguments.windMode.i18n.noWind.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -76,17 +76,17 @@
                     "alternatives": [
                         {
                             "key": "sleepWind",
-                            "value": "{{i18n.attributes.windMode.i18n.value.sleepWind.label}}",
+                            "value": "Sleep wind",
                             "type": "active"
                         },
                         {
                             "key": "naturalWind",
-                            "value": "{{i18n.attributes.windMode.i18n.value.naturalWind.label}}",
+                            "value": "Natural wind",
                             "type": "active"
                         },
                         {
                             "key": "noWind",
-                            "value": "{{i18n.attributes.windMode.i18n.value.noWind.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ]
@@ -97,23 +97,23 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Wind mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "sleepWind",
-                            "value": "{{i18n.attributes.windMode.i18n.value.sleepWind.label}}",
+                            "value": "Sleep wind",
                             "type": "active"
                         },
                         {
                             "key": "naturalWind",
-                            "value": "{{i18n.attributes.windMode.i18n.value.naturalWind.label}}",
+                            "value": "Natural wind",
                             "type": "active"
                         },
                         {
                             "key": "noWind",
-                            "value": "{{i18n.attributes.windMode.i18n.value.noWind.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
@@ -126,23 +126,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Wind mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "sleepWind",
-                            "value": "{{i18n.commands.setWindMode.arguments.windMode.i18n.sleepWind.label}}",
+                            "value": "Sleep wind",
                             "type": "active"
                         },
                         {
                             "key": "naturalWind",
-                            "value": "{{i18n.commands.setWindMode.arguments.windMode.i18n.naturalWind.label}}",
+                            "value": "Natural wind",
                             "type": "active"
                         },
                         {
                             "key": "noWind",
-                            "value": "{{i18n.commands.setWindMode.arguments.windMode.i18n.noWind.label}}",
+                            "value": "Off",
                             "type": "inactive"
                         }
                     ],
diff --git a/json/windSpeedPresentation.json b/json/windSpeedPresentation.json
index bcabf4ec..54fb6419 100755
--- a/json/windSpeedPresentation.json
+++ b/json/windSpeedPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Wind speed",
             "displayType": "state",
             "state": {
                 "label": "{{windspeed.value}}",
@@ -21,7 +21,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Wind speed",
                 "displayType": "numberField",
                 "numberField": {
                     "value": "windspeed.value",
diff --git a/json/windowShade.json b/json/windowShade.json
index 8d082845..0d3b8525 100755
--- a/json/windowShade.json
+++ b/json/windowShade.json
@@ -64,15 +64,18 @@
     "commands": {
         "close": {
             "name": "close",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "open": {
             "name": "open",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         },
         "pause": {
             "name": "pause",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/windowShadeLevel.json b/json/windowShadeLevel.json
index a601624b..05afbb75 100755
--- a/json/windowShadeLevel.json
+++ b/json/windowShadeLevel.json
@@ -45,7 +45,8 @@
                         "maximum": 100
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/windowShadeLevelPresentation.json b/json/windowShadeLevelPresentation.json
index 9549edf9..9901dac1 100755
--- a/json/windowShadeLevelPresentation.json
+++ b/json/windowShadeLevelPresentation.json
@@ -15,7 +15,7 @@
         "actions": [],
         "panelItems": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Shade level",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -37,7 +37,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Shade level",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -55,7 +55,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Shade level",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -70,7 +70,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Shade level",
                 "displayType": "slider",
                 "slider": {
                     "range": [
diff --git a/json/windowShadePresentation.json b/json/windowShadePresentation.json
index 9a8ec2c0..61eff5ff 100755
--- a/json/windowShadePresentation.json
+++ b/json/windowShadePresentation.json
@@ -6,37 +6,37 @@
                 "alternatives": [
                     {
                         "key": "closed",
-                        "value": "{{i18n.attributes.windowShade.i18n.value.closed.label}}",
+                        "value": "Closed",
                         "type": "inactive"
                     },
                     {
                         "key": "open",
-                        "value": "{{i18n.attributes.windowShade.i18n.value.open.label}}",
+                        "value": "Open",
                         "type": "active"
                     },
                     {
                         "key": "unknown",
-                        "value": "{{i18n.attributes.windowShade.i18n.value.unknown.label}}",
+                        "value": "Unknown",
                         "type": "active"
                     },
                     {
                         "key": "opening",
-                        "value": "{{i18n.attributes.windowShade.i18n.value.opening.label}}",
+                        "value": "Opening…",
                         "type": "active"
                     },
                     {
                         "key": "closing",
-                        "value": "{{i18n.attributes.windowShade.i18n.value.closing.label}}",
+                        "value": "Closing…",
                         "type": "inactive"
                     },
                     {
                         "key": "partially open",
-                        "value": "{{i18n.attributes.windowShade.i18n.value.partially open.label}}",
+                        "value": "Partially open",
                         "type": "active"
                     },
                     {
                         "key": "pause",
-                        "value": "{{i18n.commands.pause.label}}",
+                        "value": "Pause",
                         "type": "inactive"
                     }
                 ]
@@ -58,22 +58,22 @@
                         "alternatives": [
                             {
                                 "key": "unknown",
-                                "value": "{{i18n.attributes.windowShade.i18n.value.unknown.label}}",
+                                "value": "Unknown",
                                 "type": "active"
                             },
                             {
                                 "key": "opening",
-                                "value": "{{i18n.attributes.windowShade.i18n.value.opening.label}}",
+                                "value": "Opening…",
                                 "type": "active"
                             },
                             {
                                 "key": "closing",
-                                "value": "{{i18n.attributes.windowShade.i18n.value.closing.label}}",
+                                "value": "Closing…",
                                 "type": "inactive"
                             },
                             {
                                 "key": "partially open",
-                                "value": "{{i18n.attributes.windowShade.i18n.value.partially open.label}}",
+                                "value": "Partially open",
                                 "type": "active"
                             }
                         ]
@@ -83,7 +83,7 @@
         ],
         "panelItems": [
             {
-                "label": "{{i18n.commands.open.label}}",
+                "label": "Open",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "open",
@@ -99,7 +99,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.close.label}}",
+                "label": "Close",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "close",
@@ -115,7 +115,7 @@
                 }
             },
             {
-                "label": "{{i18n.commands.pause.label}}",
+                "label": "Pause",
                 "displayType": "pushButton",
                 "pushButton": {
                     "command": "pause",
@@ -134,24 +134,24 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Window shade",
             "displayType": "list",
             "list": {
                 "command": {
                     "alternatives": [
                         {
                             "key": "close",
-                            "value": "{{i18n.commands.close.label}}",
+                            "value": "Close",
                             "type": "inactive"
                         },
                         {
                             "key": "open",
-                            "value": "{{i18n.commands.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         }
                     ],
@@ -163,37 +163,37 @@
                     "alternatives": [
                         {
                             "key": "closed",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.closed.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         },
                         {
                             "key": "open",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "unknown",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.unknown.label}}",
+                            "value": "Unknown",
                             "type": "active"
                         },
                         {
                             "key": "opening",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.opening.label}}",
+                            "value": "Opening…",
                             "type": "active"
                         },
                         {
                             "key": "closing",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.closing.label}}",
+                            "value": "Closing…",
                             "type": "inactive"
                         },
                         {
                             "key": "partially open",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.partially open.label}}",
+                            "value": "Partially open",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause",
                             "type": "inactive"
                         }
                     ]
@@ -204,33 +204,33 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Window shade",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "closed",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.closed.label}}",
+                            "value": "Closed",
                             "type": "inactive"
                         },
                         {
                             "key": "closing",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.closing.label}}",
+                            "value": "Closing…",
                             "type": "inactive"
                         },
                         {
                             "key": "open",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "opening",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.opening.label}}",
+                            "value": "Opening…",
                             "type": "active"
                         },
                         {
                             "key": "partially open",
-                            "value": "{{i18n.attributes.windowShade.i18n.value.partially open.label}}",
+                            "value": "Partially open",
                             "type": "active"
                         }
                     ],
@@ -242,23 +242,23 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Window shade",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "close",
-                            "value": "{{i18n.commands.close.label}}",
+                            "value": "Close",
                             "type": "inactive"
                         },
                         {
                             "key": "open",
-                            "value": "{{i18n.commands.open.label}}",
+                            "value": "Open",
                             "type": "active"
                         },
                         {
                             "key": "pause",
-                            "value": "{{i18n.commands.pause.label}}",
+                            "value": "Pause",
                             "type": "active"
                         }
                     ],
diff --git a/json/windowShadePreset.i18n.en.json b/json/windowShadePreset.i18n.en.json
index bd5f3176..68662a8e 100755
--- a/json/windowShadePreset.i18n.en.json
+++ b/json/windowShadePreset.i18n.en.json
@@ -2,8 +2,26 @@
     "tag": "en",
     "label": "Preset position",
     "description": "Allows for the control of the preset of a window shade.",
-    "attributes": {},
+    "attributes": {
+        "supportedCommands": {
+            "label": "Supported commands",
+            "description": "List of commands this device supports",
+            "displayTemplate": "{{device.label}} supports the following commands: {{value}}",
+            "i18n": {}
+        },
+        "position": {
+            "label": "Preset position",
+            "description": "A number that represents the preset position level as a function of being preset position, ``0-100`` in percent; 0 representing completely closed, and 100 representing completely open.",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}%",
+            "i18n": {}
+        }
+    },
     "commands": {
+        "setPresetPosition": {
+            "label": "Set preset position",
+            "description": "Set a preset position level",
+            "arguments": {}
+        },
         "presetPosition": {
             "label": "Preset position",
             "description": "Open window shade to a preset position",
diff --git a/json/windowShadePreset.i18n.fr.json b/json/windowShadePreset.i18n.fr.json
index adeeaf33..f23d8b89 100755
--- a/json/windowShadePreset.i18n.fr.json
+++ b/json/windowShadePreset.i18n.fr.json
@@ -2,8 +2,26 @@
     "tag": "fr",
     "label": "Position préréglée",
     "description": "Allows for the control of the preset of a window shade.",
-    "attributes": {},
+    "attributes": {
+        "supportedCommands": {
+            "label": "Supported commands",
+            "description": "List of commands this device supports",
+            "displayTemplate": "{{device.label}} supports the following commands: {{value}}",
+            "i18n": {}
+        },
+        "position": {
+            "label": "Position préréglée",
+            "description": "A number that represents the preset position level as a function of being preset position, ``0-100`` in percent; 0 representing completely closed, and 100 representing completely open.",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}%",
+            "i18n": {}
+        }
+    },
     "commands": {
+        "setPresetPosition": {
+            "label": "Set preset position",
+            "description": "Set a preset position level",
+            "arguments": {}
+        },
         "presetPosition": {
             "label": "Position préréglée",
             "description": "Open window shade to a preset position",
diff --git a/json/windowShadePreset.json b/json/windowShadePreset.json
index 27c81432..ec66a594 100755
--- a/json/windowShadePreset.json
+++ b/json/windowShadePreset.json
@@ -4,11 +4,77 @@
     "status": "live",
     "name": "Window Shade Preset",
     "ephemeral": false,
-    "attributes": {},
+    "attributes": {
+        "supportedCommands": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "WindowShadePresetCommand",
+                            "type": "string",
+                            "enum": [
+                                "presetPosition",
+                                "setPresetPosition"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "position": {
+            "schema": {
+                "title": "IntegerPercent",
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 0,
+                        "maximum": 100
+                    },
+                    "unit": {
+                        "type": "string",
+                        "enum": [
+                            "%"
+                        ],
+                        "default": "%"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setPresetPosition",
+            "enumCommands": []
+        }
+    },
     "commands": {
+        "setPresetPosition": {
+            "name": "setPresetPosition",
+            "arguments": [
+                {
+                    "name": "position",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": 0,
+                        "maximum": 100
+                    }
+                }
+            ],
+            "sensitive": false
+        },
         "presetPosition": {
             "name": "presetPosition",
-            "arguments": []
+            "arguments": [],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/windowShadePresetPresentation.json b/json/windowShadePresetPresentation.json
index f81eed8b..a7af8408 100755
--- a/json/windowShadePresetPresentation.json
+++ b/json/windowShadePresetPresentation.json
@@ -13,7 +13,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Preset position",
             "displayType": "pushButton",
             "pushButton": {
                 "command": "presetPosition"
@@ -24,13 +24,13 @@
         "conditions": [],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Preset position",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "presetPosition",
-                            "value": "{{i18n.label}}",
+                            "value": "Preset position",
                             "type": "active"
                         }
                     ]
diff --git a/json/windowShadeTiltLevel.json b/json/windowShadeTiltLevel.json
index 030d42b3..f897d577 100755
--- a/json/windowShadeTiltLevel.json
+++ b/json/windowShadeTiltLevel.json
@@ -45,7 +45,8 @@
                         "maximum": 100
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/windowShadeTiltLevelPresentation.json b/json/windowShadeTiltLevelPresentation.json
index 3571ff25..7b74a450 100755
--- a/json/windowShadeTiltLevelPresentation.json
+++ b/json/windowShadeTiltLevelPresentation.json
@@ -10,7 +10,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Window shade tilt level",
             "displayType": "slider",
             "slider": {
                 "range": [
@@ -28,7 +28,7 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Window shade tilt level",
                 "displayType": "slider",
                 "slider": {
                     "range": [
@@ -43,7 +43,7 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Window shade tilt level",
                 "displayType": "slider",
                 "slider": {
                     "range": [
diff --git a/json/wirelessOperatingMode.json b/json/wirelessOperatingMode.json
index d0e4ab6a..02af48b1 100755
--- a/json/wirelessOperatingMode.json
+++ b/json/wirelessOperatingMode.json
@@ -41,7 +41,8 @@
                         ]
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file
diff --git a/json/wirelessOperatingModePresentation.json b/json/wirelessOperatingModePresentation.json
index 746eaae3..fd8eba3f 100755
--- a/json/wirelessOperatingModePresentation.json
+++ b/json/wirelessOperatingModePresentation.json
@@ -6,12 +6,12 @@
                 "alternatives": [
                     {
                         "key": "alwaysOn",
-                        "value": "{{i18n.attributes.wirelessOperatingMode.i18n.value.alwaysOn.label}}",
+                        "value": "Always on",
                         "type": "active"
                     },
                     {
                         "key": "whenNeeded",
-                        "value": "{{i18n.attributes.wirelessOperatingMode.i18n.value.whenNeeded.label}}",
+                        "value": "When needed",
                         "type": "active"
                     }
                 ]
@@ -22,7 +22,7 @@
     },
     "detailView": [
         {
-            "label": "{{i18n.label}}",
+            "label": "Wireless operating mode",
             "displayType": "list",
             "list": {
                 "command": {
@@ -30,12 +30,12 @@
                     "alternatives": [
                         {
                             "key": "alwaysOn",
-                            "value": "{{i18n.commands.setWirelessOperatingMode.arguments.wirelessOperatingMode.i18n.alwaysOn.label}}",
+                            "value": "Always on",
                             "type": "active"
                         },
                         {
                             "key": "whenNeeded",
-                            "value": "{{i18n.commands.setWirelessOperatingMode.arguments.wirelessOperatingMode.i18n.whenNeeded.label}}",
+                            "value": "When needed",
                             "type": "active"
                         }
                     ]
@@ -45,12 +45,12 @@
                     "alternatives": [
                         {
                             "key": "alwaysOn",
-                            "value": "{{i18n.attributes.wirelessOperatingMode.i18n.value.alwaysOn.label}}",
+                            "value": "Always on",
                             "type": "active"
                         },
                         {
                             "key": "whenNeeded",
-                            "value": "{{i18n.attributes.wirelessOperatingMode.i18n.value.whenNeeded.label}}",
+                            "value": "When needed",
                             "type": "active"
                         }
                     ]
@@ -61,18 +61,18 @@
     "automation": {
         "conditions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Wireless operating mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "alwaysOn",
-                            "value": "{{i18n.attributes.wirelessOperatingMode.i18n.value.alwaysOn.label}}",
+                            "value": "Always on",
                             "type": "active"
                         },
                         {
                             "key": "whenNeeded",
-                            "value": "{{i18n.attributes.wirelessOperatingMode.i18n.value.whenNeeded.label}}",
+                            "value": "When needed",
                             "type": "active"
                         }
                     ],
@@ -83,18 +83,18 @@
         ],
         "actions": [
             {
-                "label": "{{i18n.label}}",
+                "label": "Wireless operating mode",
                 "displayType": "list",
                 "list": {
                     "alternatives": [
                         {
                             "key": "alwaysOn",
-                            "value": "{{i18n.commands.setWirelessOperatingMode.arguments.wirelessOperatingMode.i18n.alwaysOn.label}}",
+                            "value": "Always on",
                             "type": "active"
                         },
                         {
                             "key": "whenNeeded",
-                            "value": "{{i18n.commands.setWirelessOperatingMode.arguments.wirelessOperatingMode.i18n.whenNeeded.label}}",
+                            "value": "When needed",
                             "type": "active"
                         }
                     ],
diff --git a/json/zoneManagement.i18n.en.json b/json/zoneManagement.i18n.en.json
new file mode 100644
index 00000000..05959021
--- /dev/null
+++ b/json/zoneManagement.i18n.en.json
@@ -0,0 +1,67 @@
+{
+    "tag": "en",
+    "label": "Zone Management",
+    "attributes": {
+        "supportedFeatures": {
+            "label": "supportedFeatures",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "maxZones": {
+            "label": "maxZones",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "sensitivity": {
+            "label": "sensitivity",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "zones": {
+            "label": "zones",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "triggers": {
+            "label": "triggers",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "sensitivityRange": {
+            "label": "sensitivityRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "triggeredZones": {
+            "label": "triggeredZones",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "removeTrigger": {
+            "label": "removeTrigger",
+            "arguments": {}
+        },
+        "newZone": {
+            "label": "newZone",
+            "arguments": {}
+        },
+        "setSensitivity": {
+            "label": "setSensitivity",
+            "arguments": {}
+        },
+        "updateZone": {
+            "label": "updateZone",
+            "arguments": {}
+        },
+        "removeZone": {
+            "label": "removeZone",
+            "arguments": {}
+        },
+        "createOrUpdateTrigger": {
+            "label": "createOrUpdateTrigger",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/zoneManagement.i18n.fr.json b/json/zoneManagement.i18n.fr.json
new file mode 100644
index 00000000..05959021
--- /dev/null
+++ b/json/zoneManagement.i18n.fr.json
@@ -0,0 +1,67 @@
+{
+    "tag": "en",
+    "label": "Zone Management",
+    "attributes": {
+        "supportedFeatures": {
+            "label": "supportedFeatures",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "maxZones": {
+            "label": "maxZones",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "sensitivity": {
+            "label": "sensitivity",
+            "displayTemplate": "{{attribute}} of {{device.label}} is {{value}}",
+            "i18n": {}
+        },
+        "zones": {
+            "label": "zones",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "triggers": {
+            "label": "triggers",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "sensitivityRange": {
+            "label": "sensitivityRange",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        },
+        "triggeredZones": {
+            "label": "triggeredZones",
+            "displayTemplate": "{{attribute}} of {{device.label}} was updated",
+            "i18n": {}
+        }
+    },
+    "commands": {
+        "removeTrigger": {
+            "label": "removeTrigger",
+            "arguments": {}
+        },
+        "newZone": {
+            "label": "newZone",
+            "arguments": {}
+        },
+        "setSensitivity": {
+            "label": "setSensitivity",
+            "arguments": {}
+        },
+        "updateZone": {
+            "label": "updateZone",
+            "arguments": {}
+        },
+        "removeZone": {
+            "label": "removeZone",
+            "arguments": {}
+        },
+        "createOrUpdateTrigger": {
+            "label": "createOrUpdateTrigger",
+            "arguments": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/zoneManagement.json b/json/zoneManagement.json
new file mode 100644
index 00000000..5f757dcf
--- /dev/null
+++ b/json/zoneManagement.json
@@ -0,0 +1,484 @@
+{
+    "id": "zoneManagement",
+    "version": 1,
+    "status": "proposed",
+    "name": "Zone Management",
+    "ephemeral": false,
+    "attributes": {
+        "supportedFeatures": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "string",
+                            "enum": [
+                                "perZoneSensitivity",
+                                "triggerAugmentation"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "maxZones": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "sensitivity": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "integer",
+                        "minimum": 1,
+                        "maximum": 10
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "setter": "setSensitivity",
+            "enumCommands": []
+        },
+        "zones": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "Zone",
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "name": {
+                                    "type": "string"
+                                },
+                                "type": {
+                                    "type": "string",
+                                    "enum": [
+                                        "2DCartesian"
+                                    ]
+                                },
+                                "polygonVertices": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "object",
+                                        "additionalProperties": false,
+                                        "properties": {
+                                            "vertex": {
+                                                "title": "CartesianCoordinate",
+                                                "type": "object",
+                                                "additionalProperties": false,
+                                                "properties": {
+                                                    "x": {
+                                                        "type": "integer"
+                                                    },
+                                                    "y": {
+                                                        "type": "integer"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "x",
+                                                    "y"
+                                                ]
+                                            }
+                                        },
+                                        "required": [
+                                            "vertex"
+                                        ]
+                                    }
+                                },
+                                "source": {
+                                    "type": "string",
+                                    "enum": [
+                                        "manufacturer",
+                                        "user"
+                                    ]
+                                },
+                                "use": {
+                                    "type": "string",
+                                    "enum": [
+                                        "motion",
+                                        "privacy",
+                                        "focus"
+                                    ]
+                                },
+                                "color": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "name",
+                                "type",
+                                "polygonVertices",
+                                "source",
+                                "use"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "triggers": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "title": "ZoneTrigger",
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "zoneId": {
+                                    "type": "integer"
+                                },
+                                "initialDuration": {
+                                    "type": "integer"
+                                },
+                                "augmentationDuration": {
+                                    "type": "integer"
+                                },
+                                "maxDuration": {
+                                    "type": "integer"
+                                },
+                                "blindDuration": {
+                                    "type": "integer"
+                                },
+                                "sensitivity": {
+                                    "type": "integer",
+                                    "minimum": 1,
+                                    "maximum": 10
+                                }
+                            },
+                            "required": [
+                                "zoneId",
+                                "initialDuration"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        },
+        "sensitivityRange": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "minimum": {
+                                "type": "integer",
+                                "minimum": 1,
+                                "maximum": 9
+                            },
+                            "maximum": {
+                                "type": "integer",
+                                "minimum": 2,
+                                "maximum": 10
+                            }
+                        },
+                        "required": [
+                            "minimum",
+                            "maximum"
+                        ]
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "value"
+                ]
+            },
+            "enumCommands": []
+        },
+        "triggeredZones": {
+            "schema": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "zoneId": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "zoneId"
+                            ]
+                        }
+                    }
+                },
+                "additionalProperties": false,
+                "required": []
+            },
+            "enumCommands": []
+        }
+    },
+    "commands": {
+        "removeTrigger": {
+            "name": "removeTrigger",
+            "arguments": [
+                {
+                    "name": "zoneId",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer"
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "newZone": {
+            "name": "newZone",
+            "arguments": [
+                {
+                    "name": "name",
+                    "optional": false,
+                    "schema": {
+                        "type": "string"
+                    }
+                },
+                {
+                    "name": "polygonVertices",
+                    "optional": false,
+                    "schema": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "value": {
+                                    "title": "CartesianCoordinate",
+                                    "type": "object",
+                                    "additionalProperties": false,
+                                    "properties": {
+                                        "x": {
+                                            "type": "integer"
+                                        },
+                                        "y": {
+                                            "type": "integer"
+                                        }
+                                    },
+                                    "required": [
+                                        "x",
+                                        "y"
+                                    ]
+                                }
+                            },
+                            "required": [
+                                "value"
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "use",
+                    "optional": false,
+                    "schema": {
+                        "type": "string",
+                        "enum": [
+                            "motion",
+                            "privacy",
+                            "focus"
+                        ]
+                    }
+                },
+                {
+                    "name": "color",
+                    "optional": true,
+                    "schema": {
+                        "type": "string"
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "setSensitivity": {
+            "name": "setSensitivity",
+            "arguments": [
+                {
+                    "name": "sensitivity",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": 1,
+                        "maximum": 10
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "updateZone": {
+            "name": "updateZone",
+            "arguments": [
+                {
+                    "name": "zoneId",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer"
+                    }
+                },
+                {
+                    "name": "name",
+                    "optional": true,
+                    "schema": {
+                        "type": "string"
+                    }
+                },
+                {
+                    "name": "polygonVertices",
+                    "optional": true,
+                    "schema": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "value": {
+                                    "title": "CartesianCoordinate",
+                                    "type": "object",
+                                    "additionalProperties": false,
+                                    "properties": {
+                                        "x": {
+                                            "type": "integer"
+                                        },
+                                        "y": {
+                                            "type": "integer"
+                                        }
+                                    },
+                                    "required": [
+                                        "x",
+                                        "y"
+                                    ]
+                                }
+                            },
+                            "required": [
+                                "value"
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "use",
+                    "optional": true,
+                    "schema": {
+                        "type": "string",
+                        "enum": [
+                            "motion",
+                            "privacy",
+                            "focus"
+                        ]
+                    }
+                },
+                {
+                    "name": "color",
+                    "optional": true,
+                    "schema": {
+                        "type": "string"
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "removeZone": {
+            "name": "removeZone",
+            "arguments": [
+                {
+                    "name": "zoneId",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer"
+                    }
+                }
+            ],
+            "sensitive": false
+        },
+        "createOrUpdateTrigger": {
+            "name": "createOrUpdateTrigger",
+            "arguments": [
+                {
+                    "name": "zoneId",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer"
+                    }
+                },
+                {
+                    "name": "initialDuration",
+                    "optional": false,
+                    "schema": {
+                        "type": "integer"
+                    }
+                },
+                {
+                    "name": "augmentationDuration",
+                    "optional": true,
+                    "schema": {
+                        "type": "integer"
+                    }
+                },
+                {
+                    "name": "maxDuration",
+                    "optional": true,
+                    "schema": {
+                        "type": "integer"
+                    }
+                },
+                {
+                    "name": "blindDuration",
+                    "optional": true,
+                    "schema": {
+                        "type": "integer"
+                    }
+                },
+                {
+                    "name": "sensitivity",
+                    "optional": true,
+                    "schema": {
+                        "type": "integer",
+                        "minimum": 1,
+                        "maximum": 10
+                    }
+                }
+            ],
+            "sensitive": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/json/zwMultichannel.json b/json/zwMultichannel.json
index 452dccc9..4c737257 100755
--- a/json/zwMultichannel.json
+++ b/json/zwMultichannel.json
@@ -1,7 +1,7 @@
 {
     "id": "zwMultichannel",
     "version": 1,
-    "status": "live",
+    "status": "deprecated",
     "name": "Zw Multichannel",
     "ephemeral": false,
     "attributes": {
@@ -49,7 +49,8 @@
                         "maxLength": 255
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         },
         "epCmd": {
             "name": "epCmd",
@@ -71,7 +72,8 @@
                         "maxLength": 255
                     }
                 }
-            ]
+            ],
+            "sensitive": false
         }
     }
 }
\ No newline at end of file