diff --git a/ChanSort.Plugin.ScmFile/ChanSort.Loader.ScmFile.csproj b/ChanSort.Plugin.ScmFile/ChanSort.Loader.ScmFile.csproj
index 590b710..a7d56d6 100644
--- a/ChanSort.Plugin.ScmFile/ChanSort.Loader.ScmFile.csproj
+++ b/ChanSort.Plugin.ScmFile/ChanSort.Loader.ScmFile.csproj
@@ -83,6 +83,11 @@
       <Name>ChanSort.Api</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ChanSort.Loader.ScmFile.ini">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ChanSort.Plugin.ScmFile/ChanSort.Loader.ScmFile.ini b/ChanSort.Plugin.ScmFile/ChanSort.Loader.ScmFile.ini
new file mode 100644
index 0000000..4ec5f7b
--- /dev/null
+++ b/ChanSort.Plugin.ScmFile/ChanSort.Loader.ScmFile.ini
@@ -0,0 +1,363 @@
+[Series:B]
+    SatDataBase.dat = 145
+    TransponderDataBase.dat = 49
+    FineTune = 20
+    FineTune_Digital = 28
+    PTC = 12
+    map-AirA = 28
+    map-AirD = 248
+    map-CableD = 248
+    map-SateD = 144
+    Favorites = 4
+
+
+[Series:C]
+    SatDataBase.dat = 145
+    TransponderDataBase.dat = 45
+    PTC = 12
+    map-AirA = 40
+    map-AirD = 292
+    map-CableD = 292
+    map-SateD = 144
+    Favorites = 4
+
+[Series:D]
+    SatDataBase.dat = 145
+    TransponderDataBase.dat = 45
+    PTC = 12
+    map-AirA = 64
+    map-AirD = 320
+    map-CableD = 320
+    map-SateD = 172
+    map-AstraHDPlusD = 212
+    Favorites = 5
+
+[Series:E]
+    SatDataBase.dat = 145
+    TransponderDataBase.dat = 45
+    PTC = 12
+    map-AirA = 64
+    map-AirD = 320
+    map-CableD = 320
+    map-SateD = 168
+    map-AstraHDPlusD = 212
+    Favorites = 5
+
+[Analog:28]
+    ; map-AirA and map-CableA for B series
+    offInUse = 0
+    maskInUse = 0x02
+    offProgramNr = 4
+    offFavorites =
+    offNameLength =
+    offName = 12
+    lenName = 12
+    offChecksum = 27
+
+[Analog:40]
+    ; map-AirA and map-CableA for C series
+    offInUse = 1
+    maskInUse = 0x01
+    offSkip = 2
+    maskSkip = 0x01
+    offLock = 6
+    maskLock = 0x01
+    offTuned = 8
+    maskTuned = 0x01
+    offProgramNr = 9
+    offSlotNr = 16
+    offNameLength = 18
+    offName = 20
+    lenName = 12
+    offFrequency = 32
+    offFavorites = 38
+    offChecksum = 39
+
+[Analog:64]
+    ; map-AirA and map-CableA for D,E series
+    offInUse = 1
+    maskInUse = 0x01
+    offSkip = 2
+    maskSkip = 0x01
+    offLock = 6
+    maskLock = 0x01
+    offTuned = 8
+    maskTuned = 0x01
+    offProgramNr = 9
+    offSlotNr = 16
+    offNameLength = 18
+    offName = 20
+    lenName = 12
+    offFrequency = 32
+    offFavorites = 36,40,44,48,52
+    offChecksum = 63
+
+[FineTune:20]    
+    offIsCable = 0
+    maskIsCable = 0x01
+    offSlotNr = 4
+    offFrequency = 8
+
+[FineTune_Digital:28]
+    offIsCable = 0
+    maskIsCable = 0x01
+    offChannelTransponder = 4
+    offFrequency = 16
+
+[PTC:12]
+    offFrequency = 4
+    offChannelTransponder = 8
+        
+[DvbCT:248]
+    ; map-AirD and map-CableD for B series
+    offProgramNr = 0
+    offVideoPid = 2
+    offPcrPid = 4
+    offServiceId = 10
+    offStatus = 8
+    offQam = 7
+    offServiceType = 9
+    offEncrypted = 23
+    maskEncrypted = 0xff
+    offSymbolRate = 32
+    offLock = 244
+    maskLock = 0x01
+    offOriginalNetworkId = 12
+    offNetworkId = 14
+    offBouquet = 34
+    offChannelTransponder = 26
+    offLogicalProgramNr = 28
+    offTransportStreamId = 36
+    offName = 44
+    lenName = 100
+    offFavorites = 246
+    offChecksum = 247
+
+[DvbCT:292]
+    ; map-AirD and map-CableD for C series
+    offProgramNr = 0
+    offVideoPid = 2
+    offPcrPid = 4
+    offServiceId = 6
+    offStatus =
+    offQam = 12
+    offBandwidth = 14
+    offServiceType = 15
+    offCodec = 16
+    offHRes = 20
+    offVRes = 22
+    offEncrypted = 24
+    maskEncrypted = 0xff
+    offFrameRate = 25
+    offSymbolRate = 28
+    offLock = 31
+    maskLock = 0x01
+    offOriginalNetworkId = 32
+    offNetworkId = 34
+    offServiceProviderId = 40
+    offChannelTransponder = 42
+    offLogicalProgramNr = 44
+    offTransportStreamId = 48
+    offName = 64
+    lenName = 200
+    offShortName = 264
+    lenShortName = 18
+    offVideoFormat = 282
+    offFavorites = 289
+    offChecksum = 291
+    
+
+[DvbCT:320]
+    ; map-AirD and map-CableD for D and E series
+    offProgramNr = 0
+    offVideoPid = 2
+    offPcrPid = 4
+    offServiceId = 6
+    offStatus =
+    offQam = 12
+    offBandwidth = 14
+    offServiceType = 15
+    offCodec = 16
+    offHRes = 20
+    offVRes = 22
+    offEncrypted = 24
+    maskEncrypted = 0xff
+    offFrameRate = 25
+    offSymbolRate = 28
+    offLock = 31
+    maskLock = 0x01
+    offOriginalNetworkId = 32
+    offNetworkId = 34
+    offServiceProviderId = 40
+    offChannelTransponder = 42
+    offLogicalProgramNr = 44
+    offTransportStreamId = 48
+    offName = 64
+    lenName = 200
+    offShortName = 264
+    lenShortName = 18
+    offVideoFormat = 282
+    offFavorites = 292,296,300,304,308
+    offChecksum = 319
+
+[TransponderDataBase.dat:49]
+    ; B Series
+    offMagicByte = 0
+    offTransponderIndex = 1
+    offSatelliteIndex = 5
+    offFrequency = 9
+    offSymbolRate = 17
+
+[TransponderDataBase.dat:45]
+    ; C,D,E Series
+    offMagicByte = 0
+    offTransponderIndex = 1
+    offSatelliteIndex = 5
+    offFrequency = 9
+    offSymbolRate = 13
+
+[DvbS:144]
+    ; map-SateD for B and C Series
+    offProgramNr = 0
+    offVideoPid = 2
+    offPcrPid = 4
+    offInUse = 7
+    maskInUse = 0x01
+    offLock = 13
+    maskLock = 0x01
+    offServiceType = 14
+    offServiceId = 16
+    offTransponderIndex = 18
+    offSatelliteIndex = 20
+    offTransportStreamId = 24
+    offOriginalNetworkId = 28
+    offHRes = 32
+    offVRes = 34
+    offName = 36
+    lenName = 100
+    offEncrypted = 136
+    maskEncrypted = 0x01
+    offBouquet = 138
+    offFavorites = 142
+    offChecksum = 143
+    offCodec =
+    offSymbolRate =
+    offNetworkId =
+    offServiceProviderId = 
+    offChannelTransponder = 
+    offLogicalProgramNr = 
+    offShortName = 
+    lenShortName = 
+    offVideoFormat = 
+
+[DvbS:172]
+    ; map-SateD for D Series
+    offProgramNr = 0
+    offVideoPid = 2
+    offPcrPid = 4
+    offInUse = 7
+    maskInUse = 0x01
+    offLock = 13
+    maskLock = 0x01
+    offServiceType = 14
+    offServiceId = 16
+    offTransponderIndex = 18
+    offSatelliteIndex = 20
+    offTransportStreamId = 24
+    offOriginalNetworkId = 28
+    offHRes = 32
+    offVRes = 34
+    offName = 36
+    lenName = 100
+    offEncrypted = 136
+    maskEncrypted = 0x01
+    offBouquet = 138
+    offFavorites = 140,144,148,152,156
+    offChecksum = 171
+    offCodec =
+    offSymbolRate =
+    offNetworkId =
+    offServiceProviderId = 
+    offChannelTransponder = 
+    offLogicalProgramNr = 
+    offShortName = 
+    lenShortName = 
+    offVideoFormat = 
+
+[DvbS:168]
+    ; map-SateD for E Series
+    offProgramNr = 0
+    offVideoPid = 2
+    offPcrPid = 4
+    offInUse = 7
+    maskInUse = 0x01
+    offLock = 13
+    maskLock = 0x01
+    offServiceType = 14
+    offServiceId = 16
+    offTransponderIndex = 18
+    offSatelliteIndex = 20
+    offTransportStreamId = 24
+    offOriginalNetworkId = 28
+    offHRes = 32
+    offVRes = 34
+    offName = 36
+    offEncrypted = 136
+    maskEncrypted = 0x01
+    lenName = 100
+    offBouquet = 138
+    offFavorites = 140,144,148,152,156
+    offChecksum = 167
+    offCodec =
+    offSymbolRate =
+    offNetworkId =
+    offServiceProviderId = 
+    offChannelTransponder = 
+    offLogicalProgramNr = 
+    offShortName = 
+    lenShortName = 
+    offVideoFormat = 
+
+[AstraHDPlusD:212]
+    ; map-AstraHDPlusD for D and E Series
+    offProgramNr = 0,20
+    offVideoPid=2
+    offPcrId=4
+    offInUse = 7
+    maskInUse = 0x01
+    offLock = 
+    maskLock = 0x01
+    offServiceType = 14
+    offServiceId = 16
+    offTransponderIndex = 18
+    ; satindex is just a guess
+    offSatelliteIndex = 40
+    offTransportStreamId = 36
+    offOriginalNetworkId = 32
+    offName = 48
+    lenName = 100
+    offEncrypted = 180
+    maskEncrypted = 0x01
+    offFavorites = 184,188,192,196,200
+    offChecksum = 211
+
+[AstraHDPlusD_BAK]
+    ; map-AstraHDPlusD for D and E Series
+    offProgramNr = 0,20
+    offVideoPid=2
+    offPcrId=4
+    offInUse = 14
+    maskInUse = 0xff
+    maskLock = 0x01
+    offServiceType = 14
+    offServiceId = 16
+    offTransponderIndex = 18
+    offSatelliteIndex = 
+    offTransportStreamId = 36
+    offOriginalNetworkId = 32
+    offName = 48
+    lenName = 100
+    offEncrypted = 180
+    maskEncrypted = 0x01
+    offFavorites = 184,188,192,196,200
+    offChecksum = 211
diff --git a/ChanSort.Plugin.TllFile/ChanSort.Loader.TllFile.csproj b/ChanSort.Plugin.TllFile/ChanSort.Loader.TllFile.csproj
index 2ee30a2..0a30847 100644
--- a/ChanSort.Plugin.TllFile/ChanSort.Loader.TllFile.csproj
+++ b/ChanSort.Plugin.TllFile/ChanSort.Loader.TllFile.csproj
@@ -104,7 +104,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="ChanSort.Plugin.TllFile.ini">
+    <None Include="ChanSort.Loader.TllFile.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/ChanSort.Plugin.TllFile/ChanSort.Plugin.TllFile.ini b/ChanSort.Plugin.TllFile/ChanSort.Loader.TllFile.ini
similarity index 97%
rename from ChanSort.Plugin.TllFile/ChanSort.Plugin.TllFile.ini
rename to ChanSort.Plugin.TllFile/ChanSort.Loader.TllFile.ini
index d018b0a..de37361 100644
--- a/ChanSort.Plugin.TllFile/ChanSort.Plugin.TllFile.ini
+++ b/ChanSort.Plugin.TllFile/ChanSort.Loader.TllFile.ini
@@ -117,7 +117,7 @@
     offAudioPid2 = 172
 
 [ACTChannelDataMapping:176]
