diff --git a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
index adf47071a..e92394721 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
+++ b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/i18n/vitotronic.properties
@@ -52,7 +52,7 @@ thing-type.vitotronic.pump.label = Pump
 thing-type.vitotronic.pump.description = Single pump
 thing-type.vitotronic.solar.label = Solar Heating
 thing-type.vitotronic.solar.description = Solar water heating (SWH): Convert sunlight into energy for water heating
-thing-type.vitotronic.storagetank.label = Hotwater Storagetank
+thing-type.vitotronic.storagetank.label = Hot Water Storage Tank
 thing-type.vitotronic.storagetank.description = Storage Tank, stores heat in a water tank on 3 levels: bottom, middle, top=hot water
 thing-type.vitotronic.temperaturesensor.label = Temperature Sensor
 thing-type.vitotronic.temperaturesensor.description = Single temperature sensor
@@ -68,15 +68,15 @@ thing-type.config.vitotronic.bridge.ipAddress.description = The IP address of th
 thing-type.config.vitotronic.bridge.port.label = Adapter Port
 thing-type.config.vitotronic.bridge.port.description = Port of the LAN gateway
 thing-type.config.vitotronic.bridge.refreshInterval.label = Refresh Interval
-thing-type.config.vitotronic.bridge.refreshInterval.description = Refreshtime in seconds.
+thing-type.config.vitotronic.bridge.refreshInterval.description = Refresh interval in seconds.
 
 # channel types
 
 channel-type.vitotronic.actualpower.label = Actual Power Level
 channel-type.vitotronic.actualpower.description = Actual power of the burner
-channel-type.vitotronic.airshutter_prim.label = Primary Airshutter
+channel-type.vitotronic.airshutter_prim.label = Primary Air Shutter
 channel-type.vitotronic.airshutter_prim.description = Position of the primary air shutter
-channel-type.vitotronic.airshutter_sec.label = Secondary Airshutter
+channel-type.vitotronic.airshutter_sec.label = Secondary Air Shutter
 channel-type.vitotronic.airshutter_sec.description = Position of the secondary air shutter
 channel-type.vitotronic.boiler_temp.label = Boiler
 channel-type.vitotronic.boiler_temp.description = Temperature sensor of boiler (fireplace)
@@ -93,15 +93,19 @@ channel-type.vitotronic.consumedoil.description = Consumed Oil since start of he
 channel-type.vitotronic.consumedpellets.label = Consumed Pellets
 channel-type.vitotronic.consumedpellets.description = Consumed Pellets since start of heating in tons
 channel-type.vitotronic.currentmode.label = Current Mode
-channel-type.vitotronic.currentmode.description = Current functionnal mode
+channel-type.vitotronic.currentmode.description = Current functional mode
+channel-type.vitotronic.currentmode.state.option.0 = Standby Operation
+channel-type.vitotronic.currentmode.state.option.1 = Reduced Operation
+channel-type.vitotronic.currentmode.state.option.2 = Normal Operation
+channel-type.vitotronic.currentmode.state.option.3 = Continuous Normal Operation
 channel-type.vitotronic.error.label = Errors
 channel-type.vitotronic.error.description = True, if errors for the burner exists
 channel-type.vitotronic.exhaust_temp.label = Exhaust Temperature
 channel-type.vitotronic.exhaust_temp.description = Actual temperature of the exhaust
 channel-type.vitotronic.fanspeed.label = Fan Speed
-channel-type.vitotronic.fanspeed.description = Fan Speed in rpm
+channel-type.vitotronic.fanspeed.description = Fan speed in rpm
 channel-type.vitotronic.fanspeed_target.label = Target Fan Speed
-channel-type.vitotronic.fanspeed_target.description = Fan Speed in rpm
+channel-type.vitotronic.fanspeed_target.description = Target fan speed in rpm
 channel-type.vitotronic.flame_temp.label = Flame
 channel-type.vitotronic.flame_temp.description = Temperature of flame
 channel-type.vitotronic.flow_temp.label = Flow
@@ -112,8 +116,8 @@ channel-type.vitotronic.gradient.label = Gradient
 channel-type.vitotronic.gradient.description = The gradient relative to outside temperature
 channel-type.vitotronic.hotwater_temp.label = Hot Water
 channel-type.vitotronic.hotwater_temp.description = Temperature sensor of the hot water
