diff --git a/taxonomy/ethernet.py b/taxonomy/ethernet.py
index dc5a7e1..00be466 100644
--- a/taxonomy/ethernet.py
+++ b/taxonomy/ethernet.py
@@ -95,6 +95,7 @@
     '34:fc:ef': ['lg'],
     '3c:bd:d8': ['lg'],
     '40:b0:fa': ['lg'],
+    '48:59:29': ['lg'],
     '58:3f:54': ['lg'],
     '5c:70:a3': ['lg'],
     '64:89:9a': ['lg'],
@@ -209,6 +210,7 @@
     '4c:3c:16': ['samsung'],
     '4c:bc:a5': ['samsung'],
     '50:cc:f8': ['samsung'],
+    '54:40:ad': ['samsung'],
     '54:88:0e': ['samsung'],
     '5c:0a:5b': ['samsung'],
     '5c:f6:dc': ['samsung'],
diff --git a/taxonomy/testdata/dhcp.leases b/taxonomy/testdata/dhcp.leases
index acd0ecc..9bdc396 100644
--- a/taxonomy/testdata/dhcp.leases
+++ b/taxonomy/testdata/dhcp.leases
@@ -54,3 +54,5 @@
 1432237016 5c:93:a2:00:00:00 192.168.42.43 Playstation 4
 1432237016 e0:c7:67:00:00:00 192.168.42.44 iPhoone SE
 1432237016 a4:8d:3b:00:00:00 192.168.42.45 VizioSmartTV
+1432237016 00:11:d9:00:00:00 192.168.42.46 TiVoBOLT
+1432237016 ac:3a:7a:00:00:00 192.168.42.47 Roku3-4230
diff --git a/taxonomy/testdata/dhcp.signatures b/taxonomy/testdata/dhcp.signatures
index 33abcb0..e9ef842 100644
--- a/taxonomy/testdata/dhcp.signatures
+++ b/taxonomy/testdata/dhcp.signatures
@@ -46,3 +46,5 @@
 5c:93:a2:00:00:00 1,3,15,6
 e0:c7:67:00:00:00 1,3,6,15,119,252
 a4:8d:3b:00:00:00 1,3,6,12,15,28,42