-    ; LD, LE series, LK450, LW4500, LW5400
+    ; LD, LE, LX series, LK450, LW4500, LW5400
     reorderChannelData = 0
     lenName = 40
     offChannelTransponder = 10, 86, 120
@@ -298,6 +298,12 @@
     offHotelModeEnabled=19721
     offHotelModeDtvUpdate=19731
 
+[FirmwareData:23144]
+    ; LX9500
+    offSize = 0
+    offHotelModeEnabled=19721
+    offHotelModeDtvUpdate=19731
+
 [FirmwareData:35504]
     ; LV,LW,LK950S
     offSize = 0
diff --git a/ChanSort.Plugin.TllFile/FirmwareData.cs b/ChanSort.Plugin.TllFile/FirmwareData.cs
index b732bad..bc5c276 100644
--- a/ChanSort.Plugin.TllFile/FirmwareData.cs
+++ b/ChanSort.Plugin.TllFile/FirmwareData.cs
@@ -17,23 +17,28 @@ namespace ChanSort.Loader.TllFile
     {
     }
 
+    public bool SupportsHbbTv { get { return this.GetOffsets(offHbbTvEnabled).Length > 0; } }
+    public bool SupportsHotelMenu { get { return this.GetOffsets(offHotelModeEnabled).Length > 0; } }
+    public bool SupportsAutoChannelUpdate { get { return this.GetOffsets(offSettingsChannelUpdate).Length > 0; } }
+
     public long Size { get { return this.GetDword(offSize); } }
     public bool SystemLocked { get { return this.GetByte(offSystemLock) != 0; } }    
     public string TvPassword { get { return CodeToString((uint)this.GetDword(offTvPassword)); } }
 