-channel-type.vitotronic.hotwater_temp_setpoint.label = Hotwater TempSet
-channel-type.vitotronic.hotwater_temp_setpoint.description = Set the hot water temperature
+channel-type.vitotronic.hotwater_temp_setpoint.label = Hot Water Set Point
+channel-type.vitotronic.hotwater_temp_setpoint.description = Set the hot water temperature set point
 channel-type.vitotronic.lambdasensor.label = Lambdasensor (O2)
 channel-type.vitotronic.lambdasensor.description = Oxygen content of the exhaust air
 channel-type.vitotronic.loadsuppression.label = Load Suppression
@@ -122,42 +126,44 @@ channel-type.vitotronic.malfunction.label = Heating Malfunction
 channel-type.vitotronic.malfunction.description = General Malfunction state of the heating
 channel-type.vitotronic.middle_temp.label = Middle
 channel-type.vitotronic.middle_temp.description = Temperature sensor in the middle of the storage tank
-channel-type.vitotronic.niveau.label = Niveau
-channel-type.vitotronic.niveau.description = The niveau relative to outside temperature
+channel-type.vitotronic.niveau.label = Level
+channel-type.vitotronic.niveau.description = The level relative to outside temperature
 channel-type.vitotronic.ontime.label = On Time
-channel-type.vitotronic.ontime.description = Ontime in hours
+channel-type.vitotronic.ontime.description = On time in hours
 channel-type.vitotronic.ontimelevel1.label = On Time Level 1
-channel-type.vitotronic.ontimelevel1.description = Ontime in hours
+channel-type.vitotronic.ontimelevel1.description = On time in hours
 channel-type.vitotronic.ontimelevel2.label = On Time Level 2
-channel-type.vitotronic.ontimelevel2.description = Ontime in hours
-channel-type.vitotronic.operationmode.label = Operationmode
-channel-type.vitotronic.operationmode.description = Operationmode
+channel-type.vitotronic.ontimelevel2.description = On time in hours
+channel-type.vitotronic.operationmode.label = Operation Mode
+channel-type.vitotronic.operationmode.description = Operation mode
 channel-type.vitotronic.outside_temp.label = Outside Temperature
 channel-type.vitotronic.outside_temp.description = Outside temperature sensor
-channel-type.vitotronic.party_temp_setpoint.label = Partymode TempSet
+channel-type.vitotronic.party_temp_setpoint.label = Party Mode Temperature Set Point
 channel-type.vitotronic.party_temp_setpoint.description = Target temperature of party mode
-channel-type.vitotronic.partymode.label = Partymode
-channel-type.vitotronic.partymode.description = Partymode on/off
+channel-type.vitotronic.partymode.label = Party Mode
+channel-type.vitotronic.partymode.description = Party mode on/off
 channel-type.vitotronic.powerlevel.label = Power Level
 channel-type.vitotronic.producedheat.label = Produced Heat
 channel-type.vitotronic.producedheat.description = Produced heat since starting solar system
 channel-type.vitotronic.pump.label = Pump
 channel-type.vitotronic.pump.description = Pump state
-channel-type.vitotronic.room_temp.label = Room Temp
+channel-type.vitotronic.room_temp.label = Room Temperature
 channel-type.vitotronic.room_temp.description = Temperature of rooms
-channel-type.vitotronic.room_temp_setpoint.label = Room TempSet
+channel-type.vitotronic.room_temp_setpoint.label = Room Temperature Set Point
 channel-type.vitotronic.room_temp_setpoint.description = Target temperature of rooms
-channel-type.vitotronic.save_temp_setpoint.label = Savemode TempSet
+channel-type.vitotronic.save_temp_setpoint.label = Save Mode Temperature Set Point
 channel-type.vitotronic.save_temp_setpoint.description = Target temperature of save mode
-channel-type.vitotronic.savemode.label = Savemode
-channel-type.vitotronic.savemode.description = Savemode on/off
+channel-type.vitotronic.savemode.label = Save Mode
+channel-type.vitotronic.savemode.description = Save mode on/off
 channel-type.vitotronic.starts.label = Starts
 channel-type.vitotronic.starts.description = Count of starts