+00:11:d9:00:00:00 1,28,2,3,15,6,12
+ac:3a:7a:00:00:00 1,3,6,15,12
diff --git a/taxonomy/testdata/pcaps/Amazon Echo 2.4GHz Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Amazon Echo 2.4GHz Broadcast Probe.pcap
new file mode 100644
index 0000000..596769c
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Amazon Echo 2.4GHz Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Amazon Echo 2.4GHz Specific Probe.pcap b/taxonomy/testdata/pcaps/Amazon Echo 2.4GHz Specific Probe.pcap
new file mode 100644
index 0000000..54c32c9
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Amazon Echo 2.4GHz Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Amazon Echo 5GHz Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Amazon Echo 5GHz Broadcast Probe.pcap
new file mode 100644
index 0000000..537981c
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Amazon Echo 5GHz Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Amazon Echo 5GHz Specific Probe.pcap b/taxonomy/testdata/pcaps/Amazon Echo 5GHz Specific Probe.pcap
new file mode 100644
index 0000000..64f2df7
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Amazon Echo 5GHz Specific Probe.pcap
Binary files differ
diff --git "a/taxonomy/testdata/pcaps/Amazon Fire TV 2015 \0502nd gen\051 2.4GHz model DV83YW Broadcast Probe.pcap" "b/taxonomy/testdata/pcaps/Amazon Fire TV 2015 \0502nd gen\051 2.4GHz model DV83YW Broadcast Probe.pcap"
new file mode 100644
index 0000000..0863426
--- /dev/null
+++ "b/taxonomy/testdata/pcaps/Amazon Fire TV 2015 \0502nd gen\051 2.4GHz model DV83YW Broadcast Probe.pcap"
Binary files differ
diff --git "a/taxonomy/testdata/pcaps/Amazon Fire TV 2015 \0502nd gen\051 2.4GHz model DV83YW Specific Probe.pcap" "b/taxonomy/testdata/pcaps/Amazon Fire TV 2015 \0502nd gen\051 2.4GHz model DV83YW Specific Probe.pcap"
new file mode 100644
index 0000000..96f2c8c
--- /dev/null
+++ "b/taxonomy/testdata/pcaps/Amazon Fire TV 2015 \0502nd gen\051 2.4GHz model DV83YW Specific Probe.pcap"
Binary files differ
diff --git "a/taxonomy/testdata/pcaps/Amazon Fire TV 2015 \0502nd gen\051 5GHz model DV83YW.pcap" "b/taxonomy/testdata/pcaps/Amazon Fire TV 2015 \0502nd gen\051 5GHz model DV83YW.pcap"
new file mode 100644
index 0000000..8a0109b
--- /dev/null
+++ "b/taxonomy/testdata/pcaps/Amazon Fire TV 2015 \0502nd gen\051 5GHz model DV83YW.pcap"
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Amazon Kindle Voyage, Paperwhite, or 4th gen 2.4GHz 4th gen B00E.pcap b/taxonomy/testdata/pcaps/Amazon Kindle Voyage, Paperwhite, or 4th gen 2.4GHz 4th gen B00E.pcap
new file mode 100644
index 0000000..af9df26
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Amazon Kindle Voyage, Paperwhite, or 4th gen 2.4GHz 4th gen B00E.pcap
Binary files differ
diff --git "a/taxonomy/testdata/pcaps/Amazon Kindle Voyage or Paperwhite \0502012\051 2.4GHz Paperwhite B024.pcap" b/taxonomy/testdata/pcaps/Amazon Kindle Voyage, Paperwhite, or 4th gen 2.4GHz Paperwhite B024.pcap
similarity index 100%
rename from "taxonomy/testdata/pcaps/Amazon Kindle Voyage or Paperwhite \0502012\051 2.4GHz Paperwhite B024.pcap"
rename to taxonomy/testdata/pcaps/Amazon Kindle Voyage, Paperwhite, or 4th gen 2.4GHz Paperwhite B024.pcap
Binary files differ
diff --git "a/taxonomy/testdata/pcaps/Amazon Kindle Voyage or Paperwhite \0502012\051 2.4GHz Voyage B013.pcap" b/taxonomy/testdata/pcaps/Amazon Kindle Voyage, Paperwhite, or 4th gen 2.4GHz Voyage B013.pcap
similarity index 100%
rename from "taxonomy/testdata/pcaps/Amazon Kindle Voyage or Paperwhite \0502012\051 2.4GHz Voyage B013.pcap"
rename to taxonomy/testdata/pcaps/Amazon Kindle Voyage, Paperwhite, or 4th gen 2.4GHz Voyage B013.pcap
Binary files differ
diff --git "a/taxonomy/testdata/pcaps/Amazon Kindle Voyage or Paperwhite \0502012\051 2.4GHz Voyage B054.pcap" b/taxonomy/testdata/pcaps/Amazon Kindle Voyage, Paperwhite, or 4th gen 2.4GHz Voyage B054.pcap
similarity index 100%
rename from "taxonomy/testdata/pcaps/Amazon Kindle Voyage or Paperwhite \0502012\051 2.4GHz Voyage B054.pcap"
rename to taxonomy/testdata/pcaps/Amazon Kindle Voyage, Paperwhite, or 4th gen 2.4GHz Voyage B054.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/NVidia SHIELD Android TV 2.4GHz.pcap b/taxonomy/testdata/pcaps/NVidia SHIELD Android TV 2.4GHz.pcap
new file mode 100644
index 0000000..fc362d3
--- /dev/null
+++ b/taxonomy/testdata/pcaps/NVidia SHIELD Android TV 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/NVidia SHIELD Android TV 5GHz Broadcast Probe.pcap b/taxonomy/testdata/pcaps/NVidia SHIELD Android TV 5GHz Broadcast Probe.pcap
new file mode 100644
index 0000000..4b548c9
--- /dev/null
+++ b/taxonomy/testdata/pcaps/NVidia SHIELD Android TV 5GHz Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/NVidia SHIELD Android TV 5GHz Specific Probe.pcap b/taxonomy/testdata/pcaps/NVidia SHIELD Android TV 5GHz Specific Probe.pcap
new file mode 100644
index 0000000..bfa105b
--- /dev/null
+++ b/taxonomy/testdata/pcaps/NVidia SHIELD Android TV 5GHz Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Roku 3 5GHz NP-4E.pcap b/taxonomy/testdata/pcaps/Roku 3 5GHz NP-4E.pcap
new file mode 100644
index 0000000..4fb41e5
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Roku 3 5GHz NP-4E.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 2.4GHz KDL-50W800C Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 2.4GHz KDL-50W800C Broadcast Probe.pcap
new file mode 100644
index 0000000..ff696f5
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 2.4GHz KDL-50W800C Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 2.4GHz KDL-50W800C Small Specific Probe.pcap b/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 2.4GHz KDL-50W800C Small Specific Probe.pcap
new file mode 100644
index 0000000..dec5c61
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 2.4GHz KDL-50W800C Small Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 2.4GHz KDL-50W800C Specific Probe.pcap b/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 2.4GHz KDL-50W800C Specific Probe.pcap
new file mode 100644
index 0000000..5744854
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 2.4GHz KDL-50W800C Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 5GHz KDL-50W800C Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 5GHz KDL-50W800C Broadcast Probe.pcap
new file mode 100644
index 0000000..d100a3f
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 5GHz KDL-50W800C Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 5GHz KDL-50W800C Specific Probe.pcap b/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 5GHz KDL-50W800C Specific Probe.pcap
new file mode 100644
index 0000000..6dda6ab
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Sony Bravia TV 2015 model 5GHz KDL-50W800C Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/TiVo BOLT 2.4GHz Broadcast Probe.pcap b/taxonomy/testdata/pcaps/TiVo BOLT 2.4GHz Broadcast Probe.pcap
new file mode 100644
index 0000000..8864593
--- /dev/null
+++ b/taxonomy/testdata/pcaps/TiVo BOLT 2.4GHz Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/TiVo BOLT 2.4GHz Small Specific Probe.pcap b/taxonomy/testdata/pcaps/TiVo BOLT 2.4GHz Small Specific Probe.pcap
new file mode 100644
index 0000000..c4a984c
--- /dev/null
+++ b/taxonomy/testdata/pcaps/TiVo BOLT 2.4GHz Small Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/TiVo BOLT 2.4GHz Specific Probe.pcap b/taxonomy/testdata/pcaps/TiVo BOLT 2.4GHz Specific Probe.pcap
new file mode 100644
index 0000000..92cb84b
--- /dev/null
+++ b/taxonomy/testdata/pcaps/TiVo BOLT 2.4GHz Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/TiVo BOLT 5GHz Broadcast Probe.pcap b/taxonomy/testdata/pcaps/TiVo BOLT 5GHz Broadcast Probe.pcap
new file mode 100644
index 0000000..abb4f7f
--- /dev/null
+++ b/taxonomy/testdata/pcaps/TiVo BOLT 5GHz Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/TiVo BOLT 5GHz Specific Probe.pcap b/taxonomy/testdata/pcaps/TiVo BOLT 5GHz Specific Probe.pcap
new file mode 100644
index 0000000..eccba31
--- /dev/null
+++ b/taxonomy/testdata/pcaps/TiVo BOLT 5GHz Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Xbox One 5GHz model 1540.pcap b/taxonomy/testdata/pcaps/Xbox One 5GHz model 1540.pcap
new file mode 100644
index 0000000..5e62234
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Xbox One 5GHz model 1540.pcap
Binary files differ
diff --git a/taxonomy/wifi.py b/taxonomy/wifi.py
index f5dfed5..aa9a0cb 100644
--- a/taxonomy/wifi.py
+++ b/taxonomy/wifi.py
@@ -50,8 +50,14 @@
     'wifi4|probe:0,1,50,3,45,221(0050f2,8),htcap:012c,htagg:03,htmcs:000000ff|assoc:0,1,50,48,45,221(0050f2,2),127,htcap:012c,htagg:03,htmcs:000000ff,extcap:00000a0200000000|oui:amazon':
         ('Amazon Fire Phone', '', '2.4GHz'),
 
