diff --git a/src/devices/Amg88xx/category.txt b/src/devices/Amg88xx/category.txt
index 040ba7cac6..43a8f7eb0e 100644
--- a/src/devices/Amg88xx/category.txt
+++ b/src/devices/Amg88xx/category.txt
@@ -1,2 +1 @@
-Thermophile sensor
-Heat image camera
\ No newline at end of file
+infrared
diff --git a/src/devices/Device-Index.md b/src/devices/Device-Index.md
index 69312b0be3..de66f0ce3a 100755
--- a/src/devices/Device-Index.md
+++ b/src/devices/Device-Index.md
@@ -10,6 +10,7 @@
 * [AGS01DB - MEMS VOC Gas Sensor](Ags01db/README.md)
 * [AHT10/15/20 - Temperature and humidity sensor modules](Ahtxx/README.md)
 * [AK8963 - Magnetometer](Ak8963/README.md)
+* [AMG88xx Infrared Array Sensor Family](Amg88xx/README.md)
 * [APA102 - Double line transmission integrated control LED](Apa102/README.md)
 * [Bh1745 - RGB Sensor](Bh1745/README.md)
 * [BH1750FVI - Ambient Light Sensor](Bh1750fvi/README.md)
@@ -34,6 +35,7 @@
 * [HMC5883L - 3 Axis Digital Compass](Hmc5883l/README.md)
 * [HTS221 - Capacitive digital sensor for relative humidity and temperature](Hts221/README.md)
 * [INA219 - Bidirectional Current/Power Monitor](Ina219/README.md)
+* [Key Matrix](KeyMatrix/README.md)
 * [LM75 - Digital Temperature Sensor](Lm75/README.md)
 * [LPS25H - Piezoresistive pressure and thermometer sensor](Lps25h/README.md)
 * [LSM9DS1 - 3D accelerometer, gyroscope and magnetometer](Lsm9Ds1/README.md)
@@ -45,6 +47,7 @@
 * [Mcp3428 - Analog to Digital Converter (I2C)](Mcp3428/README.md)
 * [MCP3xxx family of Analog to Digital Converters](Mcp3xxx/README.md)
 * [MCP9808 - Digital Temperature Sensor](Mcp9808/README.md)
+* [MFRC522 - RFID reader](Mfrc522/README.md)
 * [MH-Z19B CO2-Sensor](Mhz19b/README.md)
 * [MLX90614 - Infra Red Thermometer](Mlx90614/README.md)
 * [MotorHat](MotorHat/README.md)
@@ -56,6 +59,7 @@
 * [OpenHardwareMonitor client library](HardwareMonitor/README.md)
 * [Pca95x4 - I2C GPIO Expander](Pca95x4/README.md)
 * [Pca9685 - I2C PWM Driver](Pca9685/README.md)
+* [PiJuice - power supply for Raspberry Pi](PiJuice/README.md)
 * [PN5180 - RFID and NFC reader](Pn5180/README.md)
 * [PN532 - RFID and NFC reader](Pn532/README.md)
 * [Quadrature Rotary Encoder](RotaryEncoder/README.md)
@@ -78,8 +82,10 @@
 * [Solomon Systech Ssd1351 - CMOS OLED](Ssd1351/README.md)
 * [SPI, GPIO and I2C drivers for FT4222](Ft4222/README.md)
 * [Still image recording library](Media/README.md)
+* [STUSB4500 - Autonomous USB-C PD controller for Power Sinks / UFP](StUsb4500/README.md)
 * [TCS3472x Sensors](Tcs3472x/README.md)
 * [TM1637 - Segment Display](Tm1637/README.md)
+* [TSL256x - Illuminance sensor](Tsl256x/README.md)
 * [VL53L0X - distance sensor](Vl53L0X/README.md)
 * [Ws28xx LED drivers](Ws28xx/README.md)
 * [μFire ISE Probe - pH, ORP and temperature sensor](UFireIse/README.md)
diff --git a/src/devices/Ina219/category.txt b/src/devices/Ina219/category.txt
index b04505bffc..3954b07309 100644
--- a/src/devices/Ina219/category.txt
+++ b/src/devices/Ina219/category.txt
@@ -1 +1,2 @@
 adc
+power
diff --git a/src/devices/KeyMatrix/category.txt b/src/devices/KeyMatrix/category.txt
new file mode 100644
index 0000000000..6b5f9104c9
--- /dev/null
+++ b/src/devices/KeyMatrix/category.txt
@@ -0,0 +1 @@
+gpio
diff --git a/src/devices/Mfrc522/category.txt b/src/devices/Mfrc522/category.txt
new file mode 100644
index 0000000000..7aef497efd
--- /dev/null
+++ b/src/devices/Mfrc522/category.txt
@@ -0,0 +1 @@
+nfc
diff --git a/src/devices/Mlx90614/README.md b/src/devices/Mlx90614/README.md
index 6df1a116d7..0e060ec51e 100644
--- a/src/devices/Mlx90614/README.md
+++ b/src/devices/Mlx90614/README.md
@@ -1,4 +1,5 @@
 # MLX90614 - Infra Red Thermometer
+
 The MLX90614 is an Infra Red thermometer for noncontact temperature measurements. Both the IR sensitive thermopile detector chip and the signal conditioning ASSP are integrated in the same TO-39 can. Thanks to its low noise amplifier, 17-bit ADC and powerful DSP unit, a high accuracy and resolution of the thermometer is achieved. 
 
 ## Sensor Image