-
     public bool SettingsAutomaticChannelUpdate
     {
       get { return this.GetByte(offSettingsChannelUpdate) != 0; }
       set { this.SetByte(offSettingsChannelUpdate, (byte) (value ? 1 : 0)); }
     }
 
+
     public bool HbbTvEnabled
     {
       get { return this.GetByte(offHbbTvEnabled) != 0; }
       set { this.SetByte(offHbbTvEnabled, (byte)(value ? 1 : 0)); }
     }
 
+
     public bool HotelModeEnabled
     {
       get { return this.GetByte(offHotelModeEnabled) != 0; }
diff --git a/ChanSort.Plugin.TllFile/TllFileSerializer.cs b/ChanSort.Plugin.TllFile/TllFileSerializer.cs
index a5732db..3d30e59 100644
--- a/ChanSort.Plugin.TllFile/TllFileSerializer.cs
+++ b/ChanSort.Plugin.TllFile/TllFileSerializer.cs
@@ -709,12 +709,12 @@ namespace ChanSort.Loader.TllFile
           {
             if (fileContent[off + i - j] == 101 && fileContent[off + i - j - 6] == 100)
               // check for Volume/MaxVolue to be 101/100
-              return this.firmwareBlockOffset + i - j - 15;
+              return i - j - 15;
           }
-          return -1;
+          return 0;
         }
       }