+    'wifi4|probe:0,1,221(0050f2,4),221(506f9a,9),wps:AFTS|assoc:0,1,45,191,127,221(000c43,6),221(0050f2,2),htcap:008e,htagg:1f,htmcs:0000ffff,vhtcap:31c139b0,vhtrxmcs:030cfffa,vhttxmcs:030cfffa,extcap:0000000000000040':
+        ('Amazon Fire TV', '2015 (2nd gen)', '5GHz'),
     'wifi4|probe:0,1,50,45,127,221(0050f2,4),221(506f9a,9),htcap:01ed,htagg:1f,htmcs:0000ffff,extcap:00,wps:AFTS|assoc:0,1,50,45,127,221(000c43,6),221(0050f2,2),48,127,htcap:008c,htagg:1f,htmcs:0000ffff,extcap:00000a02':
         ('Amazon Fire TV', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,45,127,221(0050f2,4),221(506f9a,9),htcap:01ef,htagg:1f,htmcs:0000ffff,extcap:00,wps:AFTS|assoc:0,1,50,45,127,221(000c43,6),221(0050f2,2),48,127,htcap:008c,htagg:1f,htmcs:0000ffff,extcap:00000a02':
+        ('Amazon Fire TV', '2015 (2nd gen)', '2.4GHz'),
+    'wifi4|probe:0,1,50,221(0050f2,4),221(506f9a,9),wps:AFTS|assoc:0,1,50,45,127,221(000c43,6),221(0050f2,2),48,127,htcap:008c,htagg:1f,htmcs:0000ffff,extcap:00000a02':
+        ('Amazon Fire TV', '2015 (2nd gen)', '2.4GHz'),
 
     'wifi4|probe:0,1,45,221(001018,2),221(00904c,51),htcap:007e,htagg:1b,htmcs:0000ffff|assoc:0,1,33,36,48,45,221(001018,2),221(0050f2,2),htcap:007e,htagg:1b,htmcs:0000ffff,txpow:e50d|oui:amazon':
         ('Amazon Fire TV Stick', '', '5GHz'),
@@ -59,15 +65,16 @@
         ('Amazon Fire TV Stick', '', '2.4GHz'),
 
     'wifi4|probe:0,1,45,htcap:11ee,htagg:02,htmcs:0000ffff|assoc:0,1,33,36,48,221(0050f2,2),45,127,htcap:11ee,htagg:02,htmcs:0000ffff,txpow:0e00,extcap:01|oui:amazon':
-        ('Amazon Kindle', '', '5GHz'),
+        ('Amazon Echo', '', '5GHz'),
+    'wifi4|probe:0,1,50,45,htcap:01ac,htagg:02,htmcs:0000ffff|assoc:0,1,50,48,221(0050f2,2),45,127,htcap:01ac,htagg:02,htmcs:0000ffff,extcap:01|oui:amazon':
+        ('Amazon Echo', '', '2.4GHz'),
+
     'wifi4|probe:0,1,50|assoc:0,1,50,48,221(0050f2,2)|oui:amazon':
         ('Amazon Kindle', '', '2.4GHz'),
     'wifi4|probe:0,1,50|assoc:0,1,50,221(0050f2,2)|oui:amazon':
         ('Amazon Kindle', 'Keyboard 3', '2.4GHz'),
-    'wifi4|probe:0,1,50,45,htcap:01ac,htagg:02,htmcs:0000ffff|assoc:0,1,50,48,221(0050f2,2),45,127,htcap:01ac,htagg:02,htmcs:0000ffff,extcap:01|oui:amazon':
-        ('Amazon Kindle', '', '2.4GHz'),
     'wifi4|probe:0,1,50,45,htcap:002c,htagg:01,htmcs:000000ff|assoc:0,1,50,45,48,221(0050f2,2),htcap:002c,htagg:01,htmcs:000000ff|oui:amazon':
-        ('Amazon Kindle', 'Voyage or Paperwhite (2012)', '2.4GHz'),
+        ('Amazon Kindle', 'Voyage, Paperwhite, or 4th gen', '2.4GHz'),
 
     'wifi4|probe:0,1,50,3,45,221(0050f2,8),htcap:1130,htagg:18,htmcs:000000ff|assoc:0,1,50,48,45,221(0050f2,2),htcap:1130,htagg:18,htmcs:000000ff|oui:amazon':
         ('Amazon Kindle', 'Fire 7" (2011 edition)', '2.4GHz'),
@@ -724,8 +731,12 @@
 
     'wifi4|probe:0,1,45,127,191,221(0050f2,4),221(506f9a,9),221(001018,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:0000008001000040,wps:SHIELD_Android_TV|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(0050f2,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:e007,extcap:0000008001000040':
         ('NVidia SHIELD', 'Android TV', '5GHz'),
+    'wifi4|probe:0,1,45,127,191,221(0050f2,4),221(506f9a,9),221(0050f2,8),221(001018,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:0000088001400040,wps:SHIELD_Android_TV|assoc:0,1,33,36,48,70,45,127,191,221(00904c,51),221(001018,2),221(0050f2,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:e007,extcap:0000088001400040':
+        ('NVidia SHIELD', 'Android TV', '5GHz'),
     'wifi4|probe:0,1,50,3,45,127,221(0050f2,4),221(506f9a,9),221(001018,2),htcap:002d,htagg:17,htmcs:0000ffff,extcap:0000008001000040,wps:SHIELD_Android_TV|assoc:0,1,50,33,36,48,45,127,221(001018,2),221(0050f2,2),htcap:002d,htagg:17,htmcs:0000ffff,txpow:1207,extcap:0000008001000040':
         ('NVidia SHIELD', 'Android TV', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,221(0050f2,4),221(506f9a,9),221(0050f2,8),221(001018,2),htcap:002d,htagg:17,htmcs:0000ffff,extcap:0000088001400040,wps:SHIELD_Android_TV|assoc:0,1,50,33,36,48,70,45,127,221(00904c,51),221(001018,2),221(0050f2,2),htcap:002d,htagg:17,htmcs:0000ffff,txpow:1207,extcap:0000088001400040':
+        ('NVidia SHIELD', 'Android TV', '2.4GHz'),
 
     'wifi4|probe:0,1,50,3,45,221(0050f2,8),htcap:012c,htagg:03,htmcs:000000ff|assoc:0,1,50,33,48,70,45,221(0050f2,2),127,htcap:012c,htagg:03,htmcs:000000ff,txpow:170d,extcap:00000a0200000000|oui:oneplus':
         ('Oneplus', 'X', '2.4GHz'),
@@ -809,6 +820,10 @@
     'wifi4|probe:0,1,50,3,45,127,221(001018,2),221(00904c,51),htcap:193c,htagg:16,htmcs:0000ffff,extcap:0000000000000040|assoc:0,1,33,36,48,50,45,127,221(001018,2),221(0050f2,2),htcap:193c,htagg:16,htmcs:0000ffff,txpow:140a,extcap:0000000000000040|os:roku':
         ('Roku', '2 or 3 or Streaming Stick', '2.4GHz'),
 
+    # Roku 3 model 4230RW
+    'wifi4|probe:0,1,45,127,221(001018,2),221(00904c,51),htcap:093c,htagg:16,htmcs:0000ffff,extcap:0000000000000040|assoc:0,1,33,36,48,45,127,221(001018,2),221(0050f2,2),htcap:093c,htagg:16,htmcs:0000ffff,txpow:110a,extcap:0000000000000040|os:roku':
+        ('Roku', '3', '5GHz'),
+
     # Roku 4 model 4400
     'wifi4|probe:0,1,45,127,191,221(001018,2),htcap:01ad,htagg:17,htmcs:0000ffff,vhtcap:0f8159b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:0000000000000040|assoc:0,1,33,36,48,45,127,191,199,221(001018,2),221(0050f2,2),htcap:01ad,htagg:17,htmcs:0000ffff,vhtcap:0f8159b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1109,extcap:0000000000000040|os:roku':
         ('Roku', '4', '5GHz'),
@@ -1002,10 +1017,22 @@
 
     'wifi4|probe:0,1,45,221(0050f2,4),htcap:11ee,htagg:02,htmcs:0000ffff,wps:Sony_BRAVIA|assoc:0,1,33,36,48,221(0050f2,2),45,127,htcap:11ee,htagg:02,htmcs:0000ffff,txpow:0500,extcap:01':
         ('Sony Bravia TV', '', '5GHz'),
+    'wifi4|probe:0,1,45,221(0050f2,4),221(506f9a,10),221(506f9a,9),htcap:11ef,htagg:13,htmcs:0000ffff,wps:BRAVIA_2015|assoc:0,1,45,127,221(000c43,6),221(0050f2,2),48,127,htcap:01ef,htagg:13,htmcs:0000ffff,extcap:00000a02':
+        ('Sony Bravia TV', '2015 model', '5GHz'),
+    'wifi4|probe:0,1,221(0050f2,4),221(506f9a,10),221(506f9a,9),wps:BRAVIA_2015|assoc:0,1,45,127,221(000c43,6),221(0050f2,2),48,127,htcap:01ef,htagg:13,htmcs:0000ffff,extcap:00000a02':
+        ('Sony Bravia TV', '2015 model', '5GHz'),
+    'wifi4|probe:0,1,50,45,221(0050f2,4),221(506f9a,10),221(506f9a,9),htcap:01ad,htagg:02,htmcs:0000ffff,wps:Sony_BRAVIA|assoc:0,1,50,45,127,48,221(0050f2,2),htcap:01ad,htagg:02,htmcs:0000ffff,extcap:01':
+        ('Sony Bravia TV', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,45,221(0050f2,4),htcap:01ac,htagg:02,htmcs:0000ffff,wps:Sony_BRAVIA|assoc:0,1,50,48,221(0050f2,2),45,127,htcap:01ac,htagg:02,htmcs:0000ffff,extcap:01':
+        ('Sony Bravia TV', '', '2.4GHz'),
     'wifi4|probe:0,1,50,45,127,221(0050f2,4),221(506f9a,10),221(506f9a,9),htcap:01ed,htagg:13,htmcs:0000ffff,extcap:00,wps:BRAVIA_2015|assoc:0,1,50,45,127,221(000c43,6),221(0050f2,2),48,127,htcap:008c,htagg:13,htmcs:0000ffff,extcap:00000a02':
-        ('Sony Bravia TV', '', '2.4GHz'),
+        ('Sony Bravia TV', '2015 model', '2.4GHz'),
+    'wifi4|probe:0,1,50,45,127,221(0050f2,4),221(506f9a,10),221(506f9a,9),htcap:11ef,htagg:13,htmcs:0000ffff,extcap:00,wps:BRAVIA_2015|assoc:0,1,50,45,127,221(000c43,6),221(0050f2,2),48,127,htcap:01ad,htagg:13,htmcs:0000ffff,extcap:00000a02':
+        ('Sony Bravia TV', '2015 model', '2.4GHz'),
     'wifi4|probe:0,1,50,221(0050f2,4),221(506f9a,10),221(506f9a,9),wps:BRAVIA_4K_2015|assoc:0,1,50,45,127,221(000c43,6),221(0050f2,2),48,127,htcap:008c,htagg:13,htmcs:0000ffff,extcap:00000a02':
-        ('Sony Bravia TV', '', '2.4GHz'),
+        ('Sony Bravia TV', '2015 model', '2.4GHz'),
+    'wifi4|probe:0,1,50,221(0050f2,4),221(506f9a,10),221(506f9a,9),wps:BRAVIA_2015|assoc:0,1,50,45,127,221(000c43,6),221(0050f2,2),48,127,htcap:01ad,htagg:13,htmcs:0000ffff,extcap:00000a02':
+        ('Sony Bravia TV', '2015 model', '2.4GHz'),
 
     'wifi4|probe:0,1,3,45,221(0050f2,8),191,htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31800120,vhtrxmcs:0000fffc,vhttxmcs:0000fffc|assoc:0,1,33,36,48,70,45,221(0050f2,2),127,htcap:012c,htagg:03,htmcs:000000ff|oui:sony':
         ('Sony Xperia', 'Z Ultra', '5GHz'),
@@ -1026,6 +1053,17 @@
     # TIVO-849
     'wifi4|probe:0,1,45,127,191,221(001018,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:0000008001|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(0050f2,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:e009,extcap:0000008001|os:tivo':
         ('TiVo', 'BOLT', '5GHz'),
+    'wifi4|probe:0,1,45,127,191,221(00904c,51),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f8159b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:0000008001000040|assoc:0,1,33,36,48,45,127,191,221(00904c,51),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f8159b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:e007,extcap:0000008001000040|os:tivo':
+        ('TiVo', 'BOLT', '5GHz'),
+    'wifi4|probe:0,1,45,127,191,221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f8159b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:0000008001000040|assoc:0,1,33,36,48,45,127,191,221(00904c,51),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f8159b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:e007,extcap:0000008001000040|os:tivo':
+        ('TiVo', 'BOLT', '5GHz'),
+    'wifi4|probe:0,1,50,3,45,127,221(00904c,51),221(001018,2),htcap:01ad,htagg:17,htmcs:0000ffff,extcap:0000008001000040|assoc:0,1,50,33,36,48,45,127,221(00904c,51),221(001018,2),221(0050f2,2),htcap:01ad,htagg:17,htmcs:0000ffff,txpow:1207,extcap:0000008001000040|os:tivo':
+        ('TiVo', 'BOLT', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,221(001018,2),htcap:01ad,htagg:17,htmcs:0000ffff,extcap:0000008001000040|assoc:0,1,50,33,36,48,45,127,221(00904c,51),221(001018,2),221(0050f2,2),htcap:01ad,htagg:17,htmcs:0000ffff,txpow:1207,extcap:0000008001000040|os:tivo':
+        ('TiVo', 'BOLT', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,221(00904c,51),221(001018,2),htcap:01ad,htagg:17,htmcs:0000ffff,extcap:0000008001000040|assoc:0,1,50,33,36,48,45,127,221(00904c,51),221(001018,2),221(0050f2,2),htcap:01ad,htagg:17,htmcs:0000ffff,txpow:1207,extcap:0000008001000040|os:tivo':
+        ('TiVo', 'BOLT', '2.4GHz'),
+
     # TIVO-746
     'wifi4|probe:0,1,50,221(00904c,51),45,48,htcap:13ce,htagg:1b,htmcs:0000ffff|assoc:0,1,33,36,50,221(0050f2,2),221(00904c,51),45,221(002163,1),221(002163,4),48,htcap:13ce,htagg:1b,htmcs:0000ffff,txpow:0f0f|os:tivo':
         ('TiVo', 'Premiere Series 4', '2.4GHz'),
@@ -1083,6 +1121,8 @@
     'wifi4|probe:0,1,3,50|assoc:0,1,33,48,50,127,127,221(0050f2,2),45,htcap:012c,htagg:03,htmcs:0000ffff,txpow:1208,extcap:0000000000000140|oui:microsoft':
         ('Xbox', '', '2.4GHz'),
 
+    'wifi4|probe:0,1,45,50,htcap:058f,htagg:03,htmcs:0000ffff|assoc:0,1,33,36,221(0050f2,2),45,htcap:058f,htagg:03,htmcs:0000ffff,txpow:1208|oui:microsoft':
+        ('Xbox', 'One', '5GHz'),
     'wifi4|probe:0,1,3,45,50,htcap:058f,htagg:03,htmcs:0000ffff|assoc:0,1,48,50,221(0050f2,2),45,htcap:058d,htagg:03,htmcs:0000ffff|oui:microsoft':
         ('Xbox', 'One', '2.4GHz'),
     'wifi4|probe:0,1,45,50,htcap:058f,htagg:03,htmcs:0000ffff|assoc:0,1,48,50,221(0050f2,2),45,htcap:058d,htagg:03,htmcs:0000ffff|oui:microsoft':