Nouveau doesn't dedicated data, so just the Chipset line is parsed.

15 files changed, 710 insertions, 717 deletions

diff --git a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/comments/0b63aae5-7ff9-4980-98ab-d13c8ffaa0aa/body b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/comments/0b63aae5-7ff9-4980-98ab-d13c8ffaa0aa/body
new file mode 100644
index 0000000..3aa11b7
--- /dev/null
+++ b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/comments/0b63aae5-7ff9-4980-98ab-d13c8ffaa0aa/body
@@ -0,0 +1,2 @@
+CSS priorities are so complicated, that I just cannot afford time
+and fragility incurred.
diff --git a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/comments/0b63aae5-7ff9-4980-98ab-d13c8ffaa0aa/values b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/comments/0b63aae5-7ff9-4980-98ab-d13c8ffaa0aa/values
new file mode 100644
index 0000000..396eeab
--- /dev/null
+++ b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/comments/0b63aae5-7ff9-4980-98ab-d13c8ffaa0aa/values
@@ -0,0 +1,8 @@
+Author: Matěj Cepl <mcepl@redhat.com>
+
+
+Content-type: text/plain
+
+
+Date: Thu, 24 Feb 2011 18:03:14 +0000
+
diff --git a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/values b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/values
index 5276b2e..1cc21d4 100644
--- a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/values
+++ b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/values
@@ -7,7 +7,7 @@ reporter: Matěj Cepl <mcepl@redhat.com>
 severity: minor
 
 
-status: open
+status: wontfix
 
 
 summary: define proper CSS styles instead of using variables and style attribute
diff --git a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/62c92ec0-678a-4834-ad69-76aff18e2227/body b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/62c92ec0-678a-4834-ad69-76aff18e2227/body
new file mode 100644
index 0000000..1152ebe
--- /dev/null
+++ b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/62c92ec0-678a-4834-ad69-76aff18e2227/body
@@ -0,0 +1,2 @@
+Actually we don't have nouveau data, so we just show Chipset
+line.
diff --git a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/62c92ec0-678a-4834-ad69-76aff18e2227/values b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/62c92ec0-678a-4834-ad69-76aff18e2227/values
new file mode 100644
index 0000000..dbc994a
--- /dev/null
+++ b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/62c92ec0-678a-4834-ad69-76aff18e2227/values
@@ -0,0 +1,8 @@
+Author: Matěj Cepl <mcepl@redhat.com>
+
+
+Content-type: text/plain
+
+
+Date: Thu, 24 Feb 2011 22:49:00 +0000
+
diff --git a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/ba22934d-f4f1-42ce-95f5-c56394a83ccc/body b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/ba22934d-f4f1-42ce-95f5-c56394a83ccc/body
new file mode 100644
index 0000000..27f13ae
--- /dev/null
+++ b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/ba22934d-f4f1-42ce-95f5-c56394a83ccc/body
@@ -0,0 +1,2 @@
+I have updated ATI data, but there are actually no nouveau data
+included.
diff --git a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/ba22934d-f4f1-42ce-95f5-c56394a83ccc/values b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/ba22934d-f4f1-42ce-95f5-c56394a83ccc/values
new file mode 100644
index 0000000..c588275
--- /dev/null
+++ b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/ba22934d-f4f1-42ce-95f5-c56394a83ccc/values
@@ -0,0 +1,8 @@
+Author: Matěj Cepl <mcepl@redhat.com>
+
+
+Content-type: text/plain
+
+
+Date: Thu, 24 Feb 2011 18:03:53 +0000
+
diff --git a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/values b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/values
index c27c889..951108f 100644
--- a/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/values
+++ b/.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/values
@@ -7,7 +7,7 @@ reporter: Matěj Cepl <mcepl@redhat.com>
 severity: minor
 
 
-status: open
+status: closed
 
 
 summary: Update nouveau data
diff --git a/.be/id-cache b/.be/id-cache
index 9c8982e..fb84100 100644
--- a/.be/id-cache
+++ b/.be/id-cache
@@ -1,11 +1,12 @@
 829f5222-d220-4406-90da-835b72b70a97	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/829f5222-d220-4406-90da-835b72b70a97
 a9d5d16d-1c7d-4918-8be2-bd499a799b54	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/989f85c8-3941-4a97-a447-bdbf0fbbd7f4/comments/a9d5d16d-1c7d-4918-8be2-bd499a799b54
+ba22934d-f4f1-42ce-95f5-c56394a83ccc	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/ba22934d-f4f1-42ce-95f5-c56394a83ccc
 ecff7ddb-1d5f-406b-9b3b-18388d575604	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/comments/ecff7ddb-1d5f-406b-9b3b-18388d575604
-11c4a6bb-a7a5-4d18-bab5-14ab119bb3ef	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ca8df3f8-7557-4730-bcca-3707776f5db4/comments/11c4a6bb-a7a5-4d18-bab5-14ab119bb3ef
+d4145155-0ef1-409e-9236-261eb08f75d5	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/d4145155-0ef1-409e-9236-261eb08f75d5
 12d5c683-231b-4b4f-8f05-b6ae32a5b0a8	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/e16d92aa-df09-4851-b6a0-3ed0ea2ff0fa/comments/12d5c683-231b-4b4f-8f05-b6ae32a5b0a8
 476bde43-fa24-445f-a79e-b3d251bc515a	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/476bde43-fa24-445f-a79e-b3d251bc515a
 29f5f313-559a-4fea-88fa-fc4a4fc94112	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5fc172f0-231a-4d0e-9c6b-8d9f60abbfba/comments/29f5f313-559a-4fea-88fa-fc4a4fc94112
-d4145155-0ef1-409e-9236-261eb08f75d5	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/d4145155-0ef1-409e-9236-261eb08f75d5
+11c4a6bb-a7a5-4d18-bab5-14ab119bb3ef	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ca8df3f8-7557-4730-bcca-3707776f5db4/comments/11c4a6bb-a7a5-4d18-bab5-14ab119bb3ef
 5fc172f0-231a-4d0e-9c6b-8d9f60abbfba	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5fc172f0-231a-4d0e-9c6b-8d9f60abbfba
 d315d824-bb0d-4a28-941d-88a1aa77ffa0	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/d315d824-bb0d-4a28-941d-88a1aa77ffa0
 88fa923c-59ee-47bf-b7c8-d1a7a7bdeb33	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/88fa923c-59ee-47bf-b7c8-d1a7a7bdeb33
@@ -15,11 +16,13 @@ fcebd19c-12b9-43ae-bc54-7cae39396e9f	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bu
 ca8df3f8-7557-4730-bcca-3707776f5db4	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ca8df3f8-7557-4730-bcca-3707776f5db4
 b9e11546-5ec7-4464-8070-35c5510c13ff	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/d4145155-0ef1-409e-9236-261eb08f75d5/comments/b9e11546-5ec7-4464-8070-35c5510c13ff
 99abb100-a0e8-49b0-8799-a47e4d5fb0b3	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/99abb100-a0e8-49b0-8799-a47e4d5fb0b3
-27c176c2-26be-4a51-bb71-2aff47c5484b	.be/27c176c2-26be-4a51-bb71-2aff47c5484b
-5718cbae-15da-4921-8371-5be69197c4ed	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed
 bd5cef03-c389-4fab-8336-30a02ee97261	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/bd5cef03-c389-4fab-8336-30a02ee97261
+5718cbae-15da-4921-8371-5be69197c4ed	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed
+62c92ec0-678a-4834-ad69-76aff18e2227	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb/comments/62c92ec0-678a-4834-ad69-76aff18e2227
+27c176c2-26be-4a51-bb71-2aff47c5484b	.be/27c176c2-26be-4a51-bb71-2aff47c5484b
 70b1e7f3-6446-45dc-91e5-e338d51770aa	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/99abb100-a0e8-49b0-8799-a47e4d5fb0b3/comments/70b1e7f3-6446-45dc-91e5-e338d51770aa
 ad8fee41-b8dd-4c4e-85e1-4ab96923cecb	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/ad8fee41-b8dd-4c4e-85e1-4ab96923cecb
+0b63aae5-7ff9-4980-98ab-d13c8ffaa0aa	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/5718cbae-15da-4921-8371-5be69197c4ed/comments/0b63aae5-7ff9-4980-98ab-d13c8ffaa0aa
 019f1b74-7113-4213-8b66-b63ae63fa603	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/019f1b74-7113-4213-8b66-b63ae63fa603
 989f85c8-3941-4a97-a447-bdbf0fbbd7f4	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/989f85c8-3941-4a97-a447-bdbf0fbbd7f4
 e16d92aa-df09-4851-b6a0-3ed0ea2ff0fa	.be/27c176c2-26be-4a51-bb71-2aff47c5484b/bugs/e16d92aa-df09-4851-b6a0-3ed0ea2ff0fa