-      return -1;
+      return 0;
     }
     #endregion
 
diff --git a/ChanSort.Plugin.TllFile/TvSettingsForm.Designer.cs b/ChanSort.Plugin.TllFile/TvSettingsForm.Designer.cs
index c3a8546..8f9a16f 100644
--- a/ChanSort.Plugin.TllFile/TvSettingsForm.Designer.cs
+++ b/ChanSort.Plugin.TllFile/TvSettingsForm.Designer.cs
@@ -29,7 +29,7 @@
     private void InitializeComponent()
     {
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TvSettingsForm));
-      this.grpSettings = new DevExpress.XtraEditors.GroupControl();
+      this.grpOption = new DevExpress.XtraEditors.GroupControl();
       this.cbHbbTv = new DevExpress.XtraEditors.CheckEdit();
       this.cbCustomCountry = new DevExpress.XtraEditors.CheckEdit();
       this.comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -42,11 +42,12 @@
       this.cbDtvUpdate = new DevExpress.XtraEditors.CheckEdit();
       this.cbHotelMode = new DevExpress.XtraEditors.CheckEdit();
       this.cbAutoChannelUpdate = new DevExpress.XtraEditors.CheckEdit();
-      this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
-      this.grpFirmwareNote = new DevExpress.XtraEditors.GroupControl();
+      this.grpSetup = new DevExpress.XtraEditors.GroupControl();
+      this.grpInformation = new DevExpress.XtraEditors.GroupControl();
       this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
-      ((System.ComponentModel.ISupportInitialize)(this.grpSettings)).BeginInit();
-      this.grpSettings.SuspendLayout();
+      this.lblHotelMenuAutoDetect = new DevExpress.XtraEditors.LabelControl();
+      ((System.ComponentModel.ISupportInitialize)(this.grpOption)).BeginInit();
+      this.grpOption.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.cbHbbTv.Properties)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.cbCustomCountry.Properties)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).BeginInit();
@@ -55,20 +56,20 @@
       ((System.ComponentModel.ISupportInitialize)(this.cbDtvUpdate.Properties)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.cbHotelMode.Properties)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.cbAutoChannelUpdate.Properties)).BeginInit();
-      ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).BeginInit();
-      this.groupControl1.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.grpFirmwareNote)).BeginInit();
-      this.grpFirmwareNote.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.grpSetup)).BeginInit();
+      this.grpSetup.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.grpInformation)).BeginInit();
+      this.grpInformation.SuspendLayout();
       this.SuspendLayout();
       // 
