diff --git a/custom_components/heishamon/definitions.py b/custom_components/heishamon/definitions.py
index 99604df..fdcaf7e 100644
--- a/custom_components/heishamon/definitions.py
+++ b/custom_components/heishamon/definitions.py
@@ -219,19 +219,19 @@ def update_device_model(
         key="panasonic_heat_pump/main/Main_Inlet_Temp",
         name="Aquarea Inlet Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Main_Outlet_Temp",
         name="Aquarea Outlet Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Main_Target_Temp",
         name="Aquarea Outlet Target Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Compressor_Freq",
@@ -244,13 +244,13 @@ def update_device_model(
         key="panasonic_heat_pump/main/DHW_Target_Temp",
         name="Aquarea Tank Set Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/DHW_Temp",
         name="Aquarea Tank Actual Tank Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     HeishaMonSensorEntityDescription(
@@ -272,7 +272,7 @@ def update_device_model(
         key="panasonic_heat_pump/main/Outside_Temp",
         name="Aquarea Outdoor Ambient",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     HeishaMonSensorEntityDescription(
@@ -307,13 +307,13 @@ def update_device_model(
         key="panasonic_heat_pump/main/Outside_Pipe_Temp",
         name="Aquarea Outdoor Pipe Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Z1_Heat_Request_Temp",
         name="Aquarea Heatshift Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/DHW_Energy_Production",
@@ -340,43 +340,43 @@ def update_device_model(
         key="panasonic_heat_pump/main/Main_Hex_Outlet_Temp",
         name="Aquarea Main HEX Outlet Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Discharge_Temp",
         name="Aquarea Discharge Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Inside_Pipe_Temp",
         name="Aquarea Inside Pipe Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Defrost_Temp",
         name="Aquarea Defrost Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Eva_Outlet_Temp",
         name="Aquarea Eva Outlet Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Bypass_Outlet_Temp",
         name="Aquarea Bypass Outlet Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Ipm_Temp",
         name="Aquarea Ipm Temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement="C°",
+        native_unit_of_measurement="°C",
     ),
     HeishaMonSensorEntityDescription(
         key="panasonic_heat_pump/main/Fan1_Motor_Speed",