diff --git a/chip-data/ati/drm_pciids.awk b/chip-data/ati/drm_pciids.awk
index dea8fd2..898f496 100755
--- a/chip-data/ati/drm_pciids.awk
+++ b/chip-data/ati/drm_pciids.awk
@@ -70,7 +70,8 @@ function format_flags(f_code,        i, n, l, out) {
 	formatted_flags = format_flags(f_code)
 
 	# second param to gensub is the replacement text:
-	chip_type = tolower(gensub(/^CHIP_/, "", "", first_flag))
+	## chip_type = tolower(gensub(/^CHIP_/, "", "", first_flag))
+	chip_type = gensub(/^CHIP_/, "", "", first_flag)
 
     if (length(first_line) > 0) {
         printf(",\n")
diff --git a/chip-data/ati/drm_pciids.json b/chip-data/ati/drm_pciids.json
index 20ad905..2db2758 100644
--- a/chip-data/ati/drm_pciids.json
+++ b/chip-data/ati/drm_pciids.json
@@ -1,490 +1,490 @@
 {
-	"1002,3150":["rv380","m"],
-	"1002,3152":["rv380","mM"],
-	"1002,3154":["rv380","mM"],
-	"1002,3155":["rv380","mM"],
-	"1002,3E50":["rv380","M"],
-	"1002,3E54":["rv380","M"],
-	"1002,4136":["rs100","i"],
-	"1002,4137":["rs200","i"],
-	"1002,4144":["r300"],
-	"1002,4145":["r300"],
-	"1002,4146":["r300"],
-	"1002,4147":["r300"],
-	"1002,4148":["r350"],
-	"1002,4149":["r350"],
-	"1002,414A":["r350"],
-	"1002,414B":["r350"],
-	"1002,4150":["rv350"],
-	"1002,4151":["rv350"],
-	"1002,4152":["rv350"],
-	"1002,4153":["rv350"],
-	"1002,4154":["rv350"],
-	"1002,4155":["rv350"],
-	"1002,4156":["rv350"],
-	"1002,4237":["rs200","i"],
-	"1002,4242":["r200"],
-	"1002,4336":["rs100","mi"],
-	"1002,4337":["rs200","mi"],
-	"1002,4437":["rs200","mi"],
-	"1002,4966":["rv250"],
-	"1002,4967":["rv250"],
-	"1002,4A48":["r420","M"],
-	"1002,4A49":["r420","M"],
-	"1002,4A4A":["r420","M"],
-	"1002,4A4B":["r420","M"],
-	"1002,4A4C":["r420","M"],
-	"1002,4A4D":["r420","M"],
-	"1002,4A4E":["r420","mM"],
-	"1002,4A4F":["r420","M"],
-	"1002,4A50":["r420","M"],
-	"1002,4A54":["r420","M"],
-	"1002,4B48":["r420","M"],
-	"1002,4B49":["r420","M"],
-	"1002,4B4A":["r420","M"],
-	"1002,4B4B":["r420","M"],
-	"1002,4B4C":["r420","M"],
-	"1002,4C57":["rv200","m"],
-	"1002,4C58":["rv200","m"],
-	"1002,4C59":["rv100","m"],
-	"1002,4C5A":["rv100","m"],
-	"1002,4C64":["rv250","m"],
-	"1002,4C66":["rv250","m"],
-	"1002,4C67":["rv250","m"],
-	"1002,4E44":["r300"],
-	"1002,4E45":["r300"],
-	"1002,4E46":["r300"],
-	"1002,4E47":["r300"],
-	"1002,4E48":["r350"],
-	"1002,4E49":["r350"],
-	"1002,4E4A":["r350"],
-	"1002,4E4B":["r350"],
-	"1002,4E50":["rv350","m"],
-	"1002,4E51":["rv350","m"],
-	"1002,4E52":["rv350","m"],
-	"1002,4E53":["rv350","m"],
-	"1002,4E54":["rv350","m"],
-	"1002,4E56":["rv350","m"],
-	"1002,5144":["r100","c"],
-	"1002,5145":["r100","c"],
-	"1002,5146":["r100","c"],
-	"1002,5147":["r100","c"],
-	"1002,5148":["r200"],
-	"1002,514C":["r200"],
-	"1002,514D":["r200"],
-	"1002,5157":["rv200"],
-	"1002,5158":["rv200"],
-	"1002,5159":["rv100"],
-	"1002,515A":["rv100"],
-	"1002,515E":["rv100","c"],
-	"1002,5460":["rv380","m"],
-	"1002,5462":["rv380","m"],
-	"1002,5464":["rv380","m"],
-	"1002,5548":["r423","M"],
-	"1002,5549":["r423","M"],
-	"1002,554A":["r423","M"],
-	"1002,554B":["r423","M"],
-	"1002,554C":["r423","M"],
-	"1002,554D":["r423","M"],
-	"1002,554E":["r423","M"],
-	"1002,554F":["r423","M"],
-	"1002,5550":["r423","M"],
-	"1002,5551":["r423","M"],
-	"1002,5552":["r423","M"],
-	"1002,5554":["r423","M"],
-	"1002,564A":["rv410","mM"],
-	"1002,564B":["rv410","mM"],
-	"1002,564F":["rv410","mM"],
-	"1002,5652":["rv410","mM"],
-	"1002,5653":["rv410","mM"],
-	"1002,5657":["rv410","M"],
-	"1002,5834":["rs300","i"],
-	"1002,5835":["rs300","mi"],
-	"1002,5954":["rs480","miI"],
-	"1002,5955":["rs480","miI"],
-	"1002,5974":["rs480","miI"],
-	"1002,5975":["rs480","miI"],
-	"1002,5960":["rv280"],
-	"1002,5961":["rv280"],
-	"1002,5962":["rv280"],
-	"1002,5964":["rv280"],
-	"1002,5965":["rv280"],
-	"1002,5969":["rv100","c"],
-	"1002,5A41":["rs400","iI"],
-	"1002,5A42":["rs400","miI"],
-	"1002,5A61":["rs400","iI"],
-	"1002,5A62":["rs400","miI"],
-	"1002,5B60":["rv380","M"],
-	"1002,5B62":["rv380","M"],
-	"1002,5B63":["rv380","M"],
-	"1002,5B64":["rv380","M"],
-	"1002,5B65":["rv380","M"],
-	"1002,5C61":["rv280","m"],
-	"1002,5C63":["rv280","m"],
-	"1002,5D48":["r423","mM"],
-	"1002,5D49":["r423","mM"],
-	"1002,5D4A":["r423","mM"],
-	"1002,5D4C":["r423","M"],
-	"1002,5D4D":["r423","M"],
-	"1002,5D4E":["r423","M"],
-	"1002,5D4F":["r423","M"],
-	"1002,5D50":["r423","M"],
-	"1002,5D52":["r423","M"],
-	"1002,5D57":["r423","M"],
-	"1002,5E48":["rv410","M"],
-	"1002,5E4A":["rv410","M"],
-	"1002,5E4B":["rv410","M"],
-	"1002,5E4C":["rv410","M"],
-	"1002,5E4D":["rv410","M"],
-	"1002,5E4F":["rv410","M"],
-	"1002,6720":["barts","mM"],
-	"1002,6721":["barts","mM"],
-	"1002,6722":["barts","M"],
-	"1002,6723":["barts","M"],
-	"1002,6724":["barts","mM"],
-	"1002,6725":["barts","mM"],
-	"1002,6726":["barts","M"],
-	"1002,6727":["barts","M"],
-	"1002,6728":["barts","M"],
-	"1002,6729":["barts","M"],
-	"1002,6738":["barts","M"],
-	"1002,6739":["barts","M"],
-	"1002,6740":["turks","mM"],
-	"1002,6741":["turks","mM"],
-	"1002,6742":["turks","mM"],
-	"1002,6743":["turks","mM"],
-	"1002,6744":["turks","mM"],
-	"1002,6745":["turks","mM"],
-	"1002,6746":["turks","M"],
-	"1002,6747":["turks","M"],
-	"1002,6748":["turks","M"],
-	"1002,6749":["turks","M"],
-	"1002,6750":["turks","M"],
-	"1002,6758":["turks","M"],
-	"1002,6759":["turks","M"],
-	"1002,6760":["caicos","mM"],
-	"1002,6761":["caicos","mM"],
-	"1002,6762":["caicos","M"],
-	"1002,6763":["caicos","M"],
-	"1002,6764":["caicos","mM"],
-	"1002,6765":["caicos","mM"],
-	"1002,6766":["caicos","M"],
-	"1002,6767":["caicos","M"],
-	"1002,6768":["caicos","M"],
-	"1002,6770":["caicos","M"],
-	"1002,6779":["caicos","M"],
-	"1002,6880":["cypress","mM"],
-	"1002,6888":["cypress","M"],
-	"1002,6889":["cypress","M"],
-	"1002,688A":["cypress","M"],
-	"1002,688C":["cypress","M"],
-	"1002,688D":["cypress","M"],
-	"1002,6898":["cypress","M"],
-	"1002,6899":["cypress","M"],
-	"1002,689C":["hemlock","M"],
-	"1002,689D":["hemlock","M"],
-	"1002,689E":["cypress","M"],
-	"1002,68A0":["juniper","mM"],
-	"1002,68A1":["juniper","mM"],
-	"1002,68A8":["juniper","M"],
-	"1002,68A9":["juniper","M"],
-	"1002,68B0":["juniper","mM"],
-	"1002,68B8":["juniper","M"],
-	"1002,68B9":["juniper","M"],
-	"1002,68BE":["juniper","M"],
-	"1002,68C0":["redwood","mM"],
-	"1002,68C1":["redwood","mM"],
-	"1002,68C7":["redwood","mM"],
-	"1002,68C8":["redwood","M"],
-	"1002,68C9":["redwood","M"],
-	"1002,68D8":["redwood","M"],
-	"1002,68D9":["redwood","M"],
-	"1002,68DA":["redwood","M"],
-	"1002,68DE":["redwood","M"],
-	"1002,68E0":["cedar","mM"],
-	"1002,68E1":["cedar","mM"],
-	"1002,68E4":["cedar","mM"],
-	"1002,68E5":["cedar","mM"],
-	"1002,68E8":["cedar","M"],
-	"1002,68E9":["cedar","M"],
-	"1002,68F1":["cedar","M"],
-	"1002,68F2":["cedar","M"],
-	"1002,68F8":["cedar","M"],
-	"1002,68F9":["cedar","M"],
-	"1002,68FE":["cedar","M"],
-	"1002,7100":["r520","M"],
-	"1002,7101":["r520","mM"],
-	"1002,7102":["r520","mM"],
-	"1002,7103":["r520","mM"],
-	"1002,7104":["r520","M"],
-	"1002,7105":["r520","M"],
-	"1002,7106":["r520","mM"],
-	"1002,7108":["r520","M"],
-	"1002,7109":["r520","M"],
-	"1002,710A":["r520","M"],
-	"1002,710B":["r520","M"],
-	"1002,710C":["r520","M"],
-	"1002,710E":["r520","M"],
-	"1002,710F":["r520","M"],
-	"1002,7140":["rv515","M"],
-	"1002,7141":["rv515","M"],
-	"1002,7142":["rv515","M"],
-	"1002,7143":["rv515","M"],
-	"1002,7144":["rv515","mM"],
-	"1002,7145":["rv515","mM"],
-	"1002,7146":["rv515","M"],
-	"1002,7147":["rv515","M"],
-	"1002,7149":["rv515","mM"],
-	"1002,714A":["rv515","mM"],
-	"1002,714B":["rv515","mM"],
-	"1002,714C":["rv515","mM"],
-	"1002,714D":["rv515","M"],
-	"1002,714E":["rv515","M"],
-	"1002,714F":["rv515","M"],
-	"1002,7151":["rv515","M"],
-	"1002,7152":["rv515","M"],
-	"1002,7153":["rv515","M"],
-	"1002,715E":["rv515","M"],
-	"1002,715F":["rv515","M"],
-	"1002,7180":["rv515","M"],
-	"1002,7181":["rv515","M"],
-	"1002,7183":["rv515","M"],
-	"1002,7186":["rv515","mM"],
-	"1002,7187":["rv515","M"],
-	"1002,7188":["rv515","mM"],
-	"1002,718A":["rv515","mM"],
-	"1002,718B":["rv515","mM"],
-	"1002,718C":["rv515","mM"],
-	"1002,718D":["rv515","mM"],
-	"1002,718F":["rv515","M"],
-	"1002,7193":["rv515","M"],
-	"1002,7196":["rv515","mM"],
-	"1002,719B":["rv515","M"],
-	"1002,719F":["rv515","M"],
-	"1002,71C0":["rv530","M"],
-	"1002,71C1":["rv530","M"],
-	"1002,71C2":["rv530","M"],
-	"1002,71C3":["rv530","M"],
-	"1002,71C4":["rv530","mM"],
-	"1002,71C5":["rv530","mM"],
-	"1002,71C6":["rv530","M"],
-	"1002,71C7":["rv530","M"],
-	"1002,71CD":["rv530","M"],
-	"1002,71CE":["rv530","M"],
-	"1002,71D2":["rv530","M"],
-	"1002,71D4":["rv530","mM"],
-	"1002,71D5":["rv530","mM"],
-	"1002,71D6":["rv530","mM"],
-	"1002,71DA":["rv530","M"],
-	"1002,71DE":["rv530","mM"],
-	"1002,7200":["rv515","M"],
-	"1002,7210":["rv515","mM"],
-	"1002,7211":["rv515","mM"],
-	"1002,7240":["r580","M"],
-	"1002,7243":["r580","M"],
-	"1002,7244":["r580","M"],
-	"1002,7245":["r580","M"],
-	"1002,7246":["r580","M"],
-	"1002,7247":["r580","M"],
-	"1002,7248":["r580","M"],
-	"1002,7249":["r580","M"],
-	"1002,724A":["r580","M"],
-	"1002,724B":["r580","M"],
-	"1002,724C":["r580","M"],
-	"1002,724D":["r580","M"],
-	"1002,724E":["r580","M"],
-	"1002,724F":["r580","M"],
-	"1002,7280":["rv570","M"],
-	"1002,7281":["rv560","M"],
-	"1002,7283":["rv560","M"],
-	"1002,7284":["r580","mM"],
-	"1002,7287":["rv560","M"],
-	"1002,7288":["rv570","M"],
-	"1002,7289":["rv570","M"],
-	"1002,728B":["rv570","M"],
-	"1002,728C":["rv570","M"],
-	"1002,7290":["rv560","M"],
-	"1002,7291":["rv560","M"],
-	"1002,7293":["rv560","M"],
-	"1002,7297":["rv560","M"],
-	"1002,7834":["rs300","Mi"],
-	"1002,7835":["rs300","mMi"],
-	"1002,791E":["rs690","MiI"],
-	"1002,791F":["rs690","MiI"],
-	"1002,793F":["rs600","Mi"],
-	"1002,7941":["rs600","Mi"],
-	"1002,7942":["rs600","Mi"],
-	"1002,796C":["rs740","MiI"],
-	"1002,796D":["rs740","MiI"],
-	"1002,796E":["rs740","MiI"],
-	"1002,796F":["rs740","MiI"],
-	"1002,9400":["r600","M"],
-	"1002,9401":["r600","M"],
-	"1002,9402":["r600","M"],
-	"1002,9403":["r600","M"],
-	"1002,9405":["r600","M"],
-	"1002,940A":["r600","M"],
-	"1002,940B":["r600","M"],
-	"1002,940F":["r600","M"],
-	"1002,94A0":["rv740","mM"],
-	"1002,94A1":["rv740","mM"],
-	"1002,94A3":["rv740","mM"],
-	"1002,94B1":["rv740","M"],
-	"1002,94B3":["rv740","M"],
-	"1002,94B4":["rv740","M"],
-	"1002,94B5":["rv740","M"],
-	"1002,94B9":["rv740","mM"],
-	"1002,9440":["rv770","M"],
-	"1002,9441":["rv770","M"],
-	"1002,9442":["rv770","M"],
-	"1002,9443":["rv770","M"],
-	"1002,9444":["rv770","M"],
-	"1002,9446":["rv770","M"],
-	"1002,944A":["rv770","mM"],
-	"1002,944B":["rv770","mM"],
-	"1002,944C":["rv770","M"],
-	"1002,944E":["rv770","M"],
-	"1002,9450":["rv770","M"],
-	"1002,9452":["rv770","M"],
-	"1002,9456":["rv770","M"],
-	"1002,945A":["rv770","mM"],
-	"1002,945B":["rv770","mM"],
-	"1002,945E":["rv770","mM"],
-	"1002,9460":["rv770","M"],
-	"1002,9462":["rv770","M"],
-	"1002,946A":["rv770","mM"],
-	"1002,946B":["rv770","mM"],
-	"1002,947A":["rv770","mM"],
-	"1002,947B":["rv770","mM"],
-	"1002,9480":["rv730","mM"],
-	"1002,9487":["rv730","M"],
-	"1002,9488":["rv730","mM"],
-	"1002,9489":["rv730","mM"],
-	"1002,948A":["rv730","mM"],
-	"1002,948F":["rv730","M"],
-	"1002,9490":["rv730","M"],
-	"1002,9491":["rv730","mM"],
-	"1002,9495":["rv730","M"],
-	"1002,9498":["rv730","M"],
-	"1002,949C":["rv730","M"],
-	"1002,949E":["rv730","M"],
-	"1002,949F":["rv730","M"],
-	"1002,94C0":["rv610","M"],
-	"1002,94C1":["rv610","M"],
-	"1002,94C3":["rv610","M"],
-	"1002,94C4":["rv610","M"],
-	"1002,94C5":["rv610","M"],
-	"1002,94C6":["rv610","M"],
-	"1002,94C7":["rv610","M"],
-	"1002,94C8":["rv610","mM"],
-	"1002,94C9":["rv610","mM"],
-	"1002,94CB":["rv610","mM"],
-	"1002,94CC":["rv610","M"],
-	"1002,94CD":["rv610","M"],
-	"1002,9500":["rv670","M"],
-	"1002,9501":["rv670","M"],
-	"1002,9504":["rv670","mM"],
-	"1002,9505":["rv670","M"],
-	"1002,9506":["rv670","mM"],
-	"1002,9507":["rv670","M"],
-	"1002,9508":["rv670","mM"],
-	"1002,9509":["rv670","mM"],
-	"1002,950F":["rv670","M"],
-	"1002,9511":["rv670","M"],
-	"1002,9515":["rv670","M"],
-	"1002,9517":["rv670","M"],
-	"1002,9519":["rv670","M"],
-	"1002,9540":["rv710","M"],
-	"1002,9541":["rv710","M"],
-	"1002,9542":["rv710","M"],
-	"1002,954E":["rv710","M"],
-	"1002,954F":["rv710","M"],
-	"1002,9552":["rv710","mM"],
-	"1002,9553":["rv710","mM"],
-	"1002,9555":["rv710","mM"],
-	"1002,9557":["rv710","mM"],
-	"1002,955F":["rv710","mM"],
-	"1002,9580":["rv630","M"],
-	"1002,9581":["rv630","mM"],
-	"1002,9583":["rv630","mM"],
-	"1002,9586":["rv630","M"],
-	"1002,9587":["rv630","M"],
-	"1002,9588":["rv630","M"],
-	"1002,9589":["rv630","M"],
-	"1002,958A":["rv630","M"],
-	"1002,958B":["rv630","mM"],
-	"1002,958C":["rv630","M"],
-	"1002,958D":["rv630","M"],
-	"1002,958E":["rv630","M"],
-	"1002,958F":["rv630","mM"],
-	"1002,9590":["rv635","M"],
-	"1002,9591":["rv635","mM"],
-	"1002,9593":["rv635","mM"],
-	"1002,9595":["rv635","mM"],
-	"1002,9596":["rv635","M"],
-	"1002,9597":["rv635","M"],
-	"1002,9598":["rv635","M"],
-	"1002,9599":["rv635","M"],
-	"1002,959B":["rv635","mM"],
-	"1002,95C0":["rv620","M"],
-	"1002,95C2":["rv620","mM"],
-	"1002,95C4":["rv620","mM"],
-	"1002,95C5":["rv620","M"],
-	"1002,95C6":["rv620","M"],
-	"1002,95C7":["rv620","M"],
-	"1002,95C9":["rv620","M"],
-	"1002,95CC":["rv620","M"],
-	"1002,95CD":["rv620","M"],
-	"1002,95CE":["rv620","M"],
-	"1002,95CF":["rv620","M"],
-	"1002,9610":["rs780","Mi"],
-	"1002,9611":["rs780","Mi"],
-	"1002,9612":["rs780","Mi"],
-	"1002,9613":["rs780","Mi"],
-	"1002,9614":["rs780","Mi"],
-	"1002,9615":["rs780","Mi"],
-	"1002,9616":["rs780","Mi"],
-	"1002,9710":["rs880","Mi"],
-	"1002,9711":["rs880","Mi"],
-	"1002,9712":["rs880","mMi"],
-	"1002,9713":["rs880","mMi"],
-	"1002,9714":["rs880","Mi"],
-	"1002,9715":["rs880","Mi"],
-	"1002,9802":["palm","Mi"],
-	"1002,9803":["palm","Mi"],
-	"1002,9804":["palm","Mi"],
-	"1002,9805":["palm","Mi"],
-	"102B,0520":["mga_card_type_g200"],
-	"102B,0521":["mga_card_type_g200"],
-	"102B,0525":["mga_card_type_g400"],
-	"102B,2527":["mga_card_type_g550"],
-	"1039,6330":["sis_chip_315"],
-	"18CA,0040":["sis_chip_315"],
-	"18CA,0042":["sis_chip_315"],
-	"1106,3118":["via_pro_group_a"],
-	"1106,3230":["via_dx9_0"],
-	"1106,3157":["via_pro_group_a"],
-	"5333,8A20":["s3_savage3d"],
-	"5333,8A21":["s3_savage3d"],
-	"5333,8A22":["s3_savage4"],
-	"5333,8A23":["s3_savage4"],
-	"5333,8C10":["s3_savage_mx"],
-	"5333,8C11":["s3_savage_mx"],
-	"5333,8C12":["s3_savage_mx"],
-	"5333,8C13":["s3_savage_mx"],
-	"5333,8C22":["s3_supersavage"],
-	"5333,8C24":["s3_supersavage"],
-	"5333,8C26":["s3_supersavage"],
-	"5333,8C2A":["s3_supersavage"],
-	"5333,8C2B":["s3_supersavage"],
-	"5333,8C2C":["s3_supersavage"],
-	"5333,8C2D":["s3_supersavage"],
-	"5333,8C2E":["s3_supersavage"],
-	"5333,8C2F":["s3_supersavage"],
-	"5333,8A25":["s3_prosavage"],
-	"5333,8A26":["s3_prosavage"],
-	"5333,8D01":["s3_twister"],
-	"5333,8D02":["s3_twister"],
-	"5333,8D03":["s3_prosavageddr"],
-	"5333,8D04":["s3_prosavageddr"]
+	"1002,3150":["RV380","m"],
+	"1002,3152":["RV380","mM"],
+	"1002,3154":["RV380","mM"],
+	"1002,3155":["RV380","mM"],
+	"1002,3E50":["RV380","M"],
+	"1002,3E54":["RV380","M"],
+	"1002,4136":["RS100","i"],
+	"1002,4137":["RS200","i"],
+	"1002,4144":["R300"],
+	"1002,4145":["R300"],
+	"1002,4146":["R300"],
+	"1002,4147":["R300"],
+	"1002,4148":["R350"],
+	"1002,4149":["R350"],
+	"1002,414A":["R350"],
+	"1002,414B":["R350"],
+	"1002,4150":["RV350"],
+	"1002,4151":["RV350"],
+	"1002,4152":["RV350"],
+	"1002,4153":["RV350"],
+	"1002,4154":["RV350"],
+	"1002,4155":["RV350"],
+	"1002,4156":["RV350"],
+	"1002,4237":["RS200","i"],
+	"1002,4242":["R200"],
+	"1002,4336":["RS100","mi"],
+	"1002,4337":["RS200","mi"],
+	"1002,4437":["RS200","mi"],
+	"1002,4966":["RV250"],
+	"1002,4967":["RV250"],
+	"1002,4A48":["R420","M"],
+	"1002,4A49":["R420","M"],
+	"1002,4A4A":["R420","M"],
+	"1002,4A4B":["R420","M"],
+	"1002,4A4C":["R420","M"],
+	"1002,4A4D":["R420","M"],
+	"1002,4A4E":["R420","mM"],
+	"1002,4A4F":["R420","M"],
+	"1002,4A50":["R420","M"],
+	"1002,4A54":["R420","M"],
+	"1002,4B48":["R420","M"],
+	"1002,4B49":["R420","M"],
+	"1002,4B4A":["R420","M"],
+	"1002,4B4B":["R420","M"],
+	"1002,4B4C":["R420","M"],
+	"1002,4C57":["RV200","m"],
+	"1002,4C58":["RV200","m"],
+	"1002,4C59":["RV100","m"],
+	"1002,4C5A":["RV100","m"],
+	"1002,4C64":["RV250","m"],
+	"1002,4C66":["RV250","m"],
+	"1002,4C67":["RV250","m"],
+	"1002,4E44":["R300"],
+	"1002,4E45":["R300"],
+	"1002,4E46":["R300"],
+	"1002,4E47":["R300"],
+	"1002,4E48":["R350"],
+	"1002,4E49":["R350"],
+	"1002,4E4A":["R350"],
+	"1002,4E4B":["R350"],
+	"1002,4E50":["RV350","m"],
+	"1002,4E51":["RV350","m"],
+	"1002,4E52":["RV350","m"],
+	"1002,4E53":["RV350","m"],
+	"1002,4E54":["RV350","m"],
+	"1002,4E56":["RV350","m"],
+	"1002,5144":["R100","c"],
+	"1002,5145":["R100","c"],
+	"1002,5146":["R100","c"],
+	"1002,5147":["R100","c"],
+	"1002,5148":["R200"],
+	"1002,514C":["R200"],
+	"1002,514D":["R200"],
+	"1002,5157":["RV200"],
+	"1002,5158":["RV200"],
+	"1002,5159":["RV100"],
+	"1002,515A":["RV100"],
+	"1002,515E":["RV100","c"],
+	"1002,5460":["RV380","m"],
+	"1002,5462":["RV380","m"],
+	"1002,5464":["RV380","m"],
+	"1002,5548":["R423","M"],
+	"1002,5549":["R423","M"],
+	"1002,554A":["R423","M"],
+	"1002,554B":["R423","M"],
+	"1002,554C":["R423","M"],
+	"1002,554D":["R423","M"],
+	"1002,554E":["R423","M"],
+	"1002,554F":["R423","M"],
+	"1002,5550":["R423","M"],
+	"1002,5551":["R423","M"],
+	"1002,5552":["R423","M"],
+	"1002,5554":["R423","M"],
+	"1002,564A":["RV410","mM"],
+	"1002,564B":["RV410","mM"],
+	"1002,564F":["RV410","mM"],
+	"1002,5652":["RV410","mM"],
+	"1002,5653":["RV410","mM"],
+	"1002,5657":["RV410","M"],
+	"1002,5834":["RS300","i"],
+	"1002,5835":["RS300","mi"],
+	"1002,5954":["RS480","miI"],
+	"1002,5955":["RS480","miI"],
+	"1002,5974":["RS480","miI"],
+	"1002,5975":["RS480","miI"],
+	"1002,5960":["RV280"],
+	"1002,5961":["RV280"],
+	"1002,5962":["RV280"],
+	"1002,5964":["RV280"],
+	"1002,5965":["RV280"],
+	"1002,5969":["RV100","c"],
+	"1002,5A41":["RS400","iI"],
+	"1002,5A42":["RS400","miI"],
+	"1002,5A61":["RS400","iI"],
+	"1002,5A62":["RS400","miI"],
+	"1002,5B60":["RV380","M"],
+	"1002,5B62":["RV380","M"],
+	"1002,5B63":["RV380","M"],
+	"1002,5B64":["RV380","M"],
+	"1002,5B65":["RV380","M"],
+	"1002,5C61":["RV280","m"],
+	"1002,5C63":["RV280","m"],
+	"1002,5D48":["R423","mM"],
+	"1002,5D49":["R423","mM"],
+	"1002,5D4A":["R423","mM"],
+	"1002,5D4C":["R423","M"],
+	"1002,5D4D":["R423","M"],
+	"1002,5D4E":["R423","M"],
+	"1002,5D4F":["R423","M"],
+	"1002,5D50":["R423","M"],
+	"1002,5D52":["R423","M"],
+	"1002,5D57":["R423","M"],
+	"1002,5E48":["RV410","M"],
+	"1002,5E4A":["RV410","M"],
+	"1002,5E4B":["RV410","M"],
+	"1002,5E4C":["RV410","M"],
+	"1002,5E4D":["RV410","M"],
+	"1002,5E4F":["RV410","M"],
+	"1002,6720":["BARTS","mM"],
+	"1002,6721":["BARTS","mM"],
+	"1002,6722":["BARTS","M"],
+	"1002,6723":["BARTS","M"],
+	"1002,6724":["BARTS","mM"],
+	"1002,6725":["BARTS","mM"],
+	"1002,6726":["BARTS","M"],
+	"1002,6727":["BARTS","M"],
+	"1002,6728":["BARTS","M"],
+	"1002,6729":["BARTS","M"],
+	"1002,6738":["BARTS","M"],
+	"1002,6739":["BARTS","M"],
+	"1002,6740":["TURKS","mM"],
+	"1002,6741":["TURKS","mM"],
+	"1002,6742":["TURKS","mM"],
+	"1002,6743":["TURKS","mM"],
+	"1002,6744":["TURKS","mM"],
+	"1002,6745":["TURKS","mM"],
+	"1002,6746":["TURKS","M"],
+	"1002,6747":["TURKS","M"],
+	"1002,6748":["TURKS","M"],
+	"1002,6749":["TURKS","M"],
+	"1002,6750":["TURKS","M"],
+	"1002,6758":["TURKS","M"],
+	"1002,6759":["TURKS","M"],
+	"1002,6760":["CAICOS","mM"],
+	"1002,6761":["CAICOS","mM"],
+	"1002,6762":["CAICOS","M"],
+	"1002,6763":["CAICOS","M"],
+	"1002,6764":["CAICOS","mM"],
+	"1002,6765":["CAICOS","mM"],
+	"1002,6766":["CAICOS","M"],
+	"1002,6767":["CAICOS","M"],
+	"1002,6768":["CAICOS","M"],
+	"1002,6770":["CAICOS","M"],
+	"1002,6779":["CAICOS","M"],
+	"1002,6880":["CYPRESS","mM"],
+	"1002,6888":["CYPRESS","M"],
+	"1002,6889":["CYPRESS","M"],
+	"1002,688A":["CYPRESS","M"],
+	"1002,688C":["CYPRESS","M"],
+	"1002,688D":["CYPRESS","M"],
+	"1002,6898":["CYPRESS","M"],
+	"1002,6899":["CYPRESS","M"],
+	"1002,689C":["HEMLOCK","M"],
+	"1002,689D":["HEMLOCK","M"],
+	"1002,689E":["CYPRESS","M"],
+	"1002,68A0":["JUNIPER","mM"],
+	"1002,68A1":["JUNIPER","mM"],
+	"1002,68A8":["JUNIPER","M"],
+	"1002,68A9":["JUNIPER","M"],
+	"1002,68B0":["JUNIPER","mM"],
+	"1002,68B8":["JUNIPER","M"],
+	"1002,68B9":["JUNIPER","M"],
+	"1002,68BE":["JUNIPER","M"],
+	"1002,68C0":["REDWOOD","mM"],
+	"1002,68C1":["REDWOOD","mM"],
+	"1002,68C7":["REDWOOD","mM"],
+	"1002,68C8":["REDWOOD","M"],
+	"1002,68C9":["REDWOOD","M"],
+	"1002,68D8":["REDWOOD","M"],
+	"1002,68D9":["REDWOOD","M"],
+	"1002,68DA":["REDWOOD","M"],
+	"1002,68DE":["REDWOOD","M"],
+	"1002,68E0":["CEDAR","mM"],
+	"1002,68E1":["CEDAR","mM"],
+	"1002,68E4":["CEDAR","mM"],
+	"1002,68E5":["CEDAR","mM"],
+	"1002,68E8":["CEDAR","M"],
+	"1002,68E9":["CEDAR","M"],
+	"1002,68F1":["CEDAR","M"],
+	"1002,68F2":["CEDAR","M"],
+	"1002,68F8":["CEDAR","M"],
+	"1002,68F9":["CEDAR","M"],
+	"1002,68FE":["CEDAR","M"],
+	"1002,7100":["R520","M"],
+	"1002,7101":["R520","mM"],
+	"1002,7102":["R520","mM"],
+	"1002,7103":["R520","mM"],
+	"1002,7104":["R520","M"],
+	"1002,7105":["R520","M"],
+	"1002,7106":["R520","mM"],
+	"1002,7108":["R520","M"],
+	"1002,7109":["R520","M"],
+	"1002,710A":["R520","M"],
+	"1002,710B":["R520","M"],
+	"1002,710C":["R520","M"],
+	"1002,710E":["R520","M"],
+	"1002,710F":["R520","M"],
+	"1002,7140":["RV515","M"],
+	"1002,7141":["RV515","M"],
+	"1002,7142":["RV515","M"],
+	"1002,7143":["RV515","M"],
+	"1002,7144":["RV515","mM"],
+	"1002,7145":["RV515","mM"],
+	"1002,7146":["RV515","M"],
+	"1002,7147":["RV515","M"],
+	"1002,7149":["RV515","mM"],
+	"1002,714A":["RV515","mM"],
+	"1002,714B":["RV515","mM"],
+	"1002,714C":["RV515","mM"],
+	"1002,714D":["RV515","M"],
+	"1002,714E":["RV515","M"],
+	"1002,714F":["RV515","M"],
+	"1002,7151":["RV515","M"],
+	"1002,7152":["RV515","M"],
+	"1002,7153":["RV515","M"],
+	"1002,715E":["RV515","M"],
+	"1002,715F":["RV515","M"],
+	"1002,7180":["RV515","M"],
+	"1002,7181":["RV515","M"],
+	"1002,7183":["RV515","M"],
+	"1002,7186":["RV515","mM"],
+	"1002,7187":["RV515","M"],
+	"1002,7188":["RV515","mM"],
+	"1002,718A":["RV515","mM"],
+	"1002,718B":["RV515","mM"],
+	"1002,718C":["RV515","mM"],
+	"1002,718D":["RV515","mM"],
+	"1002,718F":["RV515","M"],
+	"1002,7193":["RV515","M"],
+	"1002,7196":["RV515","mM"],
+	"1002,719B":["RV515","M"],
+	"1002,719F":["RV515","M"],
+	"1002,71C0":["RV530","M"],
+	"1002,71C1":["RV530","M"],
+	"1002,71C2":["RV530","M"],
+	"1002,71C3":["RV530","M"],
+	"1002,71C4":["RV530","mM"],
+	"1002,71C5":["RV530","mM"],
+	"1002,71C6":["RV530","M"],
+	"1002,71C7":["RV530","M"],
+	"1002,71CD":["RV530","M"],
+	"1002,71CE":["RV530","M"],
+	"1002,71D2":["RV530","M"],
+	"1002,71D4":["RV530","mM"],
+	"1002,71D5":["RV530","mM"],
+	"1002,71D6":["RV530","mM"],
+	"1002,71DA":["RV530","M"],
+	"1002,71DE":["RV530","mM"],
+	"1002,7200":["RV515","M"],
+	"1002,7210":["RV515","mM"],
+	"1002,7211":["RV515","mM"],
+	"1002,7240":["R580","M"],
+	"1002,7243":["R580","M"],
+	"1002,7244":["R580","M"],
+	"1002,7245":["R580","M"],
+	"1002,7246":["R580","M"],
+	"1002,7247":["R580","M"],
+	"1002,7248":["R580","M"],
+	"1002,7249":["R580","M"],
+	"1002,724A":["R580","M"],
+	"1002,724B":["R580","M"],
+	"1002,724C":["R580","M"],
+	"1002,724D":["R580","M"],
+	"1002,724E":["R580","M"],
+	"1002,724F":["R580","M"],
+	"1002,7280":["RV570","M"],
+	"1002,7281":["RV560","M"],
+	"1002,7283":["RV560","M"],
+	"1002,7284":["R580","mM"],
+	"1002,7287":["RV560","M"],
+	"1002,7288":["RV570","M"],
+	"1002,7289":["RV570","M"],
+	"1002,728B":["RV570","M"],
+	"1002,728C":["RV570","M"],
+	"1002,7290":["RV560","M"],
+	"1002,7291":["RV560","M"],
+	"1002,7293":["RV560","M"],
+	"1002,7297":["RV560","M"],
+	"1002,7834":["RS300","Mi"],
+	"1002,7835":["RS300","mMi"],
+	"1002,791E":["RS690","MiI"],
+	"1002,791F":["RS690","MiI"],
+	"1002,793F":["RS600","Mi"],
+	"1002,7941":["RS600","Mi"],
+	"1002,7942":["RS600","Mi"],
+	"1002,796C":["RS740","MiI"],
+	"1002,796D":["RS740","MiI"],
+	"1002,796E":["RS740","MiI"],
+	"1002,796F":["RS740","MiI"],
+	"1002,9400":["R600","M"],
+	"1002,9401":["R600","M"],
+	"1002,9402":["R600","M"],
+	"1002,9403":["R600","M"],
+	"1002,9405":["R600","M"],
+	"1002,940A":["R600","M"],
+	"1002,940B":["R600","M"],
+	"1002,940F":["R600","M"],
+	"1002,94A0":["RV740","mM"],
+	"1002,94A1":["RV740","mM"],
+	"1002,94A3":["RV740","mM"],
+	"1002,94B1":["RV740","M"],
+	"1002,94B3":["RV740","M"],
+	"1002,94B4":["RV740","M"],
+	"1002,94B5":["RV740","M"],
+	"1002,94B9":["RV740","mM"],
+	"1002,9440":["RV770","M"],
+	"1002,9441":["RV770","M"],
+	"1002,9442":["RV770","M"],
+	"1002,9443":["RV770","M"],
+	"1002,9444":["RV770","M"],
+	"1002,9446":["RV770","M"],
+	"1002,944A":["RV770","mM"],
+	"1002,944B":["RV770","mM"],
+	"1002,944C":["RV770","M"],
+	"1002,944E":["RV770","M"],
+	"1002,9450":["RV770","M"],
+	"1002,9452":["RV770","M"],
+	"1002,9456":["RV770","M"],
+	"1002,945A":["RV770","mM"],
+	"1002,945B":["RV770","mM"],
+	"1002,945E":["RV770","mM"],
+	"1002,9460":["RV770","M"],
+	"1002,9462":["RV770","M"],
+	"1002,946A":["RV770","mM"],
+	"1002,946B":["RV770","mM"],
+	"1002,947A":["RV770","mM"],
+	"1002,947B":["RV770","mM"],
+	"1002,9480":["RV730","mM"],
+	"1002,9487":["RV730","M"],
+	"1002,9488":["RV730","mM"],
+	"1002,9489":["RV730","mM"],
+	"1002,948A":["RV730","mM"],
+	"1002,948F":["RV730","M"],
+	"1002,9490":["RV730","M"],
+	"1002,9491":["RV730","mM"],
+	"1002,9495":["RV730","M"],
+	"1002,9498":["RV730","M"],
+	"1002,949C":["RV730","M"],
+	"1002,949E":["RV730","M"],
+	"1002,949F":["RV730","M"],
+	"1002,94C0":["RV610","M"],
+	"1002,94C1":["RV610","M"],
+	"1002,94C3":["RV610","M"],
+	"1002,94C4":["RV610","M"],
+	"1002,94C5":["RV610","M"],
+	"1002,94C6":["RV610","M"],
+	"1002,94C7":["RV610","M"],
+	"1002,94C8":["RV610","mM"],
+	"1002,94C9":["RV610","mM"],
+	"1002,94CB":["RV610","mM"],
+	"1002,94CC":["RV610","M"],
+	"1002,94CD":["RV610","M"],
+	"1002,9500":["RV670","M"],
+	"1002,9501":["RV670","M"],
+	"1002,9504":["RV670","mM"],
+	"1002,9505":["RV670","M"],
+	"1002,9506":["RV670","mM"],
+	"1002,9507":["RV670","M"],
+	"1002,9508":["RV670","mM"],
+	"1002,9509":["RV670","mM"],
+	"1002,950F":["RV670","M"],
+	"1002,9511":["RV670","M"],
+	"1002,9515":["RV670","M"],
+	"1002,9517":["RV670","M"],
+	"1002,9519":["RV670","M"],
+	"1002,9540":["RV710","M"],
+	"1002,9541":["RV710","M"],
+	"1002,9542":["RV710","M"],
+	"1002,954E":["RV710","M"],
+	"1002,954F":["RV710","M"],
+	"1002,9552":["RV710","mM"],
+	"1002,9553":["RV710","mM"],
+	"1002,9555":["RV710","mM"],
+	"1002,9557":["RV710","mM"],
+	"1002,955F":["RV710","mM"],
+	"1002,9580":["RV630","M"],
+	"1002,9581":["RV630","mM"],
+	"1002,9583":["RV630","mM"],
+	"1002,9586":["RV630","M"],
+	"1002,9587":["RV630","M"],
+	"1002,9588":["RV630","M"],
+	"1002,9589":["RV630","M"],
+	"1002,958A":["RV630","M"],
+	"1002,958B":["RV630","mM"],
+	"1002,958C":["RV630","M"],
+	"1002,958D":["RV630","M"],
+	"1002,958E":["RV630","M"],
+	"1002,958F":["RV630","mM"],
+	"1002,9590":["RV635","M"],
+	"1002,9591":["RV635","mM"],
+	"1002,9593":["RV635","mM"],
+	"1002,9595":["RV635","mM"],
+	"1002,9596":["RV635","M"],
+	"1002,9597":["RV635","M"],
+	"1002,9598":["RV635","M"],
+	"1002,9599":["RV635","M"],
+	"1002,959B":["RV635","mM"],
+	"1002,95C0":["RV620","M"],
+	"1002,95C2":["RV620","mM"],
+	"1002,95C4":["RV620","mM"],
+	"1002,95C5":["RV620","M"],
+	"1002,95C6":["RV620","M"],
+	"1002,95C7":["RV620","M"],
+	"1002,95C9":["RV620","M"],
+	"1002,95CC":["RV620","M"],
+	"1002,95CD":["RV620","M"],
+	"1002,95CE":["RV620","M"],
+	"1002,95CF":["RV620","M"],
+	"1002,9610":["RS780","Mi"],
+	"1002,9611":["RS780","Mi"],
+	"1002,9612":["RS780","Mi"],
+	"1002,9613":["RS780","Mi"],
+	"1002,9614":["RS780","Mi"],
+	"1002,9615":["RS780","Mi"],
+	"1002,9616":["RS780","Mi"],
+	"1002,9710":["RS880","Mi"],
+	"1002,9711":["RS880","Mi"],
+	"1002,9712":["RS880","mMi"],
+	"1002,9713":["RS880","mMi"],
+	"1002,9714":["RS880","Mi"],
+	"1002,9715":["RS880","Mi"],
+	"1002,9802":["PALM","Mi"],
+	"1002,9803":["PALM","Mi"],
+	"1002,9804":["PALM","Mi"],
+	"1002,9805":["PALM","Mi"],
+	"102B,0520":["MGA_CARD_TYPE_G200"],
+	"102B,0521":["MGA_CARD_TYPE_G200"],
+	"102B,0525":["MGA_CARD_TYPE_G400"],
+	"102B,2527":["MGA_CARD_TYPE_G550"],
+	"1039,6330":["SIS_CHIP_315"],
+	"18CA,0040":["SIS_CHIP_315"],
+	"18CA,0042":["SIS_CHIP_315"],
+	"1106,3118":["VIA_PRO_GROUP_A"],
+	"1106,3230":["VIA_DX9_0"],
+	"1106,3157":["VIA_PRO_GROUP_A"],
+	"5333,8A20":["S3_SAVAGE3D"],
+	"5333,8A21":["S3_SAVAGE3D"],
+	"5333,8A22":["S3_SAVAGE4"],
+	"5333,8A23":["S3_SAVAGE4"],
+	"5333,8C10":["S3_SAVAGE_MX"],
+	"5333,8C11":["S3_SAVAGE_MX"],
+	"5333,8C12":["S3_SAVAGE_MX"],
+	"5333,8C13":["S3_SAVAGE_MX"],
+	"5333,8C22":["S3_SUPERSAVAGE"],
+	"5333,8C24":["S3_SUPERSAVAGE"],
+	"5333,8C26":["S3_SUPERSAVAGE"],
+	"5333,8C2A":["S3_SUPERSAVAGE"],
+	"5333,8C2B":["S3_SUPERSAVAGE"],
+	"5333,8C2C":["S3_SUPERSAVAGE"],
+	"5333,8C2D":["S3_SUPERSAVAGE"],
+	"5333,8C2E":["S3_SUPERSAVAGE"],
+	"5333,8C2F":["S3_SUPERSAVAGE"],
+	"5333,8A25":["S3_PROSAVAGE"],
+	"5333,8A26":["S3_PROSAVAGE"],
+	"5333,8D01":["S3_TWISTER"],
+	"5333,8D02":["S3_TWISTER"],
+	"5333,8D03":["S3_PROSAVAGEDDR"],
+	"5333,8D04":["S3_PROSAVAGEDDR"]
 }
diff --git a/chip-data/chipNames.json b/chip-data/chipNames.json
index 1747639..b628527 100644
--- a/chip-data/chipNames.json
+++ b/chip-data/chipNames.json
@@ -137,81 +137,81 @@
 	"1002,5E4C":["RV410","M"],
 	"1002,5E4D":["RV410","M"],
 	"1002,5E4F":["RV410","M"],
-	"1002,6720":["Barts","mM"],
-	"1002,6721":["Barts","mM"],
-	"1002,6722":["Barts","M"],
-	"1002,6723":["Barts","M"],
-	"1002,6724":["Barts","mM"],
-	"1002,6725":["Barts","mM"],
-	"1002,6726":["Barts","M"],
-	"1002,6727":["Barts","M"],
-	"1002,6728":["Barts","M"],
-	"1002,6729":["Barts","M"],
-	"1002,6738":["Barts","M"],
-	"1002,6739":["Barts","M"],
-	"1002,6740":["Turks","mM"],
-	"1002,6741":["Turks","mM"],
-	"1002,6742":["Turks","mM"],
-	"1002,6743":["Turks","mM"],
-	"1002,6744":["Turks","mM"],
-	"1002,6745":["Turks","mM"],
-	"1002,6746":["Turks","M"],
-	"1002,6747":["Turks","M"],
-	"1002,6748":["Turks","M"],
-	"1002,6749":["Turks","M"],
-	"1002,6750":["Turks","M"],
-	"1002,6758":["Turks","M"],
-	"1002,6759":["Turks","M"],
-	"1002,6760":["Caicos","mM"],
-	"1002,6761":["Caicos","mM"],
-	"1002,6762":["Caicos","M"],
-	"1002,6763":["Caicos","M"],
-	"1002,6764":["Caicos","mM"],
-	"1002,6765":["Caicos","mM"],
-	"1002,6766":["Caicos","M"],
-	"1002,6767":["Caicos","M"],
-	"1002,6768":["Caicos","M"],
-	"1002,6770":["Caicos","M"],
-	"1002,6779":["Caicos","M"],
-	"1002,6880":["Cypress","mM"],
-	"1002,6888":["Cypress","M"],
-	"1002,6889":["Cypress","M"],
-	"1002,688A":["Cypress","M"],
-	"1002,688C":["Cypress","M"],
-	"1002,688D":["Cypress","M"],
-	"1002,6898":["Cypress","M"],
-	"1002,6899":["Cypress","M"],
-	"1002,689C":["Hemlock","M"],
-	"1002,689D":["Hemlock","M"],
-	"1002,689E":["Cypress","M"],
-	"1002,68A0":["Juniper","mM"],
-	"1002,68A1":["Juniper","mM"],
-	"1002,68A8":["Juniper","M"],
-	"1002,68A9":["Juniper","M"],
-	"1002,68B0":["Juniper","mM"],
-	"1002,68B8":["Juniper","M"],
-	"1002,68B9":["Juniper","M"],
-	"1002,68BE":["Juniper","M"],
-	"1002,68C0":["Redwood","mM"],
-	"1002,68C1":["Redwood","mM"],
-	"1002,68C7":["Redwood","mM"],
-	"1002,68C8":["Redwood","M"],
-	"1002,68C9":["Redwood","M"],
-	"1002,68D8":["Redwood","M"],
-	"1002,68D9":["Redwood","M"],
-	"1002,68DA":["Redwood","M"],
-	"1002,68DE":["Redwood","M"],
-	"1002,68E0":["Cedar","mM"],
-	"1002,68E1":["Cedar","mM"],
-	"1002,68E4":["Cedar","mM"],
-	"1002,68E5":["Cedar","mM"],
-	"1002,68E8":["Cedar","M"],
-	"1002,68E9":["Cedar","M"],
-	"1002,68F1":["Cedar","M"],
-	"1002,68F2":["Cedar","M"],
-	"1002,68F8":["Cedar","M"],
-	"1002,68F9":["Cedar","M"],
-	"1002,68FE":["Cedar","M"],
+	"1002,6720":["BARTS","mM"],
+	"1002,6721":["BARTS","mM"],
+	"1002,6722":["BARTS","M"],
+	"1002,6723":["BARTS","M"],
+	"1002,6724":["BARTS","mM"],
+	"1002,6725":["BARTS","mM"],
+	"1002,6726":["BARTS","M"],
+	"1002,6727":["BARTS","M"],
+	"1002,6728":["BARTS","M"],
+	"1002,6729":["BARTS","M"],
+	"1002,6738":["BARTS","M"],
+	"1002,6739":["BARTS","M"],
+	"1002,6740":["TURKS","mM"],
+	"1002,6741":["TURKS","mM"],
+	"1002,6742":["TURKS","mM"],
+	"1002,6743":["TURKS","mM"],
+	"1002,6744":["TURKS","mM"],
+	"1002,6745":["TURKS","mM"],
+	"1002,6746":["TURKS","M"],
+	"1002,6747":["TURKS","M"],
+	"1002,6748":["TURKS","M"],
+	"1002,6749":["TURKS","M"],
+	"1002,6750":["TURKS","M"],
+	"1002,6758":["TURKS","M"],
+	"1002,6759":["TURKS","M"],
+	"1002,6760":["CAICOS","mM"],
+	"1002,6761":["CAICOS","mM"],
+	"1002,6762":["CAICOS","M"],
+	"1002,6763":["CAICOS","M"],
+	"1002,6764":["CAICOS","mM"],
+	"1002,6765":["CAICOS","mM"],
+	"1002,6766":["CAICOS","M"],
+	"1002,6767":["CAICOS","M"],
+	"1002,6768":["CAICOS","M"],
+	"1002,6770":["CAICOS","M"],
+	"1002,6779":["CAICOS","M"],
+	"1002,6880":["CYPRESS","mM"],
+	"1002,6888":["CYPRESS","M"],
+	"1002,6889":["CYPRESS","M"],
+	"1002,688A":["CYPRESS","M"],
+	"1002,688C":["CYPRESS","M"],
+	"1002,688D":["CYPRESS","M"],
+	"1002,6898":["CYPRESS","M"],
+	"1002,6899":["CYPRESS","M"],
+	"1002,689C":["HEMLOCK","M"],
+	"1002,689D":["HEMLOCK","M"],
+	"1002,689E":["CYPRESS","M"],
+	"1002,68A0":["JUNIPER","mM"],
+	"1002,68A1":["JUNIPER","mM"],
+	"1002,68A8":["JUNIPER","M"],
+	"1002,68A9":["JUNIPER","M"],
+	"1002,68B0":["JUNIPER","mM"],
+	"1002,68B8":["JUNIPER","M"],
+	"1002,68B9":["JUNIPER","M"],
+	"1002,68BE":["JUNIPER","M"],
+	"1002,68C0":["REDWOOD","mM"],
+	"1002,68C1":["REDWOOD","mM"],
+	"1002,68C7":["REDWOOD","mM"],
+	"1002,68C8":["REDWOOD","M"],
+	"1002,68C9":["REDWOOD","M"],
+	"1002,68D8":["REDWOOD","M"],
+	"1002,68D9":["REDWOOD","M"],
+	"1002,68DA":["REDWOOD","M"],
+	"1002,68DE":["REDWOOD","M"],
+	"1002,68E0":["CEDAR","mM"],
+	"1002,68E1":["CEDAR","mM"],
+	"1002,68E4":["CEDAR","mM"],
+	"1002,68E5":["CEDAR","mM"],
+	"1002,68E8":["CEDAR","M"],
+	"1002,68E9":["CEDAR","M"],
+	"1002,68F1":["CEDAR","M"],
+	"1002,68F2":["CEDAR","M"],
+	"1002,68F8":["CEDAR","M"],
+	"1002,68F9":["CEDAR","M"],
+	"1002,68FE":["CEDAR","M"],
 	"1002,7100":["R520","M"],
 	"1002,7101":["R520","mM"],
 	"1002,7102":["R520","mM"],
@@ -450,43 +450,43 @@
 	"1002,9713":["RS880","mMi"],
 	"1002,9714":["RS880","Mi"],
 	"1002,9715":["RS880","Mi"],
-	"1002,9802":["Palm","Mi"],
-	"1002,9803":["Palm","Mi"],
-	"1002,9804":["Palm","Mi"],
-	"1002,9805":["Palm","Mi"],
-	"102B,0520":["Mga_card_type_g200"],
-	"102B,0521":["Mga_card_type_g200"],
-	"102B,0525":["Mga_card_type_g400"],
-	"102B,2527":["Mga_card_type_g550"],
-	"1039,6330":["Sis_chip_315"],
-	"18CA,0040":["Sis_chip_315"],
-	"18CA,0042":["Sis_chip_315"],
-	"1106,3118":["Via_pro_group_a"],
-	"1106,3230":["Via_dx9_0"],
-	"1106,3157":["Via_pro_group_a"],
-	"5333,8A20":["S3_savage3d"],
-	"5333,8A21":["S3_savage3d"],
-	"5333,8A22":["S3_savage4"],
-	"5333,8A23":["S3_savage4"],
-	"5333,8C10":["S3_savage_mx"],
-	"5333,8C11":["S3_savage_mx"],
-	"5333,8C12":["S3_savage_mx"],
-	"5333,8C13":["S3_savage_mx"],
-	"5333,8C22":["S3_supersavage"],
-	"5333,8C24":["S3_supersavage"],
-	"5333,8C26":["S3_supersavage"],
-	"5333,8C2A":["S3_supersavage"],
-	"5333,8C2B":["S3_supersavage"],
-	"5333,8C2C":["S3_supersavage"],
-	"5333,8C2D":["S3_supersavage"],
-	"5333,8C2E":["S3_supersavage"],
-	"5333,8C2F":["S3_supersavage"],
-	"5333,8A25":["S3_prosavage"],
-	"5333,8A26":["S3_prosavage"],
-	"5333,8D01":["S3_twister"],
-	"5333,8D02":["S3_twister"],
-	"5333,8D03":["S3_prosavageddr"],
-	"5333,8D04":["S3_prosavageddr"],
+	"1002,9802":["PALM","Mi"],
+	"1002,9803":["PALM","Mi"],
+	"1002,9804":["PALM","Mi"],
+	"1002,9805":["PALM","Mi"],
+	"102B,0520":["MGA_CARD_TYPE_G200"],
+	"102B,0521":["MGA_CARD_TYPE_G200"],
+	"102B,0525":["MGA_CARD_TYPE_G400"],
+	"102B,2527":["MGA_CARD_TYPE_G550"],
+	"1039,6330":["SIS_CHIP_315"],
+	"18CA,0040":["SIS_CHIP_315"],
+	"18CA,0042":["SIS_CHIP_315"],
+	"1106,3118":["VIA_PRO_GROUP_A"],
+	"1106,3230":["VIA_DX9_0"],
+	"1106,3157":["VIA_PRO_GROUP_A"],
+	"5333,8A20":["S3_SAVAGE3D"],
+	"5333,8A21":["S3_SAVAGE3D"],
+	"5333,8A22":["S3_SAVAGE4"],
+	"5333,8A23":["S3_SAVAGE4"],
+	"5333,8C10":["S3_SAVAGE_MX"],
+	"5333,8C11":["S3_SAVAGE_MX"],
+	"5333,8C12":["S3_SAVAGE_MX"],
+	"5333,8C13":["S3_SAVAGE_MX"],
+	"5333,8C22":["S3_SUPERSAVAGE"],
+	"5333,8C24":["S3_SUPERSAVAGE"],
+	"5333,8C26":["S3_SUPERSAVAGE"],
+	"5333,8C2A":["S3_SUPERSAVAGE"],
+	"5333,8C2B":["S3_SUPERSAVAGE"],
+	"5333,8C2C":["S3_SUPERSAVAGE"],
+	"5333,8C2D":["S3_SUPERSAVAGE"],
+	"5333,8C2E":["S3_SUPERSAVAGE"],
+	"5333,8C2F":["S3_SUPERSAVAGE"],
+	"5333,8A25":["S3_PROSAVAGE"],
+	"5333,8A26":["S3_PROSAVAGE"],
+	"5333,8D01":["S3_TWISTER"],
+	"5333,8D02":["S3_TWISTER"],
+	"5333,8D03":["S3_PROSAVAGEDDR"],
+	"5333,8D04":["S3_PROSAVAGEDDR"],
     "8086,7800":["Auburn"],
     "8086,7120":["Whitney"],
     "8086,7121":["Whitney"],
diff --git a/data/lib/cssUtils.js b/data/lib/cssUtils.js
deleted file mode 100644
index da24aa2..0000000
--- a/data/lib/cssUtils.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*global console: false */
-/*jslint onevar: false */
-// Released under the MIT/X11 license
-// http://www.opensource.org/licenses/mit-license.php
-"use strict";
-
-/**
- * get CSS style from all styles in the document with given name
- *
- * @param ruleName String with the identificator of the rule (the same
- *         used on the page itself)
- * @param deleteFlag ???
- * @return ??? (exact type of the object returned FIXME)
- *
- * e.g., getCSSRule(".tramp") gives particular style
- * from http://www.hunlock.com/blogs/Totally_Pwn_CSS_with_Javascript
- */
-var getCSSRule = exports.getCSSRule = function getCSSRule(ruleName, deleteFlag) {
-    ruleName=ruleName.toLowerCase(); // style rules are case insensitive
-    var foundRuleIdx = 0;
-    
-    Array.forEach(document.styleSheets, function (sheet) {
-        var ruleIdx = 0;
-        foundRule = Array.reduce(sheet.cssRules, function (ruleIdx, curRule, idx) {
-            if ((foundRuleIdx === 0) && (curRule.
-                    selectorText.toLowerCase() == ruleName)) {
-                return idx;
-            }
-            return foundRuleIdx;
-        });
-        if (foundRules > 0) {
-            if (deleteFlag === "delete") {
-                sheet.deleteRule(foundRuleIdx);
-                return true;
-            }
-            return sheet.cssRules[foundRuleIdx];
-        }
-    });
-    return false; // we found NOTHING!
-};
-    
-/**
- *
- */
-exports.killCSSRule = function killCSSRule (ruleName) {
-    return getCSSRule(ruleName, "delete");
-};
-
-/**
- *
- */
-exports.addCSSRule = function addCSSRule(ruleName, stylesheetTitle) {
-    var sheets = {};
-    if (!getCSSRule(ruleName)) {
-        if (stylesheetTitle) {
-            sheets = Array.filter(document.styleSheets,function (sheet) {
-                return (sheet.title === stylesheetTitle);
-            });
-        } else {
-            sheets = document.styleSheets;
-        }
-        sheets[0].insertRule(ruleName+' { }', 0);
-    }
-    return getCSSRule(ruleName);
-};
-
-/**
- *
- */
-exports.addCSSStylesheet = function addCSSStylesheet (StylesheetName) {
-    var cssNode = document.createElement("style");
-    cssNode.type = 'text/css';
-    cssNode.rel = 'stylesheet';
-    cssNode.media = 'screen';
-    cssNode.title = StylesheetName;
-    document.getElementsByTagName("head")[0].appendChild(cssNode);
-};
diff --git a/data/lib/rhbzpage.js b/data/lib/rhbzpage.js
index 026e7ac..8d52174 100644
--- a/data/lib/rhbzpage.js
+++ b/data/lib/rhbzpage.js
@@ -19,16 +19,30 @@ var RawhideColor = new Color(0, 119, 0); // or "green", or RGB 0, 119, 0, or
 // 120, 0, 23
 var RHITColor = new Color(102, 0, 102); // RGB 102, 0, 102; HSL 300, 0, 20
 
+// [   126.386] (--) NOUVEAU(0): Chipset: "NVIDIA NVaf"
 var logAnalyzeLogic = {
     "AnalyzeInterestingLine": {
-        "re": "^\\[[ .0-9]+\\]\\s*\\(--\\) PCI:\\*\\([0-9:]+\\)\\s*" +
-            "([0-9a-f:]+).*$",
-        "func": chipsetMagic
+    /*
+    [   126.378] (--) PCI:*(0:4:0:0) 10de:08a0:106b:00c2 rev 162, Mem @ 0xd2000000/16777216, \
+    0xc0000000/268435456, 0xd0000000/33554432, I/O @ 0x00001000/128, BIOS @ 0x????????/131072
+    */
+        re: [
+            "^\\[[ .0-9]+\\]\\s*\\(--\\) PCI:\\*\\([0-9:]+\\)\\s*" +
+                "([0-9a-f:]+).*$",
+            "^\\s*\\[?[ 0-9.]*\\]?\\s*\\(--\\) "+
+                "([A-Za-z]+)\\([0-9]?\\): Chipset: (.*)$",
+              ],
+        func: chipsetMagic
     },
+    /*
+    [   126.385] (WW) Falling back to old probe method for vesa
+    [   126.385] (WW) Falling back to old probe method for fbdev
+    [   126.386] (--) NOUVEAU(0): Chipset: "NVIDIA NVaf"
+    Backtrace:
+    */
     "AnalyzeXorgLogBacktrace": {
-        "re": "^\\s*(\\[[0-9 .]*\\])?\\s*(\\((EE|WW)\\)|.*"+
-            " [cC]hipsets?: )|\\s*Backtrace",
-        "func": analyzeXorg
+        re: "^\\s*(\\[[0-9 .]*\\])?\\s*(\\((EE|WW)\\)|.* [cC]hipset:.*)|\\s*Backtrace",
+        func: analyzeXorg
     }
 };
 
@@ -540,25 +554,33 @@ function addCheckXorgLogLink(attList) {
  * Given line to be parsed, find out which chipset it is and fill in the
  * whiteboard
  *
- * @param iLine String with the whole unparsed "interesting line"
+ * @param PCIidArrObj object with two fields
+ *        id Array manufacturer-ID and product-ID (PCI IDs)
+ *        chipsetLine RE
  * @param driverStr String with the driver name
  * @return None
  */
-function fillInWhiteBoard(PCIidArr) {
+function fillInWhiteBoard(PCIidArrObj) {
     var outStr = "";
     var cardIDStr = "";
     var cardIDArr = [];
     var cardName = "";
-    var PCIid = (PCIidArr[0] + "," + PCIidArr[1]).toUpperCase();
+    var PCIid = (PCIidArrObj.id[0] + "," + PCIidArrObj.id[1]).toUpperCase();
 
-    try {
-        cardName = constantData.chipNames[PCIid][0];
-    } catch (e if e instanceof TypeError)  {
-        alert("PCI ID " + PCIid + " is not known!");
-        return ; // early termination
-    } catch (e) {
-        throw e;
+    if (PCIidArrObj.id[0].toLowerCase() == "10de") {
+        cardName = PCIidArrObj.chipsetLine[2].replace(/\s*nvidia\s*/ig,"").
+            replace('"','','g');
+    } else {
+        try {
+            cardName = constantData.chipNames[PCIid][0];
+        } catch (e if e instanceof TypeError)  {
+            alert("PCI ID " + PCIid + " is not known!");
+            return ; // early termination
+        } catch (e) {
+            throw e;
+        }
     }
+
     clickMouse("editme_action");
     var titleElem = document.getElementById('short_desc');
     titleElem.value = '[' + cardName + ']\u00A0' + titleElem.value;
@@ -579,14 +601,16 @@ function fillInChipMagic(XlogID) {
 
 function chipsetMagic (interestingLineArr) {
     // parse Xorg.0.log
-    var RE = new RegExp(logAnalyzeLogic['AnalyzeInterestingLine'].re);
     if (interestingLineArr.length >0) {
-        var interestingArray = RE.exec(interestingLineArr[0]);
+        var interestingArray = interestingLineArr[0];
         if (interestingArray.length > 1) {
             var interestingPCIID = interestingArray[1].trim().split(":");
             createNewButton("short_desc_nonedit_display", false, {
                 "name": "Fill In",
-                "chipMagic": interestingPCIID,
+                "chipMagic": {
+                    "id": interestingPCIID,
+                    "chipsetLine": interestingLineArr[1]
+                },
             });
         }
     }
@@ -594,21 +618,20 @@ function chipsetMagic (interestingLineArr) {
 
 function analyzeXorg(results) {
     var innerString = "";
-    results = removeDuplicates(results);
-    // Remove headers
-    if (results.length >= 1) {
-        results.splice(0, 1);
-    }
+
     if (results.length > 0) {
-        results.forEach(function(l) {
-            innerString += l + "<br>\n";
+        results.splice(0, 1); // remove headers
+        results.sort();
+
+        results.forEach(function(lRE) {
+            innerString += lRE.input + "<br>\n";
         });
-        // Add a summary
         innerString += "----------<br>\n" +
             results.length + " interesting lines found.";
     } else {
         innerString += "No matching lines found!";
     }
+
     postMessage(new Message("OpenStringInPanel",
         '<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">' +
         "<html><head><title>Xorg.0.log analysis</title></head><body><pre>\n" +
@@ -624,11 +647,24 @@ function analyzeXorgLog(attachID, backMsg) {
 }
 
 function findInterestingLine(wholeLog, backMsg) {
-    var RE = new RegExp(logAnalyzeLogic[backMsg].re);
-    var results = wholeLog.split("\n").
-        filter(function(line) {
-            return (RE.test(line));
-    });
+    var REstr = logAnalyzeLogic[backMsg].re;
+    var REarr = [];
+    if (typeof REstr == "string") {
+        REarr = [new RegExp(REstr)];
+    } else if (Array.isArray(REstr)) {
+        REarr = REstr.map(function (reone) {
+            return new RegExp(reone);
+        });
+    }
+    var results = [];
+    wholeLog.split("\n").
+        forEach(function(line) {
+            REarr.forEach(function (re, reIdx) {
+                if (re.test(line)) {
+                    results.push(re.exec(line));
+                }
+            });
+        });
     logAnalyzeLogic[backMsg].func(results);
 }
 
diff --git a/lib/main.js b/lib/main.js
index ec94d1e..022244f 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -142,4 +142,4 @@ pageMod.PageMod({
     contentScriptFile: self.data.url("lib/skip-bug.js")
 });
 
-//tabs.open("https://bugzilla.redhat.com/show_bug.cgi?id=595017");
+// tabs.open("https://bugzilla.redhat.com/show_bug.cgi?id=679515");