diff --git a/ebusd-2.1.x/de/vaillant/_templates.csv b/ebusd-2.1.x/de/vaillant/_templates.csv
index 938cdc4cd..48c84e1e6 100644
--- a/ebusd-2.1.x/de/vaillant/_templates.csv
+++ b/ebusd-2.1.x/de/vaillant/_templates.csv
@@ -97,3 +97,4 @@ shortphone,STR:6,,,Telefonnummer
 mamode,UIN,0=circulation;1=dryer;2=zone;3=legiopump,,
 offmode,UIN,0=eco;1=night,,
 rcmode,UIN,0=off;1=modulating;2=thermostat,,
+appliancecode,UCH,0=Heizung kein Wärmebedarf;1=Heizbetrieb Gebläseanlauf;2=Heizbetrieb Pumpenvorlauf;3=Heizbetrieb Zündung;4=Heizbetrieb Brenner an;5=Heizbetrieb Pumpen-/Gebläsenachlauf;6=Heizbetrieb Gebläsenachlauf;7=Heizbetrieb Pumpennachlauf;8=Heizbetrieb Sperrzeit;9=Heizbetrieb Messprogramm;10=Warmwasseranforderung;11=Warmwasserbetrieb Gebläseanlauf;12=Warmwasserbetrieb Pumpenvorlauf;13=Warmwasserbetrieb Zündung;14=Warmwasserbetrieb Brenner an;15=Warmwasserbetrieb Pumpen-/Gebläsenachlauf;16=Warmwasserbetrieb Gebläsenachlauf;17=Warmwasserbetrieb Pumpennachlauf;18=Warmwasserbetrieb Sperrzeit;34=Heizbetrieb Frostschutz,,Statuscode
diff --git a/ebusd-2.1.x/de/vaillant/e0.omu.csv b/ebusd-2.1.x/de/vaillant/e0.omu.csv
index b4b401897..583342978 100644
--- a/ebusd-2.1.x/de/vaillant/e0.omu.csv
+++ b/ebusd-2.1.x/de/vaillant/e0.omu.csv
@@ -1,85 +1,111 @@
 # type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment
 #,OMU00,OMU_no_serial,OMU00 252,,,,,,,,,,
+# B509 service commands
 *r,,,,,,"B509","0D",,,,,,
 *w,,,,,,"B509","0E",,,,,,
 *wi,#install,,,,,"B509","0E",,,,,,
 *[SW],scan,,,SW,,,,,,,,,
-r,,Out1230V,Out1_230V,,,,"1800",,,onoff,,,
-r,,SourceFlowReversed,BrineFlowReversed,,,,"4400",,,onoff,,,
-# ##### Parameter und Informationen #####,,,,,,,,,,,,,
+r,,omu_0000,unknown,,,,"0000",,s,UIN,,, # usually around ~649
+r,,omu_0100,unknown,,,,"0100",,s,UIN,,, # usually around ~670
+r,,omu_0200,unknown,,,,"0200",,s,UIN,,, # always 0
+r,,omu_0300,unknown,,,,"0300",,s,UIN,,, # always 0
+r,,omu_0400,unknown,,,,"0400",,s,UIN,,, # always 0
 r,,ODUSourceInput,ODU_air_inlet,,,,"0500",,,tempsensor,,,air inlet sensor on ODU
-[SW>=104]r;wi,,SourceInputSensorOffset,AirInletSensor_Offset,,,,"4A00",,,temp,,,calibration value for air inlet sensor
 r,,Parametersandinformation_ODUSourceInput,ODU_brine_Warm,,,,"0600",,,tempsensor,,,brine_warm sensor on ODU
