diff --git a/custom_components/solvis_control/translations/en.json b/custom_components/solvis_control/translations/en.json
index 3f481a5..ebfb46d 100644
--- a/custom_components/solvis_control/translations/en.json
+++ b/custom_components/solvis_control/translations/en.json
@@ -15,7 +15,7 @@
 				"title": "Device release version & others",
 				"description": "Select your software release",
 				"data":{
-					"device_version": "Device version",
+					"device_version": "Device Version",
 					"poll_rate_default": "Poll rate (standard) - in sec",
 					"poll_rate_slow": "Poll rate (slow) - in sec"
 				}
@@ -37,7 +37,7 @@
 		}
 	},
 	"options":{
-		"flow_title":"Solvis setup",
+		"flow_title":"Solvis Setup",
 		"step":{
 			"init":{
 				"title": "Basic setup",
@@ -69,7 +69,7 @@
 			}
 		},
 		"error":{
-			"cannot_connect":"Connection error",
+			"cannot_connect":"Connection Error",
 			"poll_rate_invalid": "POLL_RATE_SLOW has to be a multiple of POLL_RATE_DEFAULT"
 		}
 	},
@@ -97,7 +97,7 @@
 				"name":"HKR1 heating curve reduced mode"
 			},
 			"hkr1_heizkurve_steilheit":{
-				"name":"HKR1 heating curve steepness"
+				"name":"HKR1  Heating Curve Steepness"
 			},
 			"hkr2_fix_vorlauf_tag":{
 				"name":"HKR2 fix flow mode day"
@@ -106,19 +106,19 @@
 				"name":"HKR2 fix flow mode night"
 			},
 			"hkr2_heizkurve_temp_tag_1":{
-				"name":"HKR2 heating curve day temp 1"
+				"name":"HKR2 Heating Curve Day Temp 1"
 			},
 			"hkr2_heizkurve_temp_tag_2":{
-				"name":"HKR2 heating curve day temp 2"
+				"name":"HKR2 Heating Curve Day Temp2"
 			},
 			"hkr2_heizkurve_temp_tag_3":{
-				"name":"HKR2 heating curve day temp 3"
+				"name":"HKR2 Heating Curve Day Temp 3"
 			},
 			"hkr2_heizkurve_temp_absenkung":{
 				"name":"HKR2 heating curve reduced mode"
 			},
 			"hkr2_heizkurve_steilheit":{
-				"name":"HKR2 heating curve steepness"
+				"name":"HKR2 Heating Curve Steepness"
 			},
 			"hkr3_fix_vorlauf_tag":{
 				"name":"HKR3 fix flow mode day"
@@ -127,19 +127,19 @@
 				"name":"HKR3 fix flow mode night"
 			},
 			"hkr3_heizkurve_temp_tag_1":{
-				"name":"HKR3 heating curve day temp 1"
+				"name":"HKR3 Heating Curve Day Temp 1"
 			},
 			"hkr3_heizkurve_temp_tag_2":{
-				"name":"HKR3 heating curve day temp 2"
+				"name":"HKR3 Heating Curve Day Temp 2"
 			},
 			"hkr3_heizkurve_temp_tag_3":{
-				"name":"HKR3 heating curve day temp 3"
+				"name":"HKR3 Heating Curve Day Temp 3"
 			},
 			"hkr3_heizkurve_temp_absenkung":{
 				"name":"HKR3 heating curve reduced mode"
 			},
 			"hkr3_heizkurve_steilheit":{
-				"name":"HKR3 heating curve steepness"
+				"name":"HKR3 Heating Curve Steepness"
 			}
 		},
 		"select":{
@@ -147,7 +147,7 @@
 				"name":"HKR 1 operating mode",
 				"state":{
 					"2":"automatic",
-					"3":"day mode",
+					"3":"Day Mode",
 					"4":"night reduced mode",
 					"5":"stand by",
 					"6":"eco",
@@ -181,21 +181,21 @@
 			"hkr1_vorlaufart":{
 				"name":"HKR1 flow mode",
 				"state":{
-					"0":"heating curve",
+					"0":"Heating Curve",
 					"1":"fixed"
 				}
 			},
 			"hkr2_vorlaufart":{
 				"name":"HKR2 flow mode",
 				"state":{
-					"0":"heating curve",
+					"0":"Heating Curve",
 					"1":"fixed"
 				}
 			},
 			"hkr3_vorlaufart":{
 				"name":"HKR3 flow mode",
 				"state":{
-					"0":"heating curve",
+					"0":"Heating Curve",
 					"1":"fixed"
 				}
 			},
@@ -266,22 +266,22 @@
 				"name":"ionization current"
 			},
 			"a01_pumpe_zirkulation":{
-				"name":"A01 pump circulation"
+				"name":"A01 Circulation Pump"
 			},
 			"a02_pumpe_warmwasser":{
-				"name":"A02 pump warm water"
+				"name":"A02 Warm Water Pump"
 			},
 			"a03_pumpe_hkr1":{
-				"name":"A03.pump HKR1"
+				"name":"A03 HKR1 Pump"
 			},
 			"a04_pumpe_hkr2":{
-				"name":"A04.pump HKR2"
+				"name":"A04 HKR2 Pump"
 			},
 			"a05_pumpe_hkr3":{
-				"name":"A05.pump HKR3"
+				"name":"A05 HKR3 Pump"
 			},
 			"a12_brennerstatus":{
-				"name":"A12.burner status"
+				"name":"A12 Burner Status"
 			},
 			"solar_water_flow":{
 				"name":"solar flow rate"
@@ -302,7 +302,7 @@
 				"name":"heat pump output"
 			},
 			"raumtemperatur_hkr3":{
-				"name":"HKR3 room temp"
+				"name":"HKR3 Room Temp"
 			},
 			"raumtemperatur_hkr1":{
 				"name":"HKR1 room temp"