-      // grpSettings
+      // grpOption
       // 
-      this.grpSettings.Controls.Add(this.cbHbbTv);
-      this.grpSettings.Controls.Add(this.cbCustomCountry);
-      this.grpSettings.Controls.Add(this.comboBoxEdit1);
-      this.grpSettings.Controls.Add(this.labelControl1);
-      resources.ApplyResources(this.grpSettings, "grpSettings");
-      this.grpSettings.Name = "grpSettings";
+      this.grpOption.Controls.Add(this.cbHbbTv);
+      this.grpOption.Controls.Add(this.cbCustomCountry);
+      this.grpOption.Controls.Add(this.comboBoxEdit1);
+      this.grpOption.Controls.Add(this.labelControl1);
+      resources.ApplyResources(this.grpOption, "grpOption");
+      this.grpOption.Name = "grpOption";
       // 
       // cbHbbTv
       // 
@@ -146,23 +147,30 @@
       this.cbAutoChannelUpdate.Name = "cbAutoChannelUpdate";
       this.cbAutoChannelUpdate.Properties.Caption = resources.GetString("cbAutoChannelUpdate.Properties.Caption");
       // 
-      // groupControl1
+      // grpSetup
       // 
-      this.groupControl1.Controls.Add(this.cbAutoChannelUpdate);
-      resources.ApplyResources(this.groupControl1, "groupControl1");
-      this.groupControl1.Name = "groupControl1";
+      this.grpSetup.Controls.Add(this.cbAutoChannelUpdate);
+      resources.ApplyResources(this.grpSetup, "grpSetup");
+      this.grpSetup.Name = "grpSetup";
       // 
-      // grpFirmwareNote
+      // grpInformation
       // 
-      this.grpFirmwareNote.Controls.Add(this.labelControl4);
-      resources.ApplyResources(this.grpFirmwareNote, "grpFirmwareNote");
-      this.grpFirmwareNote.Name = "grpFirmwareNote";
+      this.grpInformation.Controls.Add(this.labelControl4);
+      resources.ApplyResources(this.grpInformation, "grpInformation");
+      this.grpInformation.Name = "grpInformation";
       // 
       // labelControl4
       // 
       resources.ApplyResources(this.labelControl4, "labelControl4");
       this.labelControl4.Name = "labelControl4";
       // 
+      // lblHotelMenuAutoDetect
+      // 
+      resources.ApplyResources(this.lblHotelMenuAutoDetect, "lblHotelMenuAutoDetect");
+      this.lblHotelMenuAutoDetect.Appearance.ForeColor = ((System.Drawing.Color)(resources.GetObject("labelControl5.Appearance.ForeColor")));
+      this.lblHotelMenuAutoDetect.Name = "lblHotelMenuAutoDetect";
+      this.lblHotelMenuAutoDetect.Click += new System.EventHandler(this.lblHotelMenuAutoDetect_Click);
+      // 
       // TvSettingsForm
       // 
       this.AcceptButton = this.btnOk;
@@ -170,20 +178,21 @@
       resources.ApplyResources(this, "$this");
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.CancelButton = this.btnCancel;
+      this.Controls.Add(this.lblHotelMenuAutoDetect);
       this.Controls.Add(this.grpHotelMode);
       this.Controls.Add(this.btnCancel);
       this.Controls.Add(this.btnOk);
-      this.Controls.Add(this.grpSettings);
-      this.Controls.Add(this.groupControl1);
-      this.Controls.Add(this.grpFirmwareNote);
+      this.Controls.Add(this.grpOption);
+      this.Controls.Add(this.grpSetup);
+      this.Controls.Add(this.grpInformation);
       this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
       this.MaximizeBox = false;
       this.MinimizeBox = false;
       this.Name = "TvSettingsForm";
       this.Load += new System.EventHandler(this.TvSettingsForm_Load);
-      ((System.ComponentModel.ISupportInitialize)(this.grpSettings)).EndInit();
-      this.grpSettings.ResumeLayout(false);
-      this.grpSettings.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.grpOption)).EndInit();
+      this.grpOption.ResumeLayout(false);
+      this.grpOption.PerformLayout();
       ((System.ComponentModel.ISupportInitialize)(this.cbHbbTv.Properties)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.cbCustomCountry.Properties)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).EndInit();
@@ -193,17 +202,18 @@
       ((System.ComponentModel.ISupportInitialize)(this.cbDtvUpdate.Properties)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.cbHotelMode.Properties)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.cbAutoChannelUpdate.Properties)).EndInit();