-[SW>=104]r;wi,,Parametersandinformation_SourceInputSensorOffset,Brine_warmSensor_Offset,,,,"4B00",,,temp,,,calibration value for brine sensor
-r,,FanSpeedIs,Fan_Speed_Is,,,,"3900",,,UCH,-10,/min,actual fan speed
-r,,FanIsRunning,FanIsRunning,,,,"3B00",,,yesno,,,fan started successful
-r,,DeiceRequest,DeiceRequest,,,,"1B00",,,yesno,,,defrosting requested
-r;wi,,ManualDeiceRequest,ManualDeiceRequest,,,,"1A00",,,yesno,,,start manual defrosting
-r,,DeicingActive,DeicingActive,,,,"2C00",,,yesno,,,defrosting is active
+r,,omu_0700,unknown,,,,"0700",,s,UIN,,, # always 0
+r,,omu_0800,unknown,,,,"0800",,s,UIN,,, # always 0
+r,,omu_0900,unknown,,,,"0900",,s,UIN,,, # always 0
+r,,omu_0a00,unknown,,,,"0A00",,s,UCH,,, # always 0
+r,,omu_0b00,unknown,,,,"0B00",,s,UCH,,, # always 0
+r,,omu_0c00,unknown,,,,"0C00",,s,UIN,,, # always 0
+r,,omu_0d00,unknown,,,,"0D00",,s,UIN,,, # usually 2500
+r,,omu_0e00,unknown,,,,"0E00",,s,UCH,,, # always 0
+r,,omu_0f00,unknown,,,,"0F00",,s,UCH,,, # always 0
+r,,omu_1000,unknown,,,,"1000",,s,UCH,,, # always 0
 r,,defroster,defroster,,,,"1100",,,onoff,,,defroster is running
-r,,CleaningRequest,CleaningRequest,,,,"2D00",,,yesno,,,problems in air flow detected
+r,,omu_1200,unknown,,,,"1200",,s,UCH,,, # usually 1
+r,,omu_1300,unknown,,,,"1300",,s,UCH,,, # always 0
+r,,fanPWM,fan_PWM,,,,"1400",,,UCH,,,PWM value from hardware
+r,,omu_1500,unknown,,,,"1500",,s,UCH,,, # usually 1
+r,,omu_1600,unknown,,,,"1600",,s,UCH,,, # always 0
+r,,CompActive,CompressorActive,,,,"1700",,,onoff,,,compressor is running or pre or post running
+r,,Out1230V,Out1_230V,,,,"1800",,,onoff,,,
+r,,PumpSpeedControl,PumpSpeedControl,,,,"1900",,,UIN,,,reserved
+r;wi,,ManualDeiceRequest,ManualDeiceRequest,,,,"1A00",,,yesno,,,start manual defrosting
+r,,DeiceRequest,DeiceRequest,,,,"1B00",,,yesno,,,defrosting requested
 r,,DeiceError,DeiceError,,,,"1C00",,,yesno,,,timeout while defrost process
 r,,PollutionDetect,PollutionDetect,,,,"1D00",,,yesno,,,unusual low brine temperaure at high air inlet temperature
+r,,RelaisOut,RelaisOut,,,,"1E00",,,onoff,,,reserved
+r,,OffsetFanSpeed,OffsetFanSpeed,,,,"1F00",,,UCH,,,reserved
+r,,FanstableTime,FanstableTime,,,,"2000",,,minutes0,,,reserved
+r,,Free2,Free2,,,,"2100",,,UIN,,,reserved
+r,,FanStartSpeed,FanStartSpeed,,,,"2200",,,percent0,,,reserved
+[SW>=104]r;wi,,DeiceRequestHyst,DeiceRequestHyst,,,,"2300",,,temp,,,for stable frost detection
+[SW>=104]r;wi,,DeiceWFanHyst,DeiceWFanHyst,,,,"2400",,,temp,,,remaining temperature difference to air inlet while fan defrosting
+[SW>=104]r,,SourceTempMin,T_AirMin,,,,"2500",,,temp,,,minimum allowed air temperature
+[SW>=104]r;wi,,OnlyFanTemp,TOnlyFan,,,,"2600",,,temp,,,"above this air temperature, the defroster is not used for defrosting, only fan"
+[SW>=104]r;wi,,DeiceOnTemp,TDeiceOn,,,,"2700",,,temp,,,above this air temperature ice is quite unusual
+[SW>=104]r;wi,,DeltaTMax,MaxDeltaT,,,,"2800",,,temp,,,start defrost process when temperature difference between air and brine is above this setpoint
+[SW>=104]r;wi,,DeicefinishTemp,TDeicefinish,,,,"2900",,,temp,,,stops automatic defrosting process
+r,,ZustandOAWLogic,ZustandOAWLogic,,,,"2A00",,,UIN,,,"Output of ""OAW_control"" statemachine"
+r,,ODUReady,ODUReady,,,,"2B00",,,yesno,,,start-up test of ODU was successful
+r,,DeicingActive,DeicingActive,,,,"2C00",,,yesno,,,defrosting is active
+r,,CleaningRequest,CleaningRequest,,,,"2D00",,,yesno,,,problems in air flow detected
 r,,FanError,FanError,,,,"2E00",,,yesno,,,fan did not start
 r,,STBError,STBError,,,,"2F00",,,yesno,,,defroster STB was interrupted