diff --git a/src/devices/Mlx90614/category.txt b/src/devices/Mlx90614/category.txt
index 8d4a8f7ceb..310ea701d0 100644
--- a/src/devices/Mlx90614/category.txt
+++ b/src/devices/Mlx90614/category.txt
@@ -1 +1,2 @@
 thermometer
+infrared
diff --git a/src/devices/PiJuice/README.md b/src/devices/PiJuice/README.md
index e62266846e..c9f29354fb 100644
--- a/src/devices/PiJuice/README.md
+++ b/src/devices/PiJuice/README.md
@@ -1,4 +1,4 @@
-# PiJuice
+# PiJuice - power supply for Raspberry Pi
 
 ## Summary
 
diff --git a/src/devices/PiJuice/category.txt b/src/devices/PiJuice/category.txt
new file mode 100644
index 0000000000..d028b9b544
--- /dev/null
+++ b/src/devices/PiJuice/category.txt
@@ -0,0 +1 @@
+power
diff --git a/src/devices/README.md b/src/devices/README.md
index d202d2d04d..04c3ba2a26 100755
--- a/src/devices/README.md
+++ b/src/devices/README.md
@@ -44,6 +44,7 @@ Our vision: the majority of .NET bindings are written completely in .NET languag
 * [BH1750FVI - Ambient Light Sensor](Bh1750fvi/README.md)
 * [MAX44009 - Ambient Light Sensor](Max44009/README.md)
 * [TCS3472x Sensors](Tcs3472x/README.md)
+* [TSL256x - Illuminance sensor](Tsl256x/README.md)
 
 ### Barometers
 
@@ -77,6 +78,11 @@ Our vision: the majority of .NET bindings are written completely in .NET languag
 * [Si7021 - Temperature & Humidity Sensor](Si7021/README.md)
 * [μFire ISE Probe - pH, ORP and temperature sensor](UFireIse/README.md)
 
+### Infrared sensors
+
+* [AMG88xx Infrared Array Sensor Family](Amg88xx/README.md)
+* [MLX90614 - Infra Red Thermometer](Mlx90614/README.md)
+
 ### Gyroscopes
 
 * [BNO055 - inertial measurement unit](Bno055/README.md)
@@ -209,6 +215,7 @@ Our vision: the majority of .NET bindings are written completely in .NET languag
 
 ### RFID/NFC modules
 
+* [MFRC522 - RFID reader](Mfrc522/README.md)
 * [PN5180 - RFID and NFC reader](Pn5180/README.md)
 * [PN532 - RFID and NFC reader](Pn532/README.md)
 * [RFID shared elements](Card/README.md)
@@ -221,12 +228,14 @@ Our vision: the majority of .NET bindings are written completely in .NET languag
 ### USB devices
 
 * [SPI, GPIO and I2C drivers for FT4222](Ft4222/README.md)
+* [STUSB4500 - Autonomous USB-C PD controller for Power Sinks / UFP](StUsb4500/README.md)
 
 ### GPIO or bit operating devices
 
 * [Charlieplex Segment binding](Charlieplex/README.md)
 * [Digital liquid level switch](LiquidLevel/README.md)
 * [Generic shift register](ShiftRegister/README.md)
+* [Key Matrix](KeyMatrix/README.md)
 * [MBI5027 -- 16-bit shift register with error detection](Mbi5027/README.md)
 * [Quadrature Rotary Encoder](RotaryEncoder/README.md)
 * [SN74HC595 -- 8-bit shift register](Sn74hc595/README.md)
@@ -247,6 +256,11 @@ Our vision: the majority of .NET bindings are written completely in .NET languag
 * [Software SPI](SoftwareSpi/README.md)
 * [SPI, GPIO and I2C drivers for FT4222](Ft4222/README.md)
 
+### Power monitors and related devices
+
+* [INA219 - Bidirectional Current/Power Monitor](Ina219/README.md)
+* [PiJuice - power supply for Raspberry Pi](PiJuice/README.md)
+
 </categorizedDevices>
 
 ## Binding Distribution
diff --git a/src/devices/Tsl256x/category.txt b/src/devices/Tsl256x/category.txt
new file mode 100644
index 0000000000..162faa69f2
--- /dev/null
+++ b/src/devices/Tsl256x/category.txt
@@ -0,0 +1 @@
+light
diff --git a/tools/device-listing/Program.cs b/tools/device-listing/Program.cs
index 2f3b310294..68e75f34dd 100644
--- a/tools/device-listing/Program.cs
+++ b/tools/device-listing/Program.cs
@@ -19,6 +19,7 @@
     "barometer",
     "altimeter",
     "thermometer",
+    "infrared",
     "gyroscope",
     "compass",
     "lego",
@@ -46,6 +47,7 @@
     "gpio",
     "multi",
     "protocol",
+    "power",
 };
 
 Dictionary<string, string?> categoriesDescriptions = new()
@@ -59,6 +61,7 @@
     { "barometer", "Barometers" },
     { "altimeter", "Altimeters" },
     { "thermometer", "Thermometers" },
+    { "infrared", "Infrared sensors" },
     { "gyroscope", "Gyroscopes" },
     { "compass", "Compasses" },
     { "lego", "Lego related devices" },
@@ -90,6 +93,7 @@
     { "media", "Media libraries" },
     { "usb", "USB devices" },
     { "gpio", "GPIO or bit operating devices" },
+    { "power", "Power monitors and related devices" },
     { "multi", "Multi-device or robot kit" },
     // Bucket for stuff we want mentioned but there is no clear category
     // In other words: anything allowing a way to create PWM channel, SPI/I2C/... device