-      ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).EndInit();
-      this.groupControl1.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.grpFirmwareNote)).EndInit();
-      this.grpFirmwareNote.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.grpSetup)).EndInit();
+      this.grpSetup.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.grpInformation)).EndInit();
+      this.grpInformation.ResumeLayout(false);
       this.ResumeLayout(false);
+      this.PerformLayout();
 
     }
 
     #endregion
 
-    private DevExpress.XtraEditors.GroupControl grpSettings;
+    private DevExpress.XtraEditors.GroupControl grpOption;
     private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit1;
     private DevExpress.XtraEditors.LabelControl labelControl1;
     private DevExpress.XtraEditors.SimpleButton btnOk;
@@ -214,10 +224,11 @@
     private DevExpress.XtraEditors.CheckEdit cbDtvUpdate;
     private DevExpress.XtraEditors.CheckEdit cbHotelMode;
     private DevExpress.XtraEditors.CheckEdit cbAutoChannelUpdate;
-    private DevExpress.XtraEditors.GroupControl groupControl1;
+    private DevExpress.XtraEditors.GroupControl grpSetup;
     private DevExpress.XtraEditors.LabelControl labelControl3;
     private DevExpress.XtraEditors.LabelControl labelControl2;
-    private DevExpress.XtraEditors.GroupControl grpFirmwareNote;
+    private DevExpress.XtraEditors.GroupControl grpInformation;
     private DevExpress.XtraEditors.LabelControl labelControl4;
+    private DevExpress.XtraEditors.LabelControl lblHotelMenuAutoDetect;
   }
 }
\ No newline at end of file
diff --git a/ChanSort.Plugin.TllFile/TvSettingsForm.cs b/ChanSort.Plugin.TllFile/TvSettingsForm.cs
index daf477d..6bf9367 100644
--- a/ChanSort.Plugin.TllFile/TvSettingsForm.cs
+++ b/ChanSort.Plugin.TllFile/TvSettingsForm.cs
@@ -24,22 +24,36 @@ namespace ChanSort.Loader.TllFile
       var mapping = this.tvSerializer.GetFirmwareMapping();
       if (mapping != null)
       {
-        this.cbAutoChannelUpdate.Checked = mapping.SettingsAutomaticChannelUpdate;
-        this.cbHbbTv.Checked = mapping.HbbTvEnabled;
-        this.cbHotelMode.Checked = mapping.HotelModeEnabled;
-        this.cbDtvUpdate.Checked = mapping.HotelModeDtvUpdate;
+        this.grpInformation.Visible = false;
+        this.Height -= this.grpInformation.Height;
+      }
 
-        this.grpFirmwareNote.Visible = false;
-        this.Height -= this.grpFirmwareNote.Height;
+      if (mapping == null || !mapping.SupportsAutoChannelUpdate)
+      {
+        this.grpSetup.Visible = false;
+        this.Height -= this.grpSetup.Height;
       }
       else
       {
-        this.cbAutoChannelUpdate.Enabled = false;
-        this.cbHbbTv.Enabled = false;
-        this.cbHotelMode.Enabled = false;
-        this.cbDtvUpdate.Enabled = false;
+        this.cbAutoChannelUpdate.Checked = mapping.SettingsAutomaticChannelUpdate;        
       }
-    }
+
+      if (mapping == null || !mapping.SupportsHbbTv)
+        this.cbHbbTv.Enabled = false;
+      else
+        this.cbHbbTv.Checked = mapping.HbbTvEnabled;
+
+      if (mapping == null || !mapping.SupportsHotelMenu)
+      {
+        this.grpHotelMode.Visible = false;
+        this.Height -= this.grpHotelMode.Height;
+      }
+      else
+      {
+        this.cbHotelMode.Checked = mapping.HotelModeEnabled;
+        this.cbDtvUpdate.Checked = mapping.HotelModeDtvUpdate;        
+      }
+    }    
 
     private void btnOk_Click(object sender, EventArgs e)
     {
@@ -61,5 +75,10 @@ namespace ChanSort.Loader.TllFile
                                                       ? TextEditStyles.Standard
                                                       : TextEditStyles.DisableTextEditor;
     }
+
+    private void lblHotelMenuAutoDetect_Click(object sender, EventArgs e)
+    {
+      this.lblHotelMenuAutoDetect.Text = this.tvSerializer.GetHotelMenuOffset().ToString();
+    }
   }
 }
