diff --git a/bundles/org.openhab.binding.souliss/src/main/java/org/openhab/binding/souliss/internal/handler/SoulissT31Handler.java b/bundles/org.openhab.binding.souliss/src/main/java/org/openhab/binding/souliss/internal/handler/SoulissT31Handler.java
index a7d4cea61..dce745240 100644
--- a/bundles/org.openhab.binding.souliss/src/main/java/org/openhab/binding/souliss/internal/handler/SoulissT31Handler.java
+++ b/bundles/org.openhab.binding.souliss/src/main/java/org/openhab/binding/souliss/internal/handler/SoulissT31Handler.java
@@ -49,7 +49,6 @@ public class SoulissT31Handler extends SoulissGenericHandler {
     StringType fanStateValue = StringType.EMPTY;
     StringType powerState = StringType.EMPTY;
     StringType fireState = StringType.EMPTY;
-
     StringType lastModeState = StringType.EMPTY;
     StringType modeStateValue = StringType.EMPTY;
 
@@ -166,6 +165,12 @@ public class SoulissT31Handler extends SoulissGenericHandler {
                     break;
 
                 case SoulissBindingConstants.T31_HEATINGMODE_MESSAGE_MODE_CHANNEL:
+                    if (!modeStateValue.equals(state)) {
+                        this.updateState(SoulissBindingConstants.T31_MODE_CHANNEL, (StringType) state);
+                        modeStateValue = (StringType) state;
+                    }
+                    break;
+
                 case SoulissBindingConstants.T31_COOLINGMODE_MESSAGE_MODE_CHANNEL:
                     if (!modeStateValue.equals(state)) {
                         this.updateState(SoulissBindingConstants.T31_MODE_CHANNEL, (StringType) state);
@@ -189,13 +194,13 @@ public class SoulissT31Handler extends SoulissGenericHandler {
                 case SoulissBindingConstants.T31_ON_MESSAGE_FIRE_CHANNEL:
                     if (!fireState.equals(state)) {
                         this.updateState(SoulissBindingConstants.T31_FIRE_CHANNEL, OnOffType.ON);
-                        powerState = (StringType) state;
+                        fireState = (StringType) state;
                     }
                     break;
                 case SoulissBindingConstants.T31_OFF_MESSAGE_FIRE_CHANNEL:
                     if (!fireState.equals(state)) {
                         this.updateState(SoulissBindingConstants.T31_FIRE_CHANNEL, OnOffType.OFF);
-                        powerState = (StringType) state;
+                        fireState = (StringType) state;
                     }
                     break;
 
diff --git a/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
index b1ad872e1..f7fabd700 100644
--- a/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.souliss/src/main/resources/OH-INF/thing/thing-types.xml
@@ -1042,14 +1042,14 @@
 	</channel-type>
 
 	<channel-type id="button">
-		<kind>trigger</kind>
+		<item-type>Switch</item-type>
 		<label>Button</label>
 		<description>Button to trigger something</description>
 		<category>Switch</category>
 	</channel-type>
 
 	<channel-type id="buttonReadOnly">
-		<kind>trigger</kind>
+		<item-type>Switch</item-type>
 		<label>Button</label>
 		<description>Button to trigger something</description>
 		<category>Switch</category>
@@ -1154,7 +1154,6 @@
 
 	<channel-type id="float6n">
 		<item-type>Number</item-type>
-		<kind>trigger</kind>
 		<label>Setpoint</label>
 		<description>Floating Point Input</description>
 		<category>Temperature</category>
@@ -1186,7 +1185,7 @@
 		<state readOnly="true" pattern="%.1f %unit%"/>
 	</channel-type>
 
-	<channel-type id="setpointTemperature" advanced="true">
+	<channel-type id="setpointTemperature">
 		<item-type>Number:Temperature</item-type>
 		<label>Setpoint Temperature</label>
 		<description>Setpoint temperature</description>