-r,,STBOK,STB_OK,,,,"3800",,,yesno,,,STB is closed
+r,,omu_3000,unknown,,,,"3000",,s,UCH,,, # always 0
 r,,BadWeather,BadWeather,,,,"3100",,,yesno,,,too cold to start compressor
-r,,HotSummer,HotSummer,,,,"3C00",,,yesno,,,air inlet too hot to run compressor
-r,,NoiseReduction,NoiseReduction,,,,"3500",,,yesno,,,noise reduction is active
-[SW>=104]r;wi,,DeiceTimeMax,MaxDeiceTime,,,,"4500",,,minutes2,,,"max. deicing time. By exceeding this value, message unsuccessful deicing is released"
-[SW>=104]r;wi,,DeicePeriodMin,MinDeicePeriod,,,,"4600",,,minutes2,,,"Min. time between deicings. If time is shorter, something is wrong"
-[SW>=104]r;wi,,DeicefinishTemp,TDeicefinish,,,,"2900",,,temp,,,stops automatic defrosting process
-[SW>=104]r;wi,,DeltaTMax,MaxDeltaT,,,,"2800",,,temp,,,start defrost process when temperature difference between air and brine is above this setpoint
-[SW>=104]r;wi,,DeiceOnTemp,TDeiceOn,,,,"2700",,,temp,,,above this air temperature ice is quite unusual
-[SW>=104]r;wi,,OnlyFanTemp,TOnlyFan,,,,"2600",,,temp,,,"above this air temperature, the defroster is not used for defrosting, only fan"
-[SW>=104]r;wi,,DeiceWFanHyst,DeiceWFanHyst,,,,"2400",,,temp,,,remaining temperature difference to air inlet while fan defrosting
-[SW>=104]r;wi,,DeiceRequestHyst,DeiceRequestHyst,,,,"2300",,,temp,,,for stable frost detection
-[SW>=104]r,,SpeedTempMin,MinSpeedTemp,,,,"5800",,,temp,,,temperature for minimum speed
-[SW>=104]r,,SpeedTempMax,MaxSpeedTemp,,,,"5700",,,temp,,,temperature for maximum speed
-[SW>=104]r;wi,,FanSpeedMax,MaxFanSpeed,,,,"3F00",,,percent0,,,"maximum allowed fan speed, set by look-up-table according to IDU power"
-r;w,,NoiseReductionFactor,NoiseReductionFactor,,,,"4000",,,percent0,,,noise reduction factor to reduce fan speed
-r;wi,,SourceMAXTemp,T_AirMAX,,,,"4300",,,temp,,,maximum allowed air inlet temperature
-[SW>=130]r,,CoolingActive,Kühlung aktiv,,,,"5900",,,yesno,,,cooling active
-[SW>=130]r;wi,,CoolingFanStartTemp,CoolingFanStartTemp,,,,"5A00",,,temp0,,,brine temperature to start fan while cooling
-[SW>=130]r;wi,,CoolingFanStopTemp,CoolingFanStopTemp,,,,"5B00",,,temp0,,,reserved
-[SW>=130]r;wi,,CoolingMaxFanSpeed,CoolingMaxFanSpeed,,,,"5C00",,,percent0,,,max. fan speed while cooling
-[SW>=130]r;wi,,CoolingTest,CoolingTest,,,,"5D00",,,UCH,,,reserved
-# ##### Testing #####,,,,,,,,,,,,,
-r,,ZustandOAWLogic,ZustandOAWLogic,,,,"2A00",,,UIN,,,"Output of ""OAW_control"" statemachine"
-r,,IDUApplianceCode,IDU_appliance_code,,,,"3E00",,,UCH,,,"appliance code, copy from AMU"
-[SW>=104]r,,FrostProtection,FrostProtection,,,,"4100",,,temp,,,copy from AMU: frost protection
-r,,CompActive,CompressorActive,,,,"1700",,,onoff,,,compressor is running or pre or post running
 r,,CompDemand,CompressorDemand,,,,"3200",,,yesno,,,compressor wants to start or is running
 r,,DeicingReleased,DeicingReleased,,,,"3300",,,yesno,,,compressor is not running
 r,,SourceOK,BrineOK,,,,"3400",,,yesno,,,brine pressure is ok and pump is running
+r,,NoiseReduction,NoiseReduction,,,,"3500",,,yesno,,,noise reduction is active
 r,,FanMode,FanMode,,,,"3600",,,yesno,,,future use
-[SW>=104]r,,SyncHeaterDeicing,SyncHeaterDeicing,,,,"4700",,,yesno,,,synchronize heater while deicing
-[SW>=104]r,,SyncDeicing,SyncDeicing,,,,"4900",,,yesno,,,synchronize deicing process
-r;wi,,OAWControlPumpPWM,OAW_Control_Pump_PWM,,,,"3700",,,UIN,,,reserved
+r;wi,,OAWControlPumpPWM,OAW_Control_Pump_PWM,,,,"3700",,,UCH,,,reserved
+r,,STBOK,STB_OK,,,,"3800",,,yesno,,,STB is closed
+r,,FanSpeedIs,Fan_Speed_Is,,,,"3900",,,UCH,-10,/min,actual fan speed
 r,,TestFan,Test_Fan,,,,"3A00",,,UCH,,,
+r,,FanIsRunning,FanIsRunning,,,,"3B00",,,yesno,,,fan started successful
+r,,HotSummer,HotSummer,,,,"3C00",,,yesno,,,air inlet too hot to run compressor
 r,,Pumin,Pumin,,,,"3D00",,,UCH,,,reserved
-[SW>=104]r,,RelayStarts,RelayCommutations,,,,"4D00",,,ULG,,,reserved
-[SW>=104]r,,CheckByte,CheckByte,,,,"5500",,,UCH,,,factory EOL test
-[SW>=104]r,,LEDBlinkProgram,LEDBlinkProgram,,,,"5600",,,UIN,,,LED error message
+r,,IDUApplianceCode,IDU_appliance_code,,,,"3E00",,,appliancecode,,,"appliance code, copy from AMU"
+[SW>=104]r;wi,,FanSpeedMax,MaxFanSpeed,,,,"3F00",,,percent0,,,"maximum allowed fan speed, set by look-up-table according to IDU power"
+r;w,,NoiseReductionFactor,NoiseReductionFactor,,,,"4000",,,percent0,,,noise reduction factor to reduce fan speed
+[SW>=104]r,,FrostProtection,FrostProtection,,,,"4100",,,temp,,,copy from AMU: frost protection
+r,,omu_4200,unknown,,,,"4200",,s,UIN,,, # usually 240
+r;wi,,SourceMAXTemp,T_AirMAX,,,,"4300",,,temp,,,maximum allowed air inlet temperature
+r,,SourceFlowReversed,BrineFlowReversed,,,,"4400",,,onoff,,,
+[SW>=104]r;wi,,DeiceTimeMax,MaxDeiceTime,,,,"4500",,,minutes2,,,"max. deicing time. By exceeding this value, message unsuccessful deicing is released"
+[SW>=104]r;wi,,DeicePeriodMin,MinDeicePeriod,,,,"4600",,,minutes2,,,"Min. time between deicings. If time is shorter, something is wrong"
+[SW>=104]r,,SyncHeaterDeicing,SyncHeaterDeicing,,,,"4700",,,yesno,,,synchronize heater while deicing
 [SW>=104]r,,TestHeater,Test_Heater,,,,"4800",,,UCH,,,reserved
-r,,ODUReady,ODUReady,,,,"2B00",,,yesno,,,start-up test of ODU was successful
-[SW>=104]r,,SourceTempMin,T_AirMin,,,,"2500",,,temp,,,minimum allowed air temperature
-r,,FanStartSpeed,FanStartSpeed,,,,"2200",,,UIN,,,reserved
-r,,Free2,Free2,,,,"2100",,,UIN,,,reserved
-r,,FanstableTime,FanstableTime,,,,"2000",,,UIN,,,reserved
-r,,OffsetFanSpeed,OffsetFanSpeed,,,,"1F00",,,UIN,,,reserved
-r,,RelaisOut,RelaisOut,,,,"1E00",,,onoff,,,reserved
-r,,PumpSpeedControl,PumpSpeedControl,,,,"1900",,,UIN,,,reserved
-r,,fanPWM,fan_PWM,,,,"1400",,,UIN,,,PWM value from hardware
-# ##### Statistik #####,,,,,,,,,,,,,
+[SW>=104]r,,SyncDeicing,SyncDeicing,,,,"4900",,,yesno,,,synchronize deicing process
+[SW>=104]r;wi,,SourceInputSensorOffset,AirInletSensor_Offset,,,,"4A00",,,temp,,,calibration value for air inlet sensor
+[SW>=104]r;wi,,Parametersandinformation_SourceInputSensorOffset,Brine_warmSensor_Offset,,,,"4B00",,,temp,,,calibration value for brine sensor
 [SW>=104]r,,FanRuntimeMinutes,FanRuntimeMinutes,,,,"4C00",,,ULG,,min,fan run time
+[SW>=104]r,,RelayStarts,RelayCommutations,,,,"4D00",,,ULG,,,reserved
 [SW>=104]r,,HeaterRuntimeMinutes,HeaterRuntimeMinutes,,,,"4E00",,,ULG,,min,defroster run time
 [SW>=104]r,,HeaterStarts,HeaterCommutations,,,,"4F00",,,ULG,,,defroster cycles
+[SW>=104]r,,STBErrorStarts,STBErrorCommutations,,,,"5000",,,ULG,,,STB cycles
 [SW>=104]r,,DeicingStarts,DeicingCommutations,,,,"5100",,,ULG,,,deicing cycles
 [SW>=104]r,,DeicingRuntimeMinutes,DeicingRuntimeMinutes,,,,"5200",,,ULG,,min,deicing run time
 [SW>=104]r,,DeiceErrorStarts,DeiceErrorCommutations,,,,"5300",,,ULG,,,deice error cycles
-[SW>=104]r,,STBErrorStarts,STBErrorCommutations,,,,"5000",,,ULG,,,STB cycles
 [SW>=104]r,,PowerOnStarts,PowerOnCommutations,,,,"5400",,,ULG,,,power on cycles
+[SW>=104]r,,CheckByte,CheckByte,,,,"5500",,,UCH,,,factory EOL test
+[SW>=104]r,,LEDBlinkProgram,LEDBlinkProgram,,,,"5600",,,UIN,,,LED error message
+[SW>=104]r,,SpeedTempMax,MaxSpeedTemp,,,,"5700",,,temp,,,temperature for maximum speed
+[SW>=104]r,,SpeedTempMin,MinSpeedTemp,,,,"5800",,,temp,,,temperature for minimum speed
+[SW>=130]r,,CoolingActive,Kühlung aktiv,,,,"5900",,,yesno,,,cooling active
+[SW>=130]r;wi,,CoolingFanStartTemp,CoolingFanStartTemp,,,,"5A00",,,temp0,,,brine temperature to start fan while cooling
+[SW>=130]r;wi,,CoolingFanStopTemp,CoolingFanStopTemp,,,,"5B00",,,temp0,,,reserved
+[SW>=130]r;wi,,CoolingMaxFanSpeed,CoolingMaxFanSpeed,,,,"5C00",,,percent0,,,max. fan speed while cooling
+[SW>=130]r;wi,,CoolingTest,CoolingTest,,,,"5D00",,,UCH,,,reserved
+r,,omu_5e00,unknown,,,,"5E00",,s,UCH,,, # usually 18
+r,,omu_5f00,unknown,,,,"5F00",,s,UIN,,, # usually 160
+# B521 service commands
+*r,,,,,,"B521","0D",,,,,,
+*w,,,,,,"B521","0E",,,,,,
+[SW<131]w,,OMUControl,Control command from HMU to OMU,03,E0,"B521","00",NewStatus,m,appliancecode,,,Neuer Statuscode,unknown1,m,UCH,,,meistens 07 oder 08,reserved1,m,UCH,,,immer 00,reserved2,m,UCH,,,immer E7,Status,s,appliancecode,,,Aktueller Statuscode,LastStatus,s,appliancecode,,,Vorheriger Statuscode,TempBrineOutlet,s,D2C,16,°C,Temperatur Sole Rücklauf,TempAirInlet,s,D2C,16,°C,Temperatur Luft Einlass,unknown2,s,UCH,,,unbekannt,FanSpeed,s,UCH,-10,/min,Lüfterdrehzahl,FanPower,s,UCH,,%,Lüfteransteuerung
+[SW>=131]w,,OMUControl,Control command from HMU to OMU,03,E0,"B521","00",NewStatus,m,appliancecode,,,Neuer Statuscode,reserved1,m,UCH,,,immer 22,reserved2,m,UCH,,,immer 00,reserved3,m,UCH,,,immer E6,reserved4,m,SCH,,,immer FF,reserved5,m,SCH,,,immer FF,reserved6,m,UCH,,,immer 46,reserved7,m,UCH,,,immer 00,Status,s,appliancecode,,,Aktueller Statuscode,LastStatus,s,appliancecode,,,Vorheriger Statuscode,TempBrineOutlet,s,D2C,16,°C,Temperatur Sole Rücklauf,TempAirInlet,s,D2C,16,°C,Temperatur Luft Einlass,unknown1,s,UCH,,,unbekannt,FanSpeed,s,UCH,-10,/min,Lüfterdrehzahl,FanPower,s,UCH,,%,Lüfteransteuerung,unknown2,s,UCH,,,unbekannt,reserved5,s,UCH,,,immer 00
 !include,hwcmode.inc,,,,,,,,,,,,
 !include,timer.inc,,,,,,,,,,,,
 !include,errors.inc,,,,,,,,,,,,
diff --git a/ebusd-2.1.x/en/vaillant/_templates.csv b/ebusd-2.1.x/en/vaillant/_templates.csv
index 5f957e556..6695c3ef4 100644
--- a/ebusd-2.1.x/en/vaillant/_templates.csv
+++ b/ebusd-2.1.x/en/vaillant/_templates.csv
@@ -97,3 +97,4 @@ shortphone,STR:6,,,phone number
 mamode,UIN,0=circulation;1=dryer;2=zone;3=legiopump,,
 offmode,UIN,0=eco;1=night,,
 rcmode,UIN,0=off;1=modulating;2=thermostat,,
+appliancecode,UCH,0=Heating mode: No requirement;1=Heating mode: Fan prerun;2=Heating mode: Pump prerun;3=Heating mode: Burner ignition;4=Heating mode: Burner on;5=Heating mode: Pump/fan overrun;6=Heating mode: Fan overrun;7=Heating mode: Pump overrun;8=Heating mode: Temporary shutdown after heating procedure;9=Heating mode: Messprogramm;10=DHW mode: Requirement;11=DHW mode: Fan prerun;12=DHW mode: Pump prerun;13=DHW mode: Burner ignition;14=DHW mode: Burner on;15=DHW mode: Pump/fan overrun;16=DHW mode: Fan overrun;17=DHW mode: Pump overrun;18=DHW mode: Temporary shutdown of the burner;34=Frost protection active,,Status code