-channel-type.vitotronic.storagetank_temp.label = Storagetank
+channel-type.vitotronic.storagetank_temp.label = Storage Tank
 channel-type.vitotronic.storagetank_temp.description = Actual temperature of the storage tank (solar sensor)
-channel-type.vitotronic.systemtime.label = DateTime of the Heating System
+channel-type.vitotronic.systemtime.label = DateTime Heating System
+channel-type.vitotronic.systemtime.description = Date and time of the Heating System
 channel-type.vitotronic.temperature.label = Temperature
 channel-type.vitotronic.temperature.description = Generic temperature sensor
-channel-type.vitotronic.timer.label = Timer for Heating or Warm Water
+channel-type.vitotronic.timer.label = Timer
+channel-type.vitotronic.timer.description = Timer for Heating or Warm Water
 channel-type.vitotronic.valve.label = Valve
 channel-type.vitotronic.valve.description = Value of a generic valve
diff --git a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/bridge.xml
index 32a243eaa..188483328 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/bridge.xml
@@ -28,7 +28,7 @@
 			<parameter name="refreshInterval" type="integer" required="false" min="60" max="600">
 				<context>refresh</context>
 				<label>Refresh Interval</label>
-				<description>Refreshtime in seconds.</description>
+				<description>Refresh interval in seconds.</description>
 				<default>300</default>
 			</parameter>
 		</config-description>
diff --git a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml
index 97a9a5e7f..379258e8f 100644
--- a/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.vitotronic/src/main/resources/OH-INF/thing/thing-types.xml
@@ -89,7 +89,7 @@
 			<bridge-type-ref id="bridge"/>
 		</supported-bridge-type-refs>
 
-		<label>Hotwater Storagetank</label>
+		<label>Hot Water Storage Tank</label>
 		<description>Storage Tank, stores heat in a water tank on 3 levels: bottom, middle, top=hot water</description>
 
 		<channels>
@@ -311,7 +311,8 @@
 
 	<channel-type id="systemtime">
 		<item-type>DateTime</item-type>
-		<label>DateTime of the Heating System</label>
+		<label>DateTime Heating System</label>
+		<description>Date and time of the Heating System</description>
 		<state readOnly="true"/>
 	</channel-type>
 
@@ -373,14 +374,14 @@
 
 	<channel-type id="airshutter_prim" advanced="true">
 		<item-type>Number</item-type>
-		<label>Primary Airshutter</label>
+		<label>Primary Air Shutter</label>
 		<description>Position of the primary air shutter</description>
 		<state pattern="%d %%" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="airshutter_sec" advanced="true">
 		<item-type>Number</item-type>
-		<label>Secondary Airshutter</label>
+		<label>Secondary Air Shutter</label>
 		<description>Position of the secondary air shutter</description>
 		<state pattern="%d %%" readOnly="true"/>
 	</channel-type>
@@ -395,21 +396,21 @@
 	<channel-type id="fanspeed">
 		<item-type>Number</item-type>
 		<label>Fan Speed</label>
-		<description>Fan Speed in rpm</description>
+		<description>Fan speed in rpm</description>
 		<state pattern="%d rpm" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="fanspeed_target" advanced="true">
 		<item-type>Number</item-type>
 		<label>Target Fan Speed</label>
-		<description>Fan Speed in rpm</description>
+		<description>Target fan speed in rpm</description>
 		<state pattern="%d rpm" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="ontime" advanced="true">
 		<item-type>Number</item-type>
 		<label>On Time</label>
-		<description>Ontime in hours</description>
+		<description>On time in hours</description>
 		<state pattern="%.2f h" readOnly="true"/>
 	</channel-type>
 
@@ -446,14 +447,14 @@
 	<channel-type id="ontimelevel1" advanced="true">
 		<item-type>Number</item-type>
 		<label>On Time Level 1</label>
-		<description>Ontime in hours</description>
+		<description>On time in hours</description>
 		<state pattern="%.2f h" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="ontimelevel2" advanced="true">
 		<item-type>Number</item-type>
 		<label>On Time Level 2</label>
-		<description>Ontime in hours</description>
+		<description>On time in hours</description>
 		<state pattern="%.2f h" readOnly="true"/>
 	</channel-type>
 
@@ -499,8 +500,8 @@
 
 	<channel-type id="hotwater_temp_setpoint">
 		<item-type>Number</item-type>
