From: Uwe Hermann <redacted>
Date: Thu, 14 Mar 2019 23:57:04 +0000 (+0100)
Subject: decoders: Add/update tags for each PD.
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=d6d8a8a440ea2a81e6ddde33d16bc84d01cdb432;hp=4c180223a8ae12feb7bc3601e07e848fb9cdb493

decoders: Add/update tags for each PD.
---

diff --git a/decoders/ac97/pd.py b/decoders/ac97/pd.py
index 8cb47a8..ecf8809 100644
--- a/decoders/ac97/pd.py
+++ b/decoders/ac97/pd.py
@@ -60,7 +60,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['ac97']
-    tags = ['Logic', 'Audio']
+    tags = ['Audio', 'PC']
     channels = (
         {'id': 'sync', 'name': 'SYNC', 'desc': 'Frame synchronization'},
         {'id': 'clk', 'name': 'BIT_CLK', 'desc': 'Data bits clock'},
diff --git a/decoders/ade77xx/pd.py b/decoders/ade77xx/pd.py
index 8945cdc..636c548 100644
--- a/decoders/ade77xx/pd.py
+++ b/decoders/ade77xx/pd.py
@@ -34,7 +34,7 @@ class Decoder(srd.Decoder):
     license = 'mit'
     inputs = ['spi']
     outputs = ['ade77xx']
-    tags = ['Logic', 'Sensors']
+    tags = ['Analog/digital', 'IC', 'Sensor']
     annotations = (
         ('read', 'Register read commands'),
         ('write', 'Register write commands'),
diff --git a/decoders/adf435x/pd.py b/decoders/adf435x/pd.py
index 098c3a6..c6a6774 100644
--- a/decoders/adf435x/pd.py
+++ b/decoders/adf435x/pd.py
@@ -96,7 +96,7 @@ class Decoder(srd.Decoder):
     license = 'gplv3+'
     inputs = ['spi']
     outputs = ['adf435x']
-    tags = ['Logic']
+    tags = ['Clock/timing', 'IC', 'Wireless/RF']
     annotations = (
         # Sent from the host to the chip.
         ('register', 'Register written to the device'),
diff --git a/decoders/adns5020/pd.py b/decoders/adns5020/pd.py
index 74d7a23..1703659 100644
--- a/decoders/adns5020/pd.py
+++ b/decoders/adns5020/pd.py
@@ -47,7 +47,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['adns5020']
-    tags = ['Logic', 'Sensors']
+    tags = ['IC', 'PC', 'Sensor']
     annotations = (
         ('read', 'Register read commands'),
         ('write', 'Register write commands'),
diff --git a/decoders/am230x/pd.py b/decoders/am230x/pd.py
index d3af8c5..3d36cbb 100644
--- a/decoders/am230x/pd.py
+++ b/decoders/am230x/pd.py
@@ -42,7 +42,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['am230x']
-    tags = ['Logic', 'Sensors']
+    tags = ['IC', 'Sensor']
     channels = (
         {'id': 'sda', 'name': 'SDA', 'desc': 'Single wire serial data line'},
     )
diff --git a/decoders/arm_etmv3/pd.py b/decoders/arm_etmv3/pd.py
index b038604..133196a 100644
--- a/decoders/arm_etmv3/pd.py
+++ b/decoders/arm_etmv3/pd.py
@@ -135,7 +135,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['uart']
     outputs = ['arm_etmv3']
-    tags = ['Logic', 'MCU Debugging']
+    tags = ['Debug/trace']
     annotations = (
         ('trace', 'Trace info'),
         ('branch', 'Branches'),
diff --git a/decoders/arm_itm/pd.py b/decoders/arm_itm/pd.py
index e284d27..4359bba 100644
--- a/decoders/arm_itm/pd.py
+++ b/decoders/arm_itm/pd.py
@@ -45,7 +45,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['uart']
     outputs = ['arm_itm']
-    tags = ['Logic', 'MCU Debugging']
+    tags = ['Debug/trace']
     options = (
         {'id': 'objdump', 'desc': 'objdump path',
             'default': 'arm-none-eabi-objdump'},
diff --git a/decoders/arm_tpiu/pd.py b/decoders/arm_tpiu/pd.py
index cda3b09..29b4605 100644
--- a/decoders/arm_tpiu/pd.py
+++ b/decoders/arm_tpiu/pd.py
@@ -28,7 +28,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['uart']
     outputs = ['uart'] # Emulate uart output so that arm_itm/arm_etm can stack.
-    tags = ['Logic', 'MCU Debugging']
+    tags = ['Debug/trace']
     options = (
         {'id': 'stream', 'desc': 'Stream index', 'default': 1},
         {'id': 'sync_offset', 'desc': 'Initial sync offset', 'default': 0},
diff --git a/decoders/atsha204a/pd.py b/decoders/atsha204a/pd.py
index e62122c..56cb75b 100644
--- a/decoders/atsha204a/pd.py
+++ b/decoders/atsha204a/pd.py
@@ -89,7 +89,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['atsha204a']
-    tags = ['Logic']
+    tags = ['Security/crypto', 'IC', 'Memory']
     annotations = (
         ('waddr', 'Word address'),
         ('count', 'Count'),
diff --git a/decoders/aud/pd.py b/decoders/aud/pd.py
index ffd79ec..97fa6cc 100644
--- a/decoders/aud/pd.py
+++ b/decoders/aud/pd.py
@@ -33,7 +33,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['aud']
-    tags = ['Logic', 'MCU Debugging']
+    tags = ['Debug/trace']
     channels = (
         {'id': 'audck', 'name': 'AUDCK', 'desc': 'AUD clock'},
         {'id': 'naudsync', 'name': 'nAUDSYNC', 'desc': 'AUD sync'},
diff --git a/decoders/avr_isp/pd.py b/decoders/avr_isp/pd.py
index 3d6d154..1d2ceae 100644
--- a/decoders/avr_isp/pd.py
+++ b/decoders/avr_isp/pd.py
@@ -31,7 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['avr_isp']
-    tags = ['Logic', 'MCU Debugging']
+    tags = ['Debug/trace']
     annotations = (
         ('pe', 'Programming enable'),
         ('rsb0', 'Read signature byte 0'),
diff --git a/decoders/avr_pdi/pd.py b/decoders/avr_pdi/pd.py
index 184e632..614eb4f 100644
--- a/decoders/avr_pdi/pd.py
+++ b/decoders/avr_pdi/pd.py
@@ -120,7 +120,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['pdi']
-    tags = ['Logic', 'MCU Debugging']
+    tags = ['Debug/trace']
     channels = (
         {'id': 'reset', 'name': 'RESET', 'desc': 'RESET / PDI_CLK'},
         {'id': 'data', 'name': 'DATA', 'desc': 'PDI_DATA'},
diff --git a/decoders/can/pd.py b/decoders/can/pd.py
index 1084fe8..3f7d529 100644
--- a/decoders/can/pd.py
+++ b/decoders/can/pd.py
@@ -31,7 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['can']
-    tags = ['Logic', 'Bus']
+    tags = ['Automotive']
     channels = (
         {'id': 'can_rx', 'name': 'CAN RX', 'desc': 'CAN bus line'},
     )
diff --git a/decoders/cec/pd.py b/decoders/cec/pd.py
index da04997..4b5ccee 100644
--- a/decoders/cec/pd.py
+++ b/decoders/cec/pd.py
@@ -56,7 +56,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['cec']
-    tags = ['Logic', 'Bus', 'Video']
+    tags = ['Display', 'PC']
     channels = (
         {'id': 'cec', 'name': 'CEC', 'desc': 'CEC bus data'},
     )
diff --git a/decoders/cfp/pd.py b/decoders/cfp/pd.py
index 77e61a9..57b5239 100644
--- a/decoders/cfp/pd.py
+++ b/decoders/cfp/pd.py
@@ -58,6 +58,7 @@ class Decoder(srd.Decoder):
     license = 'BSD'
     inputs = ['mdio']
     outputs = ['cfp']
+    tags = ['Networking']
     annotations = (
         ('register', 'Register'),
         ('decode', 'Decode'),
diff --git a/decoders/counter/pd.py b/decoders/counter/pd.py
index 4be08c3..93ec105 100644
--- a/decoders/counter/pd.py
+++ b/decoders/counter/pd.py
@@ -31,7 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = []
-    tags = ['Logic', 'Tools']
+    tags = ['Util']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/dali/pd.py b/decoders/dali/pd.py
index bf842ad..525066d 100644
--- a/decoders/dali/pd.py
+++ b/decoders/dali/pd.py
@@ -32,6 +32,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['dali']
+    tags = ['Embedded/industrial', 'Lighting']
     channels = (
         {'id': 'dali', 'name': 'DALI', 'desc': 'DALI data line'},
     )
diff --git a/decoders/dcf77/pd.py b/decoders/dcf77/pd.py
index 7b09ce6..cd3f7e6 100644
--- a/decoders/dcf77/pd.py
+++ b/decoders/dcf77/pd.py
@@ -33,6 +33,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['dcf77']
+    tags = ['Clock/timing']
     channels = (
         {'id': 'data', 'name': 'DATA', 'desc': 'DATA line'},
     )
diff --git a/decoders/dmx512/pd.py b/decoders/dmx512/pd.py
index 1bcca20..9d694d5 100644
--- a/decoders/dmx512/pd.py
+++ b/decoders/dmx512/pd.py
@@ -28,6 +28,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['dmx512']
+    tags = ['Embedded/industrial', 'Lighting']
     channels = (
         {'id': 'dmx', 'name': 'DMX data', 'desc': 'Any DMX data line'},
     )
diff --git a/decoders/ds1307/pd.py b/decoders/ds1307/pd.py
index 0bb1fb2..0cd3b9d 100644
--- a/decoders/ds1307/pd.py
+++ b/decoders/ds1307/pd.py
@@ -60,6 +60,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['ds1307']
+    tags = ['Clock/timing', 'IC']
     annotations =  regs_and_bits() + (
         ('read-datetime', 'Read date/time'),
         ('write-datetime', 'Write date/time'),
diff --git a/decoders/ds243x/pd.py b/decoders/ds243x/pd.py
index c93395d..bc2fe35 100644
--- a/decoders/ds243x/pd.py
+++ b/decoders/ds243x/pd.py
@@ -69,6 +69,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['onewire_network']
     outputs = ['ds243x']
+    tags = ['IC', 'Memory']
     annotations = (
         ('text', 'Human-readable text'),
     )
diff --git a/decoders/ds28ea00/pd.py b/decoders/ds28ea00/pd.py
index a792d95..1a3cbf3 100644
--- a/decoders/ds28ea00/pd.py
+++ b/decoders/ds28ea00/pd.py
@@ -43,6 +43,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['onewire_network']
     outputs = ['ds28ea00']
+    tags = ['IC', 'Sensor']
     annotations = (
         ('text', 'Human-readable text'),
     )
diff --git a/decoders/dsi/pd.py b/decoders/dsi/pd.py
index c5d9bf9..db1f966 100644
--- a/decoders/dsi/pd.py
+++ b/decoders/dsi/pd.py
@@ -31,6 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['dsi']
+    tags = ['Embedded/industrial', 'Lighting']
     channels = (
         {'id': 'dsi', 'name': 'DSI', 'desc': 'DSI data line'},
     )
diff --git a/decoders/edid/pd.py b/decoders/edid/pd.py
index fe39c6d..0be81dd 100644
--- a/decoders/edid/pd.py
+++ b/decoders/edid/pd.py
@@ -81,7 +81,7 @@ class Decoder(srd.Decoder):
     license = 'gplv3+'
     inputs = ['i2c']
     outputs = ['edid']
-    tags = ['Logic', 'Video', 'Bus']
+    tags = ['Display', 'Memory', 'PC']
     annotations = (
         ('fields', 'EDID structure fields'),
         ('sections', 'EDID structure sections'),
diff --git a/decoders/eeprom24xx/pd.py b/decoders/eeprom24xx/pd.py
index 6f32b54..982cb50 100644
--- a/decoders/eeprom24xx/pd.py
+++ b/decoders/eeprom24xx/pd.py
@@ -29,7 +29,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['eeprom24xx']
-    tags = ['Logic', 'Memory']
+    tags = ['IC', 'Memory']
     options = (
         {'id': 'chip', 'desc': 'Chip', 'default': 'generic',
             'values': tuple(chips.keys())},
diff --git a/decoders/eeprom93xx/pd.py b/decoders/eeprom93xx/pd.py
index f0eed2c..9d8741b 100644
--- a/decoders/eeprom93xx/pd.py
+++ b/decoders/eeprom93xx/pd.py
@@ -28,7 +28,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['microwire']
     outputs = ['eeprom93xx']
-    tags = ['Logic', 'Memory']
+    tags = ['IC', 'Memory']
     options = (
         {'id': 'addresssize', 'desc': 'Address size', 'default': 8},
         {'id': 'wordsize', 'desc': 'Word size', 'default': 16},
diff --git a/decoders/em4100/pd.py b/decoders/em4100/pd.py
index 5c919c8..6af5a34 100644
--- a/decoders/em4100/pd.py
+++ b/decoders/em4100/pd.py
@@ -31,7 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['em4100']
-    tags = ['Logic', 'Wireless']
+    tags = ['IC', 'RFID']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/em4305/pd.py b/decoders/em4305/pd.py
index c4e2640..eb3e700 100644
--- a/decoders/em4305/pd.py
+++ b/decoders/em4305/pd.py
@@ -31,7 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['em4305']
-    tags = ['Logic', 'Wireless']
+    tags = ['IC', 'RFID']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/gpib/pd.py b/decoders/gpib/pd.py
index d131cb9..dff60a0 100644
--- a/decoders/gpib/pd.py
+++ b/decoders/gpib/pd.py
@@ -28,6 +28,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['gpib']
+    tags = ['PC']
     channels = (
         {'id': 'dio1' , 'name': 'DIO1', 'desc': 'Data I/O bit 1'},
         {'id': 'dio2' , 'name': 'DIO2', 'desc': 'Data I/O bit 2'},
diff --git a/decoders/graycode/pd.py b/decoders/graycode/pd.py
index ef5d513..09f4a0e 100644
--- a/decoders/graycode/pd.py
+++ b/decoders/graycode/pd.py
@@ -81,6 +81,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['graycode']
+    tags = ['Encoding']
     optional_channels = tuple(
         {'id': 'd{}'.format(i), 'name': 'D{}'.format(i), 'desc': 'Data line {}'.format(i)}
         for i in range(MAX_CHANNELS)
diff --git a/decoders/guess_bitrate/pd.py b/decoders/guess_bitrate/pd.py
index 15d6d04..4f22f04 100644
--- a/decoders/guess_bitrate/pd.py
+++ b/decoders/guess_bitrate/pd.py
@@ -31,7 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['guess_bitrate']
-    tags = ['Logic', 'Tools']
+    tags = ['Clock/timing', 'Util']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/i2c/pd.py b/decoders/i2c/pd.py
index f452bcb..f31e33e 100644
--- a/decoders/i2c/pd.py
+++ b/decoders/i2c/pd.py
@@ -70,7 +70,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['i2c']
-    tags = ['Logic', 'Bus']
+    tags = ['Embedded/industrial']
     channels = (
         {'id': 'scl', 'name': 'SCL', 'desc': 'Serial clock line'},
         {'id': 'sda', 'name': 'SDA', 'desc': 'Serial data line'},
diff --git a/decoders/i2cdemux/pd.py b/decoders/i2cdemux/pd.py
index 2495e84..d6841d3 100644
--- a/decoders/i2cdemux/pd.py
+++ b/decoders/i2cdemux/pd.py
@@ -28,6 +28,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = [] # TODO: Only known at run-time.
+    tags = ['Util']
 
     def __init__(self):
         self.reset()
diff --git a/decoders/i2cfilter/pd.py b/decoders/i2cfilter/pd.py
index 1dc7fd1..7798e17 100644
--- a/decoders/i2cfilter/pd.py
+++ b/decoders/i2cfilter/pd.py
@@ -31,6 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv3+'
     inputs = ['i2c']
     outputs = ['i2c']
+    tags = ['Util']
     options = (
         {'id': 'address', 'desc': 'Address to filter out of the I²C stream',
             'default': 0},
diff --git a/decoders/i2s/pd.py b/decoders/i2s/pd.py
index 567badf..054d69e 100644
--- a/decoders/i2s/pd.py
+++ b/decoders/i2s/pd.py
@@ -42,7 +42,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['i2s']
-    tags = ['Logic', 'Bus', 'Audio']
+    tags = ['Audio', 'PC']
     channels = (
         {'id': 'sck', 'name': 'SCK', 'desc': 'Bit clock line'},
         {'id': 'ws', 'name': 'WS', 'desc': 'Word select line'},
diff --git a/decoders/iec/pd.py b/decoders/iec/pd.py
index 06fdc7a..957310c 100644
--- a/decoders/iec/pd.py
+++ b/decoders/iec/pd.py
@@ -35,6 +35,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['gpib']
+    tags = ['PC', 'Retro computing']
     channels = (
         {'id': 'data', 'name': 'DATA', 'desc': 'Data I/O'},
         {'id': 'clk', 'name': 'CLK', 'desc': 'Clock'},
diff --git a/decoders/ir_nec/pd.py b/decoders/ir_nec/pd.py
index 02d70a9..d847249 100644
--- a/decoders/ir_nec/pd.py
+++ b/decoders/ir_nec/pd.py
@@ -32,6 +32,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['ir_nec']
+    tags = ['IR']
     channels = (
         {'id': 'ir', 'name': 'IR', 'desc': 'Data line'},
     )
diff --git a/decoders/ir_rc5/pd.py b/decoders/ir_rc5/pd.py
index 60a9416..52a7dc0 100644
--- a/decoders/ir_rc5/pd.py
+++ b/decoders/ir_rc5/pd.py
@@ -32,6 +32,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['ir_rc5']
+    tags = ['IR']
     channels = (
         {'id': 'ir', 'name': 'IR', 'desc': 'IR data line'},
     )
diff --git a/decoders/jitter/pd.py b/decoders/jitter/pd.py
index f492a9f..c2fc567 100644
--- a/decoders/jitter/pd.py
+++ b/decoders/jitter/pd.py
@@ -38,6 +38,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['jitter']
+    tags = ['Clock/timing', 'Util']
     channels = (
         {'id': 'clk', 'name': 'Clock', 'desc': 'Clock reference channel'},
         {'id': 'sig', 'name': 'Resulting signal', 'desc': 'Resulting signal controlled by the clock'},
diff --git a/decoders/jtag/pd.py b/decoders/jtag/pd.py
index 16d0c47..618613e 100644
--- a/decoders/jtag/pd.py
+++ b/decoders/jtag/pd.py
@@ -62,7 +62,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['jtag']
-    tags = ['Logic', 'MCU Debugging', 'Bus']
+    tags = ['Debug/trace']
     channels = (
         {'id': 'tdi',  'name': 'TDI',  'desc': 'Test data input'},
         {'id': 'tdo',  'name': 'TDO',  'desc': 'Test data output'},
diff --git a/decoders/jtag_ejtag/pd.py b/decoders/jtag_ejtag/pd.py
index 5f026fa..0bffde8 100644
--- a/decoders/jtag_ejtag/pd.py
+++ b/decoders/jtag_ejtag/pd.py
@@ -197,7 +197,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['jtag']
     outputs = ['jtag_ejtag']
-    tags = ['Logic', 'MCU Debugging', 'Bus']
+    tags = ['Debug/trace']
     annotations = (
         ('instruction', 'Instruction'),
     ) + regs_items['ann'] + (
diff --git a/decoders/jtag_stm32/pd.py b/decoders/jtag_stm32/pd.py
index b3e1e46..a251b3d 100644
--- a/decoders/jtag_stm32/pd.py
+++ b/decoders/jtag_stm32/pd.py
@@ -147,7 +147,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['jtag']
     outputs = ['jtag_stm32']
-    tags = ['Logic', 'MCU Debugging', 'Bus']
+    tags = ['Debug/trace']
     annotations = (
         ('item', 'Item'),
         ('field', 'Field'),
diff --git a/decoders/lin/pd.py b/decoders/lin/pd.py
index e1b6d1b..29621cc 100644
--- a/decoders/lin/pd.py
+++ b/decoders/lin/pd.py
@@ -64,6 +64,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['uart']
     outputs = ['lin']
+    tags = ['Automotive']
     options = (
         {'id': 'version', 'desc': 'Protocol version', 'default': 2, 'values': (1, 2)},
     )
diff --git a/decoders/lm75/pd.py b/decoders/lm75/pd.py
index 29237d7..6d264f9 100644
--- a/decoders/lm75/pd.py
+++ b/decoders/lm75/pd.py
@@ -47,6 +47,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['lm75']
+    tags = ['Sensor']
     options = (
         {'id': 'sensor', 'desc': 'Sensor type', 'default': 'lm75',
             'values': ('lm75',)},
diff --git a/decoders/lpc/pd.py b/decoders/lpc/pd.py
index 452e647..debb72b 100644
--- a/decoders/lpc/pd.py
+++ b/decoders/lpc/pd.py
@@ -103,6 +103,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['lpc']
+    tags = ['PC']
     channels = (
         {'id': 'lframe', 'name': 'LFRAME#', 'desc': 'Frame'},
         {'id': 'lclk',   'name': 'LCLK',    'desc': 'Clock'},
diff --git a/decoders/maple_bus/pd.py b/decoders/maple_bus/pd.py
index fe2af3a..9af4eb4 100644
--- a/decoders/maple_bus/pd.py
+++ b/decoders/maple_bus/pd.py
@@ -37,7 +37,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['maple_bus']
-    tags = ['Logic', 'Bus']
+    tags = ['Retro computing']
     channels = (
         {'id': 'sdcka', 'name': 'SDCKA', 'desc': 'Data/clock line A'},
         {'id': 'sdckb', 'name': 'SDCKB', 'desc': 'Data/clock line B'},
diff --git a/decoders/max7219/pd.py b/decoders/max7219/pd.py
index c8e99e1..5b32e11 100644
--- a/decoders/max7219/pd.py
+++ b/decoders/max7219/pd.py
@@ -49,6 +49,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['max7219']
+    tags = ['Display']
     annotations = (
         ('register', 'Registers written to the device'),
         ('digit', 'Digits displayed on the device'),
diff --git a/decoders/mcs48/pd.py b/decoders/mcs48/pd.py
index 185fd89..e80b8e5 100644
--- a/decoders/mcs48/pd.py
+++ b/decoders/mcs48/pd.py
@@ -31,6 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['mcs48']
+    tags = ['Retro computing']
     channels = (
         {'id': 'ale', 'name': 'ALE', 'desc': 'Address latch enable'},
         {'id': 'psen', 'name': '/PSEN', 'desc': 'Program store enable'},
diff --git a/decoders/mdio/pd.py b/decoders/mdio/pd.py
index 2522912..8e970b1 100644
--- a/decoders/mdio/pd.py
+++ b/decoders/mdio/pd.py
@@ -37,6 +37,7 @@ class Decoder(srd.Decoder):
     license = 'bsd'
     inputs = ['logic']
     outputs = ['mdio']
+    tags = ['Networking']
     channels = (
         {'id': 'mdc', 'name': 'MDC', 'desc': 'Clock'},
         {'id': 'mdio', 'name': 'MDIO', 'desc': 'Data'},
diff --git a/decoders/microwire/pd.py b/decoders/microwire/pd.py
index 4180ba2..6650f38 100644
--- a/decoders/microwire/pd.py
+++ b/decoders/microwire/pd.py
@@ -50,6 +50,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['microwire']
+    tags = ['Embedded/industrial']
     channels = (
         {'id': 'cs', 'name': 'CS', 'desc': 'Chip select'},
         {'id': 'sk', 'name': 'SK', 'desc': 'Clock'},
diff --git a/decoders/midi/pd.py b/decoders/midi/pd.py
index 4965493..f96e8f1 100644
--- a/decoders/midi/pd.py
+++ b/decoders/midi/pd.py
@@ -33,7 +33,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['uart']
     outputs = ['midi']
-    tags = ['Logic', 'Bus', 'Audio']
+    tags = ['Audio', 'PC']
     annotations = (
         ('text-verbose', 'Human-readable text (verbose)'),
         ('text-sysreal-verbose', 'Human-readable SysReal text (verbose)'),
diff --git a/decoders/miller/pd.py b/decoders/miller/pd.py
index 9a4032e..88798bb 100644
--- a/decoders/miller/pd.py
+++ b/decoders/miller/pd.py
@@ -39,6 +39,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['miller']
+    tags = ['Encoding']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data signal'},
     )
diff --git a/decoders/mlx90614/pd.py b/decoders/mlx90614/pd.py
index 60927f7..8ae3ab9 100644
--- a/decoders/mlx90614/pd.py
+++ b/decoders/mlx90614/pd.py
@@ -28,6 +28,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['mlx90614']
+    tags = ['IC', 'Sensor']
     annotations = (
         ('celsius', 'Temperature in degrees Celsius'),
         ('kelvin', 'Temperature in Kelvin'),
diff --git a/decoders/modbus/pd.py b/decoders/modbus/pd.py
index d2307b9..d5b39ca 100644
--- a/decoders/modbus/pd.py
+++ b/decoders/modbus/pd.py
@@ -819,6 +819,7 @@ class Decoder(srd.Decoder):
     license = 'gplv3+'
     inputs = ['uart']
     outputs = ['modbus']
+    tags = ['Embedded/industrial']
     annotations = (
         ('sc-server-id', ''),
         ('sc-function', ''),
diff --git a/decoders/morse/pd.py b/decoders/morse/pd.py
index 9a83b63..47a641c 100644
--- a/decoders/morse/pd.py
+++ b/decoders/morse/pd.py
@@ -121,6 +121,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['morse']
+    tags = ['Encoding']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/mrf24j40/pd.py b/decoders/mrf24j40/pd.py
index 8ccf473..d792104 100644
--- a/decoders/mrf24j40/pd.py
+++ b/decoders/mrf24j40/pd.py
@@ -29,6 +29,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['mrf24j40']
+    tags = ['IC', 'Wireless/RF']
     annotations = (
         ('sread', 'Short register read commands'),
         ('swrite', 'Short register write commands'),
diff --git a/decoders/mxc6225xu/pd.py b/decoders/mxc6225xu/pd.py
index 1e90455..7eac07e 100644
--- a/decoders/mxc6225xu/pd.py
+++ b/decoders/mxc6225xu/pd.py
@@ -67,6 +67,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['mxc6225xu']
+    tags = ['IC', 'Sensor']
     annotations = (
         ('text', 'Human-readable text'),
     )
diff --git a/decoders/nrf24l01/pd.py b/decoders/nrf24l01/pd.py
index 221b968..3781155 100644
--- a/decoders/nrf24l01/pd.py
+++ b/decoders/nrf24l01/pd.py
@@ -67,6 +67,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['nrf24l01']
+    tags = ['IC', 'Wireless/RF']
     options = (
         {'id': 'chip', 'desc': 'Chip type',
             'default': 'nrf24l01', 'values': ('nrf24l01', 'xn297')},
diff --git a/decoders/nunchuk/pd.py b/decoders/nunchuk/pd.py
index 4f006f2..eb99ba5 100644
--- a/decoders/nunchuk/pd.py
+++ b/decoders/nunchuk/pd.py
@@ -28,6 +28,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['nunchuck']
+    tags = ['Sensor']
     annotations = \
         tuple(('reg-0x%02X' % i, 'Register 0x%02X' % i) for i in range(6)) + (
         ('bit-bz', 'BZ bit'),
diff --git a/decoders/onewire_link/pd.py b/decoders/onewire_link/pd.py
index 72aea83..564d6f0 100644
--- a/decoders/onewire_link/pd.py
+++ b/decoders/onewire_link/pd.py
@@ -97,6 +97,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['onewire_link']
+    tags = ['Embedded/industrial']
     channels = (
         {'id': 'owr', 'name': 'OWR', 'desc': '1-Wire signal line'},
     )
diff --git a/decoders/onewire_network/pd.py b/decoders/onewire_network/pd.py
index 5d850b5..4b5fed5 100644
--- a/decoders/onewire_network/pd.py
+++ b/decoders/onewire_network/pd.py
@@ -40,6 +40,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['onewire_link']
     outputs = ['onewire_network']
+    tags = ['Embedded/industrial']
     annotations = (
         ('text', 'Human-readable text'),
     )
diff --git a/decoders/ook/pd.py b/decoders/ook/pd.py
index d3e2eee..5fc8d01 100644
--- a/decoders/ook/pd.py
+++ b/decoders/ook/pd.py
@@ -54,6 +54,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['ook']
+    tags = ['Encoding']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/ook_oregon/pd.py b/decoders/ook_oregon/pd.py
index c248726..225f598 100644
--- a/decoders/ook_oregon/pd.py
+++ b/decoders/ook_oregon/pd.py
@@ -30,6 +30,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['ook']
     outputs = []
+    tags = ['Sensor']
     annotations = (
         ('bit', 'Bit'),
         ('field', 'Field'),
diff --git a/decoders/ook_vis/pd.py b/decoders/ook_vis/pd.py
index 3785331..f985b96 100644
--- a/decoders/ook_vis/pd.py
+++ b/decoders/ook_vis/pd.py
@@ -29,6 +29,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['ook']
     outputs = ['ook']
+    tags = ['Encoding']
     annotations = (
         ('bit', 'Bit'),
         ('ref', 'Reference'),
diff --git a/decoders/pan1321/pd.py b/decoders/pan1321/pd.py
index ecaa680..375de8e 100644
--- a/decoders/pan1321/pd.py
+++ b/decoders/pan1321/pd.py
@@ -32,6 +32,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['uart']
     outputs = ['pan1321']
+    tags = ['Wireless/RF']
     annotations = (
         ('text-verbose', 'Human-readable text (verbose)'),
         ('text', 'Human-readable text'),
diff --git a/decoders/parallel/pd.py b/decoders/parallel/pd.py
index 7151ab1..405cdeb 100644
--- a/decoders/parallel/pd.py
+++ b/decoders/parallel/pd.py
@@ -75,7 +75,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['parallel']
-    tags = ['Logic', 'Bus']
+    tags = ['Util']
     optional_channels = channel_list(NUM_CHANNELS)
     options = (
         {'id': 'clock_edge', 'desc': 'Clock edge to sample on',
diff --git a/decoders/ps2/pd.py b/decoders/ps2/pd.py
index c5c9406..0fbfbf4 100644
--- a/decoders/ps2/pd.py
+++ b/decoders/ps2/pd.py
@@ -34,7 +34,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['ps2']
-    tags = ['Logic', 'Bus']
+    tags = ['PC']
     channels = (
         {'id': 'clk', 'name': 'Clock', 'desc': 'Clock line'},
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
diff --git a/decoders/pwm/pd.py b/decoders/pwm/pd.py
index 9770445..2ea59b3 100644
--- a/decoders/pwm/pd.py
+++ b/decoders/pwm/pd.py
@@ -32,6 +32,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['pwm']
+    tags = ['Encoding']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/qi/pd.py b/decoders/qi/pd.py
index 345efd8..d80f7b5 100644
--- a/decoders/qi/pd.py
+++ b/decoders/qi/pd.py
@@ -53,6 +53,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['qi']
+    tags = ['Embedded/industrial', 'Wireless/RF']
     channels = (
         {'id': 'qi', 'name': 'Qi', 'desc': 'Demodulated Qi data line'},
     )
diff --git a/decoders/rc_encode/pd.py b/decoders/rc_encode/pd.py
index 56b60ca..0d7cc8c 100644
--- a/decoders/rc_encode/pd.py
+++ b/decoders/rc_encode/pd.py
@@ -80,6 +80,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = []
+    tags = ['IC', 'IR']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/rfm12/pd.py b/decoders/rfm12/pd.py
index e709696..fe93bfe 100644
--- a/decoders/rfm12/pd.py
+++ b/decoders/rfm12/pd.py
@@ -28,6 +28,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['rfm12']
+    tags = ['Wireless/RF']
     annotations = (
         ('cmd', 'Command'),
         ('params', 'Command parameters'),
diff --git a/decoders/rgb_led_spi/pd.py b/decoders/rgb_led_spi/pd.py
index d087556..d6cbba7 100644
--- a/decoders/rgb_led_spi/pd.py
+++ b/decoders/rgb_led_spi/pd.py
@@ -28,6 +28,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['rgb_led_spi']
+    tags = ['Display']
     annotations = (
         ('rgb', 'RGB values'),
     )
diff --git a/decoders/rgb_led_ws281x/pd.py b/decoders/rgb_led_ws281x/pd.py
index b4f7c58..fc3dbc4 100644
--- a/decoders/rgb_led_ws281x/pd.py
+++ b/decoders/rgb_led_ws281x/pd.py
@@ -32,6 +32,7 @@ class Decoder(srd.Decoder):
     license = 'gplv3+'
     inputs = ['logic']
     outputs = ['rgb_led_ws281x']
+    tags = ['Display']
     channels = (
         {'id': 'din', 'name': 'DIN', 'desc': 'DIN data line'},
     )
diff --git a/decoders/rtc8564/pd.py b/decoders/rtc8564/pd.py
index 3a9dca0..25eb4e7 100644
--- a/decoders/rtc8564/pd.py
+++ b/decoders/rtc8564/pd.py
@@ -36,6 +36,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['rtc8564']
+    tags = ['Clock/timing']
     annotations = reg_list() + (
         ('read', 'Read date/time'),
         ('write', 'Write date/time'),
diff --git a/decoders/sda2506/pd.py b/decoders/sda2506/pd.py
index 8b63cf0..986312b 100644
--- a/decoders/sda2506/pd.py
+++ b/decoders/sda2506/pd.py
@@ -31,6 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['sda2506']
+    tags = ['IC', 'Memory']
     channels = (
         {'id': 'clk', 'name': 'CLK', 'desc': 'Clock'},
         {'id': 'd', 'name': 'DATA', 'desc': 'Data'},
diff --git a/decoders/sdcard_sd/pd.py b/decoders/sdcard_sd/pd.py
index 6f9d2cb..dacbba1 100644
--- a/decoders/sdcard_sd/pd.py
+++ b/decoders/sdcard_sd/pd.py
@@ -29,7 +29,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['sdcard_sd']
-    tags = ['Logic', 'Memory']
+    tags = ['Memory']
     channels = (
         {'id': 'cmd',  'name': 'CMD',  'desc': 'Command'},
         {'id': 'clk',  'name': 'CLK',  'desc': 'Clock'},
diff --git a/decoders/sdcard_spi/pd.py b/decoders/sdcard_spi/pd.py
index 8ed7098..2885911 100644
--- a/decoders/sdcard_spi/pd.py
+++ b/decoders/sdcard_spi/pd.py
@@ -29,7 +29,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['sdcard_spi']
-    tags = ['Logic', 'Memory']
+    tags = ['Memory']
     annotations = \
         tuple(('cmd%d' % i, 'CMD%d' % i) for i in range(64)) + \
         tuple(('acmd%d' % i, 'ACMD%d' % i) for i in range(64)) + ( \
diff --git a/decoders/spdif/pd.py b/decoders/spdif/pd.py
index add2834..9bef843 100644
--- a/decoders/spdif/pd.py
+++ b/decoders/spdif/pd.py
@@ -31,6 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['spdif']
+    tags = ['Audio', 'PC']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index 55bca63..2797137 100644
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -82,7 +82,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['spi']
-    tags = ['Logic', 'Bus']
+    tags = ['Embedded/industrial']
     channels = (
         {'id': 'clk', 'name': 'CLK', 'desc': 'Clock'},
     )
diff --git a/decoders/spiflash/pd.py b/decoders/spiflash/pd.py
index bbdf3fb..ffac028 100644
--- a/decoders/spiflash/pd.py
+++ b/decoders/spiflash/pd.py
@@ -79,6 +79,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['spiflash']
+    tags = ['IC', 'Memory']
     annotations = cmd_annotation_classes() + (
         ('bit', 'Bit'),
         ('field', 'Field'),
diff --git a/decoders/ssi32/pd.py b/decoders/ssi32/pd.py
index f2685e2..33d25b5 100644
--- a/decoders/ssi32/pd.py
+++ b/decoders/ssi32/pd.py
@@ -31,6 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['ssi32']
+    tags = ['Embedded/industrial']
     options = (
         {'id': 'msgsize', 'desc': 'Message size', 'default': 64},
     )
diff --git a/decoders/st7735/pd.py b/decoders/st7735/pd.py
index 999038a..4ebb23d 100644
--- a/decoders/st7735/pd.py
+++ b/decoders/st7735/pd.py
@@ -73,6 +73,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['st7735']
+    tags = ['Display', 'IC']
     channels = (
         {'id': 'cs', 'name': 'CS#', 'desc': 'Chip-select'},
         {'id': 'clk', 'name': 'CLK', 'desc': 'Clock'},
diff --git a/decoders/stepper_motor/pd.py b/decoders/stepper_motor/pd.py
index 0546395..2a1e5f2 100644
--- a/decoders/stepper_motor/pd.py
+++ b/decoders/stepper_motor/pd.py
@@ -28,6 +28,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['stepper_motor']
+    tags = ['Embedded/industrial']
     channels = (
         {'id': 'step', 'name': 'Step', 'desc': 'Step pulse'},
         {'id': 'dir', 'name': 'Direction', 'desc': 'Direction select'},
diff --git a/decoders/swd/pd.py b/decoders/swd/pd.py
index 0f7bc22..cc258ef 100644
--- a/decoders/swd/pd.py
+++ b/decoders/swd/pd.py
@@ -72,6 +72,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['swd']
+    tags = ['Debug/trace']
     channels = (
         {'id': 'swclk', 'name': 'SWCLK', 'desc': 'Master clock'},
         {'id': 'swdio', 'name': 'SWDIO', 'desc': 'Data input/output'},
diff --git a/decoders/swim/pd.py b/decoders/swim/pd.py
index 452805a..2f0c121 100644
--- a/decoders/swim/pd.py
+++ b/decoders/swim/pd.py
@@ -33,6 +33,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = []
+    tags = ['Debug/trace']
     options = (
         {'id': 'debug', 'desc': 'Debug', 'default': 'no', 'values': ('yes', 'no') },
     )
diff --git a/decoders/t55xx/pd.py b/decoders/t55xx/pd.py
index 07df9c2..fb1bcb9 100644
--- a/decoders/t55xx/pd.py
+++ b/decoders/t55xx/pd.py
@@ -31,6 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['t55xx']
+    tags = ['IC', 'RFID']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/tca6408a/pd.py b/decoders/tca6408a/pd.py
index 0e60767..d53cf8c 100644
--- a/decoders/tca6408a/pd.py
+++ b/decoders/tca6408a/pd.py
@@ -30,6 +30,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['i2c']
     outputs = ['tca6408a']
+    tags = ['Embedded/industrial', 'IC']
     annotations = (
         ('register', 'Register type'),
         ('value', 'Register value'),
diff --git a/decoders/timing/pd.py b/decoders/timing/pd.py
index 922c36d..17ef5f1 100644
--- a/decoders/timing/pd.py
+++ b/decoders/timing/pd.py
@@ -54,7 +54,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['timing']
-    tags = ['Logic', 'Tools']
+    tags = ['Clock/timing', 'Util']
     channels = (
         {'id': 'data', 'name': 'Data', 'desc': 'Data line'},
     )
diff --git a/decoders/tlc5620/pd.py b/decoders/tlc5620/pd.py
index 6fe8ae1..af16ee5 100644
--- a/decoders/tlc5620/pd.py
+++ b/decoders/tlc5620/pd.py
@@ -35,6 +35,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['tlc5620']
+    tags = ['IC', 'Analog/digital']
     channels = (
         {'id': 'clk', 'name': 'CLK', 'desc': 'Serial interface clock'},
         {'id': 'data', 'name': 'DATA', 'desc': 'Serial interface data'},
diff --git a/decoders/uart/pd.py b/decoders/uart/pd.py
index fa1bca9..389284e 100644
--- a/decoders/uart/pd.py
+++ b/decoders/uart/pd.py
@@ -87,7 +87,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['uart']
-    tags = ['Logic', 'Bus']
+    tags = ['Embedded/industrial']
     optional_channels = (
         # Allow specifying only one of the signals, e.g. if only one data
         # direction exists (or is relevant).
diff --git a/decoders/usb_packet/pd.py b/decoders/usb_packet/pd.py
index 3943f98..e262074 100644
--- a/decoders/usb_packet/pd.py
+++ b/decoders/usb_packet/pd.py
@@ -181,6 +181,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['usb_signalling']
     outputs = ['usb_packet']
+    tags = ['PC']
     options = (
         {'id': 'signalling', 'desc': 'Signalling',
             'default': 'full-speed', 'values': ('full-speed', 'low-speed')},
diff --git a/decoders/usb_power_delivery/pd.py b/decoders/usb_power_delivery/pd.py
index 7c26768..d9209bf 100644
--- a/decoders/usb_power_delivery/pd.py
+++ b/decoders/usb_power_delivery/pd.py
@@ -203,6 +203,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['usb_pd']
+    tags = ['PC']
     channels = (
         {'id': 'cc1', 'name': 'CC1', 'desc': 'Configuration Channel 1'},
     )
diff --git a/decoders/usb_request/pd.py b/decoders/usb_request/pd.py
index e77debc..2835bf9 100644
--- a/decoders/usb_request/pd.py
+++ b/decoders/usb_request/pd.py
@@ -120,6 +120,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['usb_packet']
     outputs = ['usb_request']
+    tags = ['PC']
     annotations = (
         ('request-setup-read', 'Setup: Device-to-host'),
         ('request-setup-write', 'Setup: Host-to-device'),
diff --git a/decoders/usb_signalling/pd.py b/decoders/usb_signalling/pd.py
index a99cfbe..7b1ce2f 100644
--- a/decoders/usb_signalling/pd.py
+++ b/decoders/usb_signalling/pd.py
@@ -108,6 +108,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['usb_signalling']
+    tags = ['PC']
     channels = (
         {'id': 'dp', 'name': 'D+', 'desc': 'USB D+ signal'},
         {'id': 'dm', 'name': 'D-', 'desc': 'USB D- signal'},
diff --git a/decoders/wiegand/pd.py b/decoders/wiegand/pd.py
index c494789..7819fd6 100644
--- a/decoders/wiegand/pd.py
+++ b/decoders/wiegand/pd.py
@@ -31,6 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['wiegand']
+    tags = ['Embedded/industrial', 'RFID']
     channels = (
         {'id': 'd0', 'name': 'D0', 'desc': 'Data 0 line'},
         {'id': 'd1', 'name': 'D1', 'desc': 'Data 1 line'},
diff --git a/decoders/x2444m/pd.py b/decoders/x2444m/pd.py
index 2fa4d38..8a2852a 100644
--- a/decoders/x2444m/pd.py
+++ b/decoders/x2444m/pd.py
@@ -40,6 +40,7 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['spi']
     outputs = ['x2444m']
+    tags = ['IC', 'Memory']
     annotations = (
         ('wrds', 'Write disable'),
         ('sto', 'Store RAM data in EEPROM'),
diff --git a/decoders/xfp/pd.py b/decoders/xfp/pd.py
index 0bc6724..9bca10b 100644
--- a/decoders/xfp/pd.py
+++ b/decoders/xfp/pd.py
@@ -31,6 +31,7 @@ class Decoder(srd.Decoder):
     license = 'gplv3+'
     inputs = ['i2c']
     outputs = ['xfp']
+    tags = ['Networking']
     annotations = (
         ('fieldnames-and-values', 'XFP structure field names and values'),
         ('fields', 'XFP structure fields'),
diff --git a/decoders/z80/pd.py b/decoders/z80/pd.py
index bcfcdbd..7cadec9 100644
--- a/decoders/z80/pd.py
+++ b/decoders/z80/pd.py
@@ -72,7 +72,7 @@ class Decoder(srd.Decoder):
     license  = 'gplv3+'
     inputs   = ['logic']
     outputs  = ['z80']
-    tags = ['Logic', 'MCU Debugging']
+    tags     = ['Retro computing']
     channels = tuple({
             'id': 'd%d' % i,
             'name': 'D%d' % i,