diff --git a/13_MK4/error-codes.yaml b/13_MK4/error-codes.yaml
index 26ac7e7..a1bb8d3 100644
--- a/13_MK4/error-codes.yaml
+++ b/13_MK4/error-codes.yaml
@@ -13,262 +13,333 @@
 # WARNINGS       xx7xx   # Category-less warnings
 
 Errors:
+# MECHANICAL     xx1xx
+
+- code: "13101"
+  title: "STUCK FILAMENT DETECTED"
+  text: "The filament seems to be stuck, please unload it from nextruder and load it again."
+  action: [Unload]
+  id: "STUCK_FILAMENT_DETECTED"
+  approved: true
+  
 # XX103 reserved
+
+# TEMPERATURE    xx2xx
+
 - code: "13201"
   title: "PREHEAT ERROR"
   text: "Check the heatbed heater & thermistor wiring for possible damage."
   id: "BED_PREHEAT_ERROR"
   approved: true
+  
 - code: "13202"
   title: "PREHEAT ERROR"
   text: "Check the print head heater & thermistor wiring for possible damage."
   id: "HOTEND_PREHEAT_ERROR"
   approved: true
+  
 - code: "13203"
   title: "THERMAL RUNAWAY"
   text: "Check the heatbed thermistor wiring for possible damage."
   id: "BED_THERMAL_RUNAWAY"
   approved: true
+  
 - code: "13204"
   title: "THERMAL RUNAWAY"
   text: "Check the print head thermistor wiring for possible damage."
   id: "HOTEND_THERMAL_RUNAWAY"
   approved: true
+  
 - code: "13205"
   title: "MAXTEMP ERROR"
   text: "Check the heatbed thermistor wiring for possible damage."
   id: "BED_MAXTEMP_ERROR"
   approved: true
+  
 - code: "13206"
   title: "MAXTEMP ERROR"
   text: "Check the print head thermistor wiring for possible damage."
   id: "HOTEND_MAXTEMP_ERROR"
   approved: true
+  
 - code: "13207"
   title: "MINTEMP ERROR"
   text: "Check the heatbed thermistor wiring for possible damage."
   id: "BED_MINTEMP_ERROR"
   approved: true
+  
 - code: "13208"
   title: "MINTEMP ERROR"
   text: "Check the print head thermistor wiring for possible damage."
   id: "HOTEND_MINTEMP_ERROR"
   approved: true
+  
 - code: "13209"
   title: "TEMP NOT MATCHING"
   text: "Measured temperature is not matching expected value. Check the thermistor is in contact with heatbed. In case of damage, replace it."
   id: "BED_TEMP_NOT_MATCHING"
   approved: true
+  
 - code: "13210"
   title: "TEMP NOT MATCHING"
   text: "Measured temperature is not matching expected value. Check the thermistor is in contact with hotend. In case of damage, replace it."
   id: "HOTEND_TEMP_NOT_MATCHING"
   approved: true
+  
 - code: "13211"
   title: "HEATBREAK MINTEMP ERROR"
   text: "Check the heatbreak thermistor wiring for possible damage."
   id: "HEATBREAK_MINTEMP_ERR"
   approved: true
+  
 - code: "13212"
   title: "HEATBREAK MAXTEMP ERROR"
   text: "Check the heatbreak thermistor wiring for possible damage."
   id: "HEATBREAK_MAXTEMP_ERR"
   approved: true
-  # XX250-XX257 reserved
+
+# XX250-XX257 reserved  
+
+# ELECTRICAL     xx3xx  
+
 - code: "13301"
   title: "HOMING ERROR Z"
   text: "Failed to home the extruder in Z-axis, make sure the loadcell is working."
   id: "HOMING_ERROR_Z"
   approved: true
-  # XX302-XX303 reserved
+
+# XX302-XX303 reserved
+
 - code: "13304"
   title: "HOMING ERROR X"
   text: "Failed to home the extruder in X-axis, make sure there is no obstacle on X-axis."
   id: "HOMING_ERROR_X"
   approved: true
+  
 - code: "13305"
   title: "HOMING ERROR Y"
   text: "Failed to home the Y-axis, make sure there is no obstacle on Y-axis."
   id: "HOMING_ERROR_Y"
   approved: true
+  
 - code: "13306"
   title: "USB PORT OVERCURRENT"
   text: "Overcurrent detected on USB port."
   id: "USB_HOST_OVERCURRENT"
   approved: true