diff --git a/ChanSort.Plugin.TllFile/TvSettingsForm.resx b/ChanSort.Plugin.TllFile/TvSettingsForm.resx
index e459046..dff5080 100644
--- a/ChanSort.Plugin.TllFile/TvSettingsForm.resx
+++ b/ChanSort.Plugin.TllFile/TvSettingsForm.resx
@@ -142,7 +142,7 @@
     <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;cbHbbTv.Parent" xml:space="preserve">
-    <value>grpSettings</value>
+    <value>grpOption</value>
   </data>
   <data name="&gt;&gt;cbHbbTv.ZOrder" xml:space="preserve">
     <value>0</value>
@@ -169,7 +169,7 @@
     <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;cbCustomCountry.Parent" xml:space="preserve">
-    <value>grpSettings</value>
+    <value>grpOption</value>
   </data>
   <data name="&gt;&gt;cbCustomCountry.ZOrder" xml:space="preserve">
     <value>1</value>
@@ -194,7 +194,7 @@
     <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;comboBoxEdit1.Parent" xml:space="preserve">
-    <value>grpSettings</value>
+    <value>grpOption</value>
   </data>
   <data name="&gt;&gt;comboBoxEdit1.ZOrder" xml:space="preserve">
     <value>2</value>
@@ -218,37 +218,37 @@
     <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;labelControl1.Parent" xml:space="preserve">
-    <value>grpSettings</value>
+    <value>grpOption</value>
   </data>
   <data name="&gt;&gt;labelControl1.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="grpSettings.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="grpOption.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Top</value>
   </data>
-  <data name="grpSettings.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="grpOption.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 142</value>
   </data>
-  <data name="grpSettings.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="grpOption.Size" type="System.Drawing.Size, System.Drawing">
     <value>480, 106</value>
   </data>
-  <data name="grpSettings.TabIndex" type="System.Int32, mscorlib">
+  <data name="grpOption.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="grpSettings.Text" xml:space="preserve">
+  <data name="grpOption.Text" xml:space="preserve">
     <value>OPTION Menu</value>
   </data>
-  <data name="&gt;&gt;grpSettings.Name" xml:space="preserve">
-    <value>grpSettings</value>
+  <data name="&gt;&gt;grpOption.Name" xml:space="preserve">
+    <value>grpOption</value>
   </data>
-  <data name="&gt;&gt;grpSettings.Type" xml:space="preserve">
+  <data name="&gt;&gt;grpOption.Type" xml:space="preserve">
     <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;grpSettings.Parent" xml:space="preserve">
+  <data name="&gt;&gt;grpOption.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;grpSettings.ZOrder" xml:space="preserve">
-    <value>3</value>
+  <data name="&gt;&gt;grpOption.ZOrder" xml:space="preserve">
+    <value>4</value>
   </data>
   <data name="btnOk.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
@@ -275,7 +275,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnOk.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
@@ -302,7 +302,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <assembly alias="DevExpress.XtraEditors.v12.2" name="DevExpress.XtraEditors.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="labelControl3.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v12.2">
@@ -435,7 +435,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;grpHotelMode.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="cbAutoChannelUpdate.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -459,37 +459,37 @@
     <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;cbAutoChannelUpdate.Parent" xml:space="preserve">
-    <value>groupControl1</value>
+    <value>grpSetup</value>
   </data>
   <data name="&gt;&gt;cbAutoChannelUpdate.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="groupControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="grpSetup.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Top</value>
   </data>
-  <data name="groupControl1.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="grpSetup.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 71</value>
   </data>
-  <data name="groupControl1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="grpSetup.Size" type="System.Drawing.Size, System.Drawing">
     <value>480, 71</value>
   </data>
-  <data name="groupControl1.TabIndex" type="System.Int32, mscorlib">
+  <data name="grpSetup.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
   </data>
-  <data name="groupControl1.Text" xml:space="preserve">
+  <data name="grpSetup.Text" xml:space="preserve">
     <value>SETUP Menu</value>
   </data>
-  <data name="&gt;&gt;groupControl1.Name" xml:space="preserve">
-    <value>groupControl1</value>
+  <data name="&gt;&gt;grpSetup.Name" xml:space="preserve">
+    <value>grpSetup</value>
   </data>
-  <data name="&gt;&gt;groupControl1.Type" xml:space="preserve">
+  <data name="&gt;&gt;grpSetup.Type" xml:space="preserve">
     <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;groupControl1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;grpSetup.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;groupControl1.ZOrder" xml:space="preserve">
-    <value>4</value>
+  <data name="&gt;&gt;grpSetup.ZOrder" xml:space="preserve">
+    <value>5</value>
   </data>
   <data name="labelControl4.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v12.2">
     <value>Vertical</value>
