diff --git a/3D_Printable_Models/HASwitchPlate_front_2x_decora_hasp.stl b/3D_Printable_Models/HASwitchPlate_front_2x_decora_hasp.stl
index 9925377..48eee12 100644
Binary files a/3D_Printable_Models/HASwitchPlate_front_2x_decora_hasp.stl and b/3D_Printable_Models/HASwitchPlate_front_2x_decora_hasp.stl differ
diff --git a/3D_Printable_Models/HASwitchPlate_front_2x_hasp_decora.stl b/3D_Printable_Models/HASwitchPlate_front_2x_hasp_decora.stl
index c5a02ca..de9df1c 100644
Binary files a/3D_Printable_Models/HASwitchPlate_front_2x_hasp_decora.stl and b/3D_Printable_Models/HASwitchPlate_front_2x_hasp_decora.stl differ
diff --git a/3D_Printable_Models/HASwitchPlate_front_2x_hasp_toggle.stl b/3D_Printable_Models/HASwitchPlate_front_2x_hasp_toggle.stl
index 7590837..9ee232d 100644
Binary files a/3D_Printable_Models/HASwitchPlate_front_2x_hasp_toggle.stl and b/3D_Printable_Models/HASwitchPlate_front_2x_hasp_toggle.stl differ
diff --git a/3D_Printable_Models/HASwitchPlate_front_2x_toggle_hasp.stl b/3D_Printable_Models/HASwitchPlate_front_2x_toggle_hasp.stl
index 3c55aa9..0a33c46 100644
Binary files a/3D_Printable_Models/HASwitchPlate_front_2x_toggle_hasp.stl and b/3D_Printable_Models/HASwitchPlate_front_2x_toggle_hasp.stl differ
diff --git a/3D_Printable_Models/HASwitchPlate_front_3x_decora_decora_hasp.stl b/3D_Printable_Models/HASwitchPlate_front_3x_decora_decora_hasp.stl
index bcb062e..3ad9515 100644
Binary files a/3D_Printable_Models/HASwitchPlate_front_3x_decora_decora_hasp.stl and b/3D_Printable_Models/HASwitchPlate_front_3x_decora_decora_hasp.stl differ
diff --git a/3D_Printable_Models/HASwitchPlate_front_3x_decora_hasp_decora.stl b/3D_Printable_Models/HASwitchPlate_front_3x_decora_hasp_decora.stl
index 8468aca..1dc07d8 100644
Binary files a/3D_Printable_Models/HASwitchPlate_front_3x_decora_hasp_decora.stl and b/3D_Printable_Models/HASwitchPlate_front_3x_decora_hasp_decora.stl differ
diff --git a/3D_Printable_Models/HASwitchPlate_front_3x_hasp_decora_decora.stl b/3D_Printable_Models/HASwitchPlate_front_3x_hasp_decora_decora.stl
index 21a9ab4..c6da400 100644
Binary files a/3D_Printable_Models/HASwitchPlate_front_3x_hasp_decora_decora.stl and b/3D_Printable_Models/HASwitchPlate_front_3x_hasp_decora_decora.stl differ
diff --git a/3D_Printable_Models/HASwitchPlate_front_3x_hasp_toggle_toggle.stl b/3D_Printable_Models/HASwitchPlate_front_3x_hasp_toggle_toggle.stl
index 20ce0cd..69faca2 100644
Binary files a/3D_Printable_Models/HASwitchPlate_front_3x_hasp_toggle_toggle.stl and b/3D_Printable_Models/HASwitchPlate_front_3x_hasp_toggle_toggle.stl differ
diff --git a/3D_Printable_Models/HASwitchPlate_front_3x_toggle_toggle_hasp.stl b/3D_Printable_Models/HASwitchPlate_front_3x_toggle_toggle_hasp.stl
index 13c2959..be9c4fe 100644
Binary files a/3D_Printable_Models/HASwitchPlate_front_3x_toggle_toggle_hasp.stl and b/3D_Printable_Models/HASwitchPlate_front_3x_toggle_toggle_hasp.stl differ
diff --git a/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin b/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin
index 244662c..aeef33a 100644
Binary files a/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin and b/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin differ
diff --git a/Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino b/Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino
index a10ee37..7508c07 100644
--- a/Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino
+++ b/Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino
@@ -62,7 +62,6 @@ char motionPinConfig[3] = "0";
 char nextionBaud[7] = "115200";
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
 const float haspVersion = 1.06;                       // Current HASPone software release version
 const uint16_t mqttMaxPacketSize = 2048;              // Size of buffer for incoming MQTT message
 byte nextionReturnBuffer[128];                        // Byte array to pass around data coming from the panel
@@ -946,12 +945,12 @@ void mqttDiscovery()
 
   if (motionEnabled)
   { // binary_sensor for motion
-    String macAddress = String(espMac[0], HEX) + String(F(":")) + String(espMac[1], HEX) + String(F(":")) + String(espMac[2], HEX) + String(F(":")) + String(espMac[3], HEX) + String(F(":")) + String(espMac[4], HEX) + String(F(":")) + String(espMac[5], HEX);
     String mqttDiscoveryTopic = String(hassDiscovery) + String(F("/binary_sensor/")) + String(haspNode) + String(F("-motion/config"));
     String mqttDiscoveryPayload = String(F("{\"device_class\":\"motion\",\"name\":\"")) + String(haspNode) + String(F(" motion\",\"state_topic\":\"")) + mqttMotionStateTopic + String(F("\",\"unique_id\":\"")) + mqttClientId + String(F("-motion\",\"payload_on\":\"ON\",\"payload_off\":\"OFF\",\"device\":{\"identifiers\":[\"")) + mqttClientId + String(F("\"],\"name\":\"")) + String(haspNode) + String(F("\",\"manufacturer\":\"HASwitchPlate\",\"model\":\"HASPone v1.0.0\",\"sw_version\":")) + String(haspVersion) + String(F("}}"));
     mqttClient.publish(mqttDiscoveryTopic, mqttDiscoveryPayload, true, 1);
     debugPrintln(String(F("MQTT OUT: '")) + mqttDiscoveryTopic + String(F("' : '")) + String(mqttDiscoveryPayload) + String(F("'")));
   }
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Arduino_Sketch/debug/HASwitchPlate.ino.d1_mini.elf b/Arduino_Sketch/debug/HASwitchPlate.ino.d1_mini.elf
index c40f553..24fac35 100644
Binary files a/Arduino_Sketch/debug/HASwitchPlate.ino.d1_mini.elf and b/Arduino_Sketch/debug/HASwitchPlate.ino.d1_mini.elf differ