diff --git a/include/display.h b/include/display.h
index 77a5a70..150b47e 100644
--- a/include/display.h
+++ b/include/display.h
@@ -99,6 +99,8 @@ namespace Display {
   }
 
   void displayText(const char c[]) {
+    tDisplay.disable();
+    displayColon(false);
     clockDisplay.println(c);
     clockDisplay.writeDisplay();
     adjustTime();
diff --git a/include/ir.h b/include/ir.h
index 1b71341..d21bdb8 100644
--- a/include/ir.h
+++ b/include/ir.h
@@ -55,15 +55,27 @@ namespace Ir {
             case 0x12:
                 command("Slp");
                 break;
+            case 0xC1:
+                Display::displayText("Mute");
+                break;
             case 0xC4:
                 command("Play");
                 break;
+            case 0xC7:
+                avrOn ? Display::displayText("  Up") : Display::changeBrightness(true);
+                Mqtt::commands.pop();
+                break;
+            case 0xC8:
+                avrOn ? Display::displayText("  Dn") : Display::changeBrightness(false);
+                Mqtt::commands.pop();
+                break;
             case 0xD0:
-                command("Fire");
+                command("Stop");
                 break;
             case 0xC0:
-                avrOn = true;
-                Wifi::reconnect();
+                command("On");
+                break;
+            case 0x84:
                 Display::displayFloat(Bmp::bmp.readTemperature());
                 break;
             default:
@@ -71,24 +83,6 @@ namespace Ir {
                 break;
             }
         }
-        if (Mqtt::commands.getCurrent() == 0xC7) {
-            if (!avrOn) {
-                Display::displayText("B Up");
-                Display::changeBrightness(true);
-            } else {
-                Display::displayText("  Up");
-            }
-            Mqtt::commands.pop();
-        }
-        if (Mqtt::commands.getCurrent() == 0xC8) {
-            if (!avrOn) {
-                Display::displayText("B Dn");
-                Display::changeBrightness(false);
-            } else {
-                Display::displayText("  Dn");
-            }
-            Mqtt::commands.pop();
-        }
     }
 
     void setup() {