@@ -513,37 +513,67 @@
     <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;labelControl4.Parent" xml:space="preserve">
-    <value>grpFirmwareNote</value>
+    <value>grpInformation</value>
   </data>
   <data name="&gt;&gt;labelControl4.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="grpFirmwareNote.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="grpInformation.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Top</value>
   </data>
-  <data name="grpFirmwareNote.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="grpInformation.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="grpFirmwareNote.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="grpInformation.Size" type="System.Drawing.Size, System.Drawing">
     <value>480, 71</value>
   </data>
-  <data name="grpFirmwareNote.TabIndex" type="System.Int32, mscorlib">
+  <data name="grpInformation.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
   </data>
-  <data name="grpFirmwareNote.Text" xml:space="preserve">
+  <data name="grpInformation.Text" xml:space="preserve">
     <value>Information</value>
   </data>
-  <data name="&gt;&gt;grpFirmwareNote.Name" xml:space="preserve">
-    <value>grpFirmwareNote</value>
+  <data name="&gt;&gt;grpInformation.Name" xml:space="preserve">
+    <value>grpInformation</value>
   </data>
-  <data name="&gt;&gt;grpFirmwareNote.Type" xml:space="preserve">
+  <data name="&gt;&gt;grpInformation.Type" xml:space="preserve">
     <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;grpFirmwareNote.Parent" xml:space="preserve">
+  <data name="&gt;&gt;grpInformation.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;grpFirmwareNote.ZOrder" xml:space="preserve">
-    <value>5</value>
+  <data name="&gt;&gt;grpInformation.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="lblHotelMenuAutoDetect.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="labelControl5.Appearance.ForeColor" type="System.Drawing.Color, System.Drawing">
+    <value>LightGray</value>
+  </data>
+  <data name="lblHotelMenuAutoDetect.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 422</value>
+  </data>
+  <data name="lblHotelMenuAutoDetect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>117, 13</value>
+  </data>
+  <data name="lblHotelMenuAutoDetect.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="lblHotelMenuAutoDetect.Text" xml:space="preserve">
+    <value>Auto-Detect Hotel-Menu</value>
+  </data>
+  <data name="&gt;&gt;lblHotelMenuAutoDetect.Name" xml:space="preserve">
+    <value>lblHotelMenuAutoDetect</value>
+  </data>
+  <data name="&gt;&gt;lblHotelMenuAutoDetect.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v12.2, Version=12.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;lblHotelMenuAutoDetect.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblHotelMenuAutoDetect.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
diff --git a/Test.Plugin.TllFile/UnitTest1.cs b/Test.Plugin.TllFile/UnitTest1.cs
index a6bc7e6..01d03fa 100644
--- a/Test.Plugin.TllFile/UnitTest1.cs
+++ b/Test.Plugin.TllFile/UnitTest1.cs
@@ -55,7 +55,7 @@ namespace Test.Loader.TllFile
         new ExpectedData(@"decklen\xxLW570S-ZD00001.TLL", 0, 30, 1598, 0, 339), // 184/68
         new ExpectedData(@"NeuerScan\xxLM340S-ZA00001.TLL", 34, 317, 1698, 129, 264), // 188/68
         new ExpectedData(@"wagnale\xxLM611S-ZA00001.TLL", 0, 13, 1094, 0, 191), // 188/68
-        new ExpectedData(@"_Pred\xxLM620S-ZE00021.TLL", 0, 11, 1303, 0, 191), // 192/72
+        new ExpectedData(@"_Pred\xxLM620S-ZE00021.TLL", 0, 11, 1303, 0, 191) // 192/72
       };
 
       foreach (var entry in expected)
@@ -71,7 +71,6 @@ namespace Test.Loader.TllFile
     #region TestLoadingAllTllFilesInTestFilesDirectory()
     [TestMethod]
     [DeploymentItem("ChanSort.Loader.TllFile\\ChanSort.Loader.TllFile.ini")]
-    [DeploymentItem("ChanSort.Loader.TllFile2\\ChanSort.Loader.TllFile2.ini")]
     public void TestLoadingAllTllFilesInTestFilesDirectory()
     {
       TllFileSerializerPlugin plugin = new TllFileSerializerPlugin();
@@ -154,7 +153,7 @@ namespace Test.Loader.TllFile
 
     private string GetModel(string filePath)
     {
-      string name = Path.GetFileName(filePath);
+      string name = Path.GetFileName(filePath)??"";
       if (name.StartsWith("xx"))
       {
         int idx = name.IndexOf("-");