-		<label>Hotwater TempSet</label>
-		<description>Set the hot water temperature</description>
+		<label>Hot Water Set Point</label>
+		<description>Set the hot water temperature set point</description>
 		<category>Temperature</category>
 		<state pattern="%d °C" readOnly="false" max="60" min="30" step="1"/>
 	</channel-type>
@@ -524,15 +525,15 @@
 
 	<channel-type id="operationmode">
 		<item-type>Number</item-type>
-		<label>Operationmode</label>
-		<description>Operationmode</description>
+		<label>Operation Mode</label>
+		<description>Operation mode</description>
 		<state pattern="%d" readOnly="false" max="4" min="0" step="1"/>
 	</channel-type>
 
 	<channel-type id="currentmode">
 		<item-type>Number</item-type>
-		<label>Currentmode</label>
-		<description>Current Mode</description>
+		<label>Current Mode</label>
+		<description>Current functional mode</description>
 		<state pattern="%d" readOnly="true">
 			<options>
 				<option value="0">Standby Operation</option>
@@ -545,21 +546,21 @@
 
 	<channel-type id="partymode">
 		<item-type>Switch</item-type>
-		<label>Partymode</label>
-		<description>Partymode on/off</description>
+		<label>Party Mode</label>
+		<description>Party mode on/off</description>
 		<state readOnly="false"/>
 	</channel-type>
 
 	<channel-type id="savemode">
 		<item-type>Switch</item-type>
-		<label>Savemode</label>
-		<description>Savemode on/off</description>
+		<label>Save Mode</label>
+		<description>Save mode on/off</description>
 		<state readOnly="false"/>
 	</channel-type>
 
 	<channel-type id="party_temp_setpoint" advanced="true">
 		<item-type>Number</item-type>
-		<label>Partymode TempSet</label>
+		<label>Party Mode Temperature Set Point</label>
 		<description>Target temperature of party mode</description>
 		<category>Temperature</category>
 		<state min="6" step="1" pattern="%.1f °C" readOnly="false"/>
@@ -567,7 +568,7 @@
 
 	<channel-type id="save_temp_setpoint" advanced="true">
 		<item-type>Number</item-type>
-		<label>Savemode TempSet</label>
+		<label>Save Mode Temperature Set Point</label>
 		<description>Target temperature of save mode</description>
 		<category>Temperature</category>
 		<state min="6" step="1" pattern="%.1f °C" readOnly="false"/>
@@ -575,7 +576,7 @@
 
 	<channel-type id="room_temp" advanced="true">
 		<item-type>Number</item-type>
-		<label>Room Temp</label>
+		<label>Room Temperature</label>
 		<description>Temperature of rooms</description>
 		<category>Temperature</category>
 		<state pattern="%.1f °C" readOnly="true"/>
@@ -583,7 +584,7 @@
 
 	<channel-type id="room_temp_setpoint">
 		<item-type>Number</item-type>
-		<label>Room TempSet</label>
+		<label>Room Temperature Set Point</label>
 		<description>Target temperature of rooms</description>
 		<category>Temperature</category>
 		<state min="6" step="1" pattern="%.1f °C" readOnly="false"/>
@@ -598,14 +599,15 @@
 
 	<channel-type id="niveau" advanced="true">
 		<item-type>Number</item-type>
-		<label>Niveau</label>
-		<description>The niveau relative to outside temperature</description>
+		<label>Level</label>
+		<description>The level relative to outside temperature</description>
 		<state pattern="%.1f" readOnly="true"/>
 	</channel-type>
 
 	<channel-type id="timer" advanced="true">
 		<item-type>String</item-type>
-		<label>Timer for Heating or Warm Water</label>
+		<label>Timer</label>
+		<description>Timer for Heating or Warm Water</description>
 		<state pattern="%s" readOnly="true"/>
 	</channel-type>
 
@@ -621,7 +623,7 @@
 
 	<channel-type id="storagetank_temp">
 		<item-type>Number</item-type>
-		<label>Storagetank</label>
+		<label>Storage Tank</label>
 		<description>Actual temperature of the storage tank (solar sensor)</description>
 		<category>Temperature</category>
 		<state pattern="%.1f °C" readOnly="true"/>