+  
 - code: "13307"
   title: "USB DEVICE OVERCURRENT"
   text: "Overcurrent detected on connected USB device, disconnect it."
   id: "USB_DEVICE_OVERCURRENT"
   approved: true
+  
 - code: "13308"
   title: "NOZZLE HEATER OVERCURRENT"
   text: "Overcurrent detected on nozzle heater."
   id: "NOZZLE_OVERCURRENT"
   approved: true
+  
 - code: "13309"
   title: "HEATBED PORT OVERCURRENT"
   text: "Overcurrent detected on xBuddy heatbed port, disconnect the device."
   id: "INPUT_OVERCURRENT"
   approved: true
+  
 - code: "13310"
   title: "MMU OVERCURRENT"
   text: "Overcurrent detected on the MMU port, disconnect the device."
   id: "MMU_OVERCURRENT"
   approved: true
+  
 - code: "13311"
   title: "I2C SEND FAILED"
   text: "HAL detected an I2C error when sending data via I2C."
   id: "I2C_TX_ERROR"
   approved: true
+  
 - code: "13312"
   title: "I2C SEND BUSY"
   text: "HAL detected an I2C busy when sending data via I2C."
   id: "I2C_TX_BUSY"
   approved: true
+  
 - code: "13313"
   title: "I2C SEND TIMEOUT"
   text: "HAL detected an I2C timeout when sending data via I2C."
   id: "I2C_TX_TIMEOUT"
   approved: true
+  
 - code: "13314"
   title: "I2C SEND UNDEFINED"
   text: "HAL detected an I2C undefined error when sending data via I2C."
   id: "I2C_TX_UNDEFINED"
   approved: true
+  
 - code: "13315"
   title: "I2C RECEIVE FAILED"
   text: "HAL detected an I2C error when receiving data via I2C."
   id: "I2C_RX_ERROR"
   approved: true
+  
 - code: "13316"
   title: "I2C RECEIVE BUSY"
   text: "HAL detected an I2C busy when receiving data via I2C."
   id: "I2C_RX_BUSY"
   approved: true
+  
 - code: "13317"
   title: "I2C RECEIVE TIMEOUT"
   text: "HAL detected an I2C timeout when receiving data via I2C."
   id: "I2C_RX_TIMEOUT"
   approved: true
+  
 - code: "13318"
   title: "I2C RECEIVE UNDEFINED"
   text: "HAL detected an I2C undefined error when receiving data via I2C."
   id: "I2C_RX_UNDEFINED"
   approved: true
-  # XX319-XX320 reserved
+
+# XX319-XX320 reserved
+
 - code: "13321"
   title: "POWER PANIC"
   text: "Power panic has been detected during printer initialization. Inspect wiring of PP-cable."
   id: "ACF_AT_INIT"
   approved: false
-  # XX501-XX503 reserved
+
+# SYSTEM         xx5xx
+
+# XX501-XX503 reserved
+
 - code: "13504"
   title: "ESP ERROR"
   text: "Reading ESP firmware failed."
   id: "ESP_FW_READ"
   approved: true
+  
 - code: "13505"
   title: "ESP ERROR"
   text: "ESP detected command error."
   id: "ESP_COMMAND_ERR"
   approved: true
+  
 - code: "13506"
   title: "ESP ERROR"
   text: "ESP detected unknown error."
   id: "ESP_UNKNOWN_ERR"
   approved: true
+  
 - code: "13507"
   title: "OUT OF MEMORY"
   text: "Dynamic allocation failed - out of memory. Reset the printer."
   id: "MALLOC_ERROR"
   approved: true
+  
 - code: "13508"
   title: "PNG BUFFER FULL"
   text: "Allocation of dynamic buffer for PNG failed - out of memory."
   id: "PNG_MALLOC_ERROR"
   approved: true
+  
 - code: "13510"
   title: "EMERGENCY STOP"
   text: "Emergency stop invoked from G-code (M112)."
   id: "EMERGENCY_STOP"
   approved: true
-  # XX511-XX522 reserved
+
+# XX511-XX522 reserved
+
 - code: "13523"
   title: "LOADCELL NOT CALIBRATED"
   text: "Loadcell calibration is incomplete. Restart the printer."
   id: "LOADCELL_INCOMPLETE_CONFIGURATION_ERROR"
   approved: true
+  
 - code: "13524"
   title: "LOADCELL TARE ERROR"
   text: "There was an error requesting the tare for loadcell."
   id: "LOADCELL_TARE_ALREADY_REQUESTED"
   approved: true
+  
 - code: "13525"
   title: "LOADCELL TARE FAILED"
   text: "Setting the tare failed. Check the loadcell wiring and connection."
   id: "LOADCELL_TARE_FAILED"
   approved: true
+  
 - code: "13526"
   title: "LOADCELL MEASURE FAILED"
   text: "Loadcell measured an inifinite or undefined load value."
   id: "LOADCELL_INFINITE_LOAD"
   approved: true
+  
 - code: "13527"
   title: "LOADCELL BAD CONFIGURATION"
   text: "The loadcell configuration is incorrect."  
   id: "LOADCELL_BAD_CONFIGURATION"
   approved: true
+  
 - code: "13528"
   title: "LOADCELL TIMEOUT"
   text: "There was a timeout while waiting for measurement sample, please repeat the action."
   id: "LOADCELL_TIMEOUT"
   approved: true
+  
 - code: "13529"
   title: "LED MEMORY ERROR"
   text: "Memory allocation failed for scheduled LED animation"
   id: "LED_ANIMATION_BAD_SPACE_MANAGEMENT"
   approved: true
+  
 - code: "13530"
   title: "MARLIN REQUEST TIMEOUT"
   text: "Marlin client could not send message to Marlin server and timeout was reached."
   id: "MARLIN_CLIENT_SERVER_REQUEST_TIMEOUT"
   approved: true
+  
 - code: "13531"
   title: "BBF ALLOCATION FAILED"
   text: "Space allocation for firmware BBF file failed. Repeat the action or try another USB drive."
   id: "BBF_ALLOCATION_FAILED"
   approved: true
+  
 - code: "13532"
   title: "BBF INITIALIZATION FAILED"
   text: "BBF initialization failed, repeat the action or try another USB drive."
   id: "BBF_INIT_FAILED"
   approved: true
+  
 - code: "13533"
   title: "ESP NOT CONNECTED"
   text: "ESP doesn't seem to be connected."
   id: "ESP_NOT_CONNECTED"
   approved: false
+  
 - code: "13602"
   title: ""
   text: "USB drive not\nconnected! Please\ninsert a USB drive\nwith a valid\nfirmware file."
   id: "USB_NOT_CONNECTED"
   approved: true
+  
 - code: "13603"
   title: ""
   text: "Firmware file has\ninvalid size!\nCheck the file\non the USB drive\nand try again."
   id: "INVALID_FW_SIZE_ON_USB"
   approved: true
+  
 - code: "13604"
   title: ""
   text: "Firmware file\nmissing in the USB\nflash!"
   id: "NO_FW_ON_USB"
   approved: true
+  
 - code: "13605"
   title: ""
   text: "Error erasing\n flash! Restart\nthe printer and\ntry again."
   id: "FLASH_ERASE_ERROR"
   approved: true
+  
 - code: "13606"
   title: ""
   text: "Firmware signature\nverification failed!\nOnly official\nsigned firmware can\nbe flashed."
@@ -279,31 +350,37 @@ Errors:
   text: "Firmware hash\nverification failed!\nFirmware file is\ndamaged. Try\ndownloading and\ncopying it onto the\nUSB drive again."
   id: "HASH_VERIFICATION_FAILED"
   approved: true
+  
 - code: "13608"
   title: ""
   text: "Firmware in the\ninternal flash\ncorrupted! Please\nreflash the\nfirmware."
   id: "FW_IN_INTERNAL_FLASH_CORRUPTED"
   approved: true
+  
 - code: "13610"
   title: ""
   text: "Firmware/printer\ntypes do not match.\nMake sure you have\nthe right firmware\nfile for your\nprinter model."
   id: "UNSUPPORTED_PRINTER_TYPE"
   approved: true
+  
 - code: "13611"
   title: ""
   text: "Firmware/printer\nversions do not\nmatch! You are\ntrying to flash\nFW meant for other\nrevision of the\nBuddy board."
   id: "UNSUPPORTED_PRINTER_VERSION"
   approved: true
+  
 - code: "13612"
   title: ""
   text: "No firmware found\nin the internal\nflash! Please\nflash firmware\nfirst!"
   id: "NO_FW_IN_INTERNAL_FLASH"
   approved: true
+  
 - code: "13613"
   title: ""
   text: "File system error!\nTry a different USB\ndrive or format the\ndrive with FAT32\nfilesystem (all \ndata will be lost)!"
   id: "FILE_SYSTEM_ERROR"
   approved: true
+  
 - code: "13614"
   title: ""
   text: "USB flash drive contains\nunsupported firmware BBF file."