diff --git a/data/bank/gm2.tsv b/data/bank/gm2.tsv
index f52cb1c..0bc5782 100644
--- a/data/bank/gm2.tsv
+++ b/data/bank/gm2.tsv
@@ -6,7 +6,7 @@ MSB	PRG	LSB	NME
 000	004	000	ElPiano1
 000	005	000	ElPiano2
 000	006	000	Hrpschrd
-000	007	000	Clvichrd
+000	007	000	Clavinet
 000	008	000	Celesta
 000	009	000	Glocken
 000	010	000	MusicBox
@@ -171,7 +171,7 @@ MSB	PRG	LSB	NME
 121	006	001	Hpschrd3
 121	006	002	HpschrdK
 121	006	003	Hpschrd2
-121	007	000	Clvichrd
+121	007	000	Clavinet
 121	007	001	PlsClavi
 121	008	000	Celesta
 121	009	000	Glocken
diff --git a/data/bank/gs.tsv b/data/bank/gs.tsv
index ca94929..e323a42 100644
--- a/data/bank/gs.tsv
+++ b/data/bank/gs.tsv
@@ -54,8 +54,8 @@ LSB	PRG	MSB	NME
 000	006	016	Harpsi.w
 000	006	024	Harpsi.o
 003	006	032	SynHapsi
-000	007	000	Clvichrd
-004	007	001	Clvchrd2
+000	007	000	Clavinet
+004	007	001	Clvinet2
 004	007	002	AtkClavi
 004	007	003	AtkClv.2
 003	007	008	Comp Clv
diff --git a/data/bank/ns5r.tsv b/data/bank/ns5r.tsv
index ae0555c..9102706 100644
--- a/data/bank/ns5r.tsv
+++ b/data/bank/ns5r.tsv
@@ -6,7 +6,7 @@ MSB	PRG	LSB	NME	ELC
 000	004	000	ElPiano1	0
 000	005	000	ElPiano2	0
 000	006	000	Hrpschrd	0
-000	007	000	Clvichrd	0
+000	007	000	Clavinet	0
 000	008	000	Celesta	0
 000	009	000	Glocken	0
 000	010	000	MusicBox	0
@@ -134,7 +134,7 @@ MSB	PRG	LSB	NME	ELC
 056	004	000	New Tine	0
 056	005	000	Digi.Pno	0
 056	006	000	Hrpschrd	0
-056	007	000	Clvichrd	0
+056	007	000	Clavinet	0
 056	008	000	Celesta	0
 056	009	000	Glocken	0
 056	010	000	MusicBox	0
diff --git a/data/bank/sd.tsv b/data/bank/sd.tsv
index b191fc1..bda9739 100644
--- a/data/bank/sd.tsv
+++ b/data/bank/sd.tsv
@@ -116,7 +116,7 @@ MSB	PRG	LSB	NME
 099	006	017	EnCplHps
 099	006	018	EnhHpsiW
 099	006	019	EnhHpsiO
-096	007	016	Clvichrd
+096	007	016	Clavinet
 096	007	017	PlsClavi
 097	007	016	AtkClavi
 097	007	017	AnlClavi
@@ -264,7 +264,7 @@ MSB	PRG	LSB	NME
 097	025	017	12StrGt2
 097	025	018	Mandoln2
 097	025	019	Stl&Bdy2
-098	025	016	SteelGtr2
+098	025	016	SteelGt2
 098	025	017	12StrGt3
 098	025	018	Mandoln3
 098	025	019	Stl&Bdy3
diff --git a/data/bank/xg.tsv b/data/bank/xg.tsv
index 321688a..f2afe96 100644
--- a/data/bank/xg.tsv
+++ b/data/bank/xg.tsv
@@ -11,7 +11,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	000	068	MIDI Gr2		
 000	000	069	OldAcPno		
 000	000	112	LvGrdPno		
-000	000	125	GrandP #		3
+000	000	125	GrandP #	0	3
 000	001	000	BritePno	0	0
 000	001	001	BritPnoK	0	0
 000	001	003	StBrtPno		
@@ -23,7 +23,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	001	066	MIDI Gr3		
 000	001	067	MIDI Gr4		
 000	001	068	OldPiano		
-000	001	125	BriteP #		3
+000	001	125	BriteP #	0	3
 000	002	000	EGrndPno	1	0
 000	002	001	EGndPnoK	1	0
 000	002	032	Det.CP80	1	0
@@ -58,7 +58,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	004	080	Sine EP		
 000	004	081	Cheap EP		
 000	004	114	GalaxyEP		
-000	004	125	EPiano1#		3
+000	004	125	EPiano1#	1	3
 000	005	000	ElPiano2	1	0
 000	005	001	EPiano2K	0	0
 000	005	012	ChorEPDc		
@@ -95,7 +95,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	005	085	TinkrDX+		
 000	005	112	DXModern		
 000	005	113	HyprTine		
-000	005	125	EPiano2#		3
+000	005	125	EPiano2#	0	3
 000	006	000	Hrpschrd	0	0
 000	006	001	HpschrdK	0	0
 000	006	002	Hpschrd4		
@@ -105,8 +105,8 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	006	035	Hpschrd3	1	0
 000	006	040	ElecHpsi		
 000	006	064	SynHapsi		
-000	007	000	Clvichrd	0	0
-000	007	001	ClvchrdK	0	0
+000	007	000	Clavinet	0	0
+000	007	001	ClvinetK	0	0
 000	007	027	ClaviWah	1	1
 000	007	040	CosClavi		
 000	007	064	PulseClv	0	1
@@ -120,7 +120,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	007	072	HrdyPlk+		
 000	007	073	DblFMClv		
 000	007	074	RobotClv		
-000	007	125	Clavi. #		3
+000	007	125	Clavi. #	1	3
 000	008	000	Celesta	0	0
 000	008	064	FM Celst		
 000	009	000	Glocken	0	0
@@ -172,7 +172,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	016	079	Mood Org		
 000	016	112	JazzOrgn		
 000	016	116	BriteOrg		
-000	016	125	DrawOrg#		3
+000	016	125	DrawOrg#	1	3
 000	017	000	PercOrgn	0	0
 000	017	024	70sPcOrg	1	0
 000	017	032	DetPrcOr	1	0
@@ -191,7 +191,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	017	075	BeepOrgn		
 000	017	076	Belief		
 000	017	077	Snap Org		
-000	017	125	PercOrg#		3
+000	017	125	PercOrg#	1	3
 000	018	000	RockOrgn	1	0
 000	018	064	RotaryOr	1	0
 000	018	065	SlwRotar	1	0
@@ -200,7 +200,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	018	112	RockOrg*		
 000	018	117	CoolRotr		
 000	018	118	CoolOrgn		
-000	018	125	RockOrg#		3
+000	018	125	RockOrg#	1	3
 000	019	000	ChrchOrg	1	0
 000	019	032	ChurOrg3	1	0
 000	019	035	ChurOrg2	1	0
@@ -223,7 +223,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	023	064	TngoAcd2	1	0
 000	023	065	TightAcd		
 000	023	066	DetT.Acd		
-000	023	125	TngoAcd#		3
+000	023	125	TngoAcd#	1	3
 000	024	000	NylonGtr	0	0
 000	024	016	NylonGt2	0	1
 000	024	025	NylonGt3	1	1
@@ -235,7 +235,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	024	066	MelEspGt		
 000	024	067	DecayEsG		
 000	024	096	Ukulele	0	0
-000	024	125	NylonGt#		3
+000	024	125	NylonGt#	0	3
 000	025	000	SteelGtr	0	0
 000	025	016	SteelGt2	0	1
 000	025	032	SteelGDt		
@@ -248,7 +248,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	025	067	OldSampl		
 000	025	096	Mandolin	1	0
 000	025	097	MndolnEn		
-000	025	125	SteelGt#		3
+000	025	125	SteelGt#	0	3
 000	026	000	Jazz Gtr	0	0
 000	026	018	MelloGtr	0	1
 000	026	032	Jazz Amp	1	0
@@ -264,7 +264,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	026	071	NekRough		
 000	026	072	MidRough		
 000	026	096	PdlSteel	0	2
-000	026	125	JazzGtr#		3
+000	026	125	JazzGtr#	1	3
 000	027	000	CleanGtr	0	0
 000	027	032	ChorusGt	1	0
 000	027	033	ChorGtLt		
@@ -293,7 +293,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	028	067	Tin		
 000	028	068	GrvyMtGt		
 000	028	096	Mu.DstGt	1	2
-000	028	125	MutedGt#		3
+000	028	125	MutedGt#	1	3
 000	029	000	OvrDrvGt	0	0
 000	029	032	OvdrGtDt		
 000	029	040	Parallel		
@@ -302,7 +302,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	029	065	BriMnhtn		
 000	029	066	DetMnhtn		
 000	029	067	PwrMnhtn		
-000	029	125	Ovrdriv#		3
+000	029	125	Ovrdriv#	1	3
 000	030	000	Dist.Gtr	0	0
 000	030	012	DstRthmG	1	2
 000	030	024	DistGtr2	1	2
@@ -323,7 +323,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	030	069	Bombay		
 000	030	070	SusBmbay		
 000	030	071	Jaipur		
-000	030	125	Dist.Gt#		3
+000	030	125	Dist.Gt#	0	3
 000	031	000	GtrHarmo	0	0
 000	031	064	AcouHarm		
 000	031	065	GtFeedbk	0	0
@@ -340,7 +340,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	032	067	BrCoolth		
 000	032	096	WalkSyBa		
 000	032	097	Dim&Cool		
-000	032	125	Acou.Ba#		3
+000	032	125	Acou.Ba#	0	3
 000	033	000	FngrBass	0	0
 000	033	018	FingrDrk	1	0
 000	033	027	FlangrBa	1	1
@@ -355,7 +355,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	033	068	BlueBass		
 000	033	069	JazzyBa2		
 000	033	112	FW EBass	0	2
-000	033	125	FingrBa#		3
+000	033	125	FingrBa#	0	3
 000	034	000	PickBass	0	0
 000	034	006	PickBas2		
 000	034	028	M.PkBass	0	0
@@ -373,7 +373,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	035	067	NoizFret		
 000	035	096	SynFretl	1	1
 000	035	097	SmthFrtl	1	1
-000	035	125	Fretles#		3
+000	035	125	Fretles#	0	3
 000	036	000	SlapBass	0	0
 000	036	021	CosmSlap		
 000	036	027	ResoSlap	0	2
@@ -383,14 +383,14 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	036	066	GlitzSlp		
 000	036	067	FM Slap		
 000	036	068	DetFMSlp		
-000	036	125	SlapBas#		3
+000	036	125	SlapBas#	2	3
 000	037	000	SlapBas2	0	0
 000	037	016	BrtSlpSp		
 000	037	022	Wah Slap		
 000	037	043	VeloSlap	1	0
 000	037	068	Polak Is	1	4
 000	037	069	VeryCute	1	4
-000	037	125	SlapBa2#		3
+000	037	125	SlapBa2#	1	3
 000	038	000	SynBass1	0	0
 000	038	018	SynBs1Dk	0	1
 000	038	020	FastResB	0	1
@@ -473,7 +473,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	040	066	ViolinSc		
 000	040	067	HdVlnSec		
 000	040	068	SlVlnSec		
-000	040	125	Violin #		3
+000	040	125	Violin #	0	3
 000	041	000	Viola	0	0
 000	041	040	DblViola		
 000	041	064	Sonata		
@@ -495,7 +495,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	044	065	Det.Fear		
 000	044	066	Apoclyps		
 000	044	067	BrTrmStr		
-000	044	125	TremStr#		3
+000	044	125	TremStr#	0	3
 000	045	000	Pizz.Str	0	0
 000	045	035	PizzOcta		
 000	045	040	Sleep		
@@ -532,7 +532,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	048	075	3 OctStr		
 000	048	076	5PartStr		
 000	048	112	Strings*		
-000	048	125	Strngs1#		3
+000	048	125	Strngs1#	0	3
 000	049	000	Strings2	0	0
 000	049	003	StSlwStr	1	0
 000	049	008	LegatoSt	1	0
@@ -541,7 +541,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	049	064	70s Str	0	1
 000	049	065	Strings3	0	1
 000	049	112	ChmbrStr		
-000	049	125	Strngs2#		3
+000	049	125	Strngs2#	0	3
 000	050	000	Syn.Str1	1	0
 000	050	008	Memory		
 000	050	018	Zephyr		
@@ -634,7 +634,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	056	096	FlugelHr		
 000	056	097	Cornet		
 000	056	115	SwtTrp *		
-000	056	125	Trumpet#		3
+000	056	125	Trumpet#	0	3
 000	057	000	Trombone	0	0
 000	057	018	Trombon2	1	0
 000	057	064	BrtTromb		
@@ -645,7 +645,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	057	069	BrtBsTrb		
 000	057	070	HrdBsTrb		
 000	057	113	TromSect		
-000	057	125	Trombon#		3
+000	057	125	Trombon#	0	3
 000	058	000	Tuba	0	0
 000	058	016	Tuba 2	0	1
 000	058	064	HardTuba		
@@ -655,7 +655,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	059	040	Backyard		
 000	059	064	MuteTrp2		
 000	059	065	BakStair		
-000	059	125	MutedTp#		3
+000	059	125	MutedTp#	1	3
 000	060	000	FrchHorn	1	0
 000	060	006	FrHrSolo	0	0
 000	060	032	FrHorn 2	0	0
@@ -692,7 +692,7 @@ MSB	PRG	LSB	NME	ELC	LVL
 000	061	076	Alps		
 000	061	077	SymphBrs		
 000	061	078	Phoenix		
-000	061	125	BrsSect#		3
+000	061	125	BrsSect#	1	3
 000	062	000	SynBrass	1	0
 000	062	012	QuackBrs	1	1
 000	062	020	RezSynBr	1	0
diff --git a/data/bank/ymh.tsv b/data/bank/ymh.tsv
index 9f43943..6721461 100644
--- a/data/bank/ymh.tsv
+++ b/data/bank/ymh.tsv
@@ -130,7 +130,7 @@ MSB	LSB	PRG	NME
 057	113	000	Rock Pno
 057	113	001	ElPiano2
 057	113	002	ElPiano1
-057	113	003	Clvichrd
+057	113	003	Clavinet
 057	113	004	RockOrgn
 057	113	005	DrawOrgn
 057	113	006	HighStr.
@@ -166,7 +166,7 @@ MSB	LSB	PRG	NME
 057	114	005	ElPiano1
 057	114	006	ElPiano4
 057	114	007	ElPiano2
-057	114	008	Clvichrd
+057	114	008	Clavinet
 057	114	009	Glocken
 057	114	010	MusicBox
 057	114	011	Vibrafon
diff --git a/data/bitmaps/sc/voices.tsv b/data/bitmaps/sc/voices.tsv
index 18e5af8..ae3c020 100644
--- a/data/bitmaps/sc/voices.tsv
+++ b/data/bitmaps/sc/voices.tsv
@@ -6,7 +6,7 @@ HnkyTonk	@EGrndPno
 ElPiano1	0028002000000000000010000000003c000000007f30000000fffc000001feff0000037dffc000059f3fe0000c67cfe0000f19f1c0000fc67cdc000bf19f3f0008fc67ffc0085f19ffc00887c67ec00901f19fc00a007c7bc00c001f3740080003fe40080060fc400000e03c400000c0134000010010c000000010c000000011000000001200000000140000000018000000001000000000100000000000000000000000
 ElPiano2	00280020000000000000006000000000fc0000000fff0000001dffc000003f3fe000007fcfe00003fff1c000073ffcd8000707ff3e0007e1ffffc006fc7fff60067e1fbde0067fc3f7e0067ff07fe0067ffc3fe0067c7f3fe0067c4ff9e0067c49f1e006784871e00660e871e00680f871e00701f871e006007871e000002071e000000071c0000000718000000071000000007200000000740000000078000000007000
 Hrpschrd	002800200000078000000007f00000000f700000000f780000001f780000001fbe0000003fbf8000003fbffc00007fdffe00007fdfff0000555555007fffdfff007dffefaf005effeeff006f7febff0077bfeffa007b003fe2003dffff02fc3efffc02be2ffff802df27fff002eca3fff002bfa1ffe0029fa108400294a108400294a1084000948100400010810040001081004000108100400000010040000001004000
-Clvichrd	002800200000000000000000000000000000000000000000c000000003c000000003ffffffffffffffffffffffffffffffc300000001ffffffffffc300000001ffffffffffc354a54a55ff54a54a55ef54a54a55ef54a54a55c754a54a55ef00000001ffffffffffffffffffffc000000003c000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+Clavinet	002800200000000000000000000000000000000000000000c000000003c000000003ffffffffffffffffffffffffffffffc300000001ffffffffffc300000001ffffffffffc354a54a55ff54a54a55ef54a54a55ef54a54a55c754a54a55ef00000001ffffffffffffffffffffc000000003c000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 Celesta	00280020001c00000000270000000059c0000000de70000001bf8e000003bff3800007fffce0000f3fff38001e1fffc6002703fff90028c0fffdc02e703ffdc02f0c0ffba02f6381fb602f78607ea02f7f1c19202f7fc31aa02f7ff8f5a02f7ffc3ba0337ffd17a00c7ffdd7a0033ffdd7a000c7fdd7a00030fdd7a0000c7dd7a0001f0dd7a0001cc1d740001839d6800000065500000001920000000074000000001800
 Glocken	00280020015f800000023bf0000004777c00000aeee7c00011ddd1f8002dbb87bc005c374773c0bb861ee8f877601dc3deeeee1bc3bbddddc33777bbbbb80eee7777770dddc6eeeee1b8f81ddddc343f83bbbb8003f8377771007f86eeeb0037f01dc70030ff83af00186ff81a000fee3fe400038e03f800600e003000600e180000800e180001000e040002000e020004000e010008000e008010000e004020000e0020
 MusicBox	00280020000000000000000000000100000000020000000034000000003800000000000000000020807fffc020808000a02081ffff9020838ffe88e081cfff48c080e7ffa8038077ffd8031e3fffe800081ffff800040800081f020ffff01106300008110648001811008760283301298848660213e4980003ffff280002aaab4800035555880001ffff08000100011000017ffd2000017ffd4000010001800001ffff00
diff --git a/data/bitmaps/xg/voices.tsv b/data/bitmaps/xg/voices.tsv
index 71f9a65..78a51c7 100644
--- a/data/bitmaps/xg/voices.tsv
+++ b/data/bitmaps/xg/voices.tsv
@@ -10,7 +10,7 @@ BotlBlow	000000000000000001fe023b05ffffffffffffff07ff03ff01fe000000000000
 BrthNoiz	01000380038013800b800380318003800900110006c00ee01ef01ff01ff01ff0
 Clarinet	000000000000000000010aa7755fdfffffff7f7f208700010000000000000000
 Celesta	7ffe6aaa7ffe7ffe54aa54aa4002ffffffff6aaa55566aaa55566aaabffdbffd
-Clvichrd	7ffe7ffe555e555e401e7ffe7ffe200420042004200420043ffc200420042004
+Clavinet	7ffe7ffe555e555e401e7ffe7ffe200420042004200420043ffc200420042004
 DrawOrgn	07e007e07ffe7ffe7ffe7ffe54aa54aa40027ffe7ffe6a0a55566a4a55567ffe
 EGrndPno	1e003f003f807fe07ffc7ffe7ffe7ffe7ffe7ffe7ffe54aa54aa40027ffe7ffe
 ElPiano1	7ffe7ffe54aa54aa40027ffe7ffe4002400240024002400240027ffe7ffe4142
diff --git a/data/map/gs.10.tsv b/data/map/gs.10.tsv
index af85945..19cc1c3 100644
--- a/data/map/gs.10.tsv
+++ b/data/map/gs.10.tsv
@@ -1,4 +1,6 @@
 ID	Name
+Clvchrd2	Clavi. 2
+Clvinet2	Clavi. 2
 Uprt.Pno	UprightPno
 Mild Pno	Mild Piano
 UprtP. w	UprtPno. w
@@ -41,7 +43,6 @@ CplHapsi	CoupleHpsi
 Harpsi.w	Harpsi. w
 Harpsi.o	Harpsi. o
 SynHapsi	Syn.Harpsi
-Clvchrd2	Clavi. 2
 AtkClavi	Atk Clavi.
 AtkClv.2	AtkClavi 2
 Comp Clv	Comp Clav.
@@ -54,6 +55,7 @@ SyRngClv	SynRingClv
 SyDstClv	SynDistClv
 JP8k Clv	JP8000 Clv
 PulseClv	Pulse Clv.
+Clavi. o	Clavinet o
 PopCelst	Pop Celest
 MusicBx2	MusicBox 2
 St.MusBx	StMusicBox
diff --git a/data/map/gs.12.tsv b/data/map/gs.12.tsv
index 8c72ffa..7edafc8 100644
--- a/data/map/gs.12.tsv
+++ b/data/map/gs.12.tsv
@@ -35,7 +35,6 @@ AtkClv.2	Atk. Clavi 2
 Comp Clv	Comp Clavi.
 Reso Clv	Reso Clavi.
 PhaseClv	Phase Clavi.
-Clavi. o	Clavichord o
 AnaClavi	Analog Clav.
 JP8 Clv1	JP8 Clav. 1
 JP8 Clv2	JP8 Clav. 2
diff --git a/data/map/gs.24.tsv b/data/map/gs.24.tsv
index 07509c0..1f112db 100644
--- a/data/map/gs.24.tsv
+++ b/data/map/gs.24.tsv
@@ -25,18 +25,19 @@ CplHapsi	Coupled Harpsichord
 Harpsi.w	Harpsichord (wide)
 Harpsi.o	Harpsichord (open)
 SynHapsi	Synth Harpsichord
-AtkClavi	Attack Clavichord
-AtkClv.2	Attack Clavichord 2
-Comp Clv	Compression Clavichord
-Reso Clv	Resonant Clavichord
-PhaseClv	Phase Clavichord
-AnaClavi	Analog Clavichord
-JP8 Clv1	JP8 Clavichord 1
-JP8 Clv2	JP8 Clavichord 2
-SyRngClv	Synth Ring Clavi.
+AtkClavi	Attack Clavinet
+AtkClv.2	Attack Clavinet 2
+Comp Clv	Compression Clavinet
+Reso Clv	Resonant Clavinet
+PhaseClv	Phased Clavinet
+AnaClavi	Analog Clavinet
+JP8 Clv1	JP8 Clavinet 1
+JP8 Clv2	JP8 Clavinet 2
+SyRngClv	Synth Ring Clavinet
 SyDstClv	Synth Distorted Clavi.
-JP8k Clv	JP8000 Clavichord
-PulseClv	Pulse Clavichord
+JP8k Clv	JP8000 Clavinet
+PulseClv	Pulse Clavinet
+Clavi. o	Clavinet (open)
 St.MusBx	Stereo Music Box
 HardVibr	Hard Vibraphone
 Pop Vibr	Pop Vibraphone
diff --git a/data/map/sd.10.tsv b/data/map/sd.10.tsv
index fa3cbad..11823a1 100644
--- a/data/map/sd.10.tsv
+++ b/data/map/sd.10.tsv
@@ -13,42 +13,91 @@ Amb.Jazz	AmbJazzKit
 SBrushKt	StBrushKit
 AmbBrush	AmbBrushKt
 GrndPnoW	Piano 1 w
+GrndPnoD	Piano 1 d
+Acou.Pno	Acou.Piano
+AcouPnoW	Acou.Pno w
+Mild Pno	Mild Piano
 St.Pno 1	St.Piano 1
 St.Pno1W	St.Piano1w
+EuropePf	Europe Pno
+SDPianoW	SD Piano w
+Class Pf	Classic Pf
+BritPnoW	BritePno w
+Rock Pno	Rock Piano
+RockPnoW	Rock Pno w
 St.Pno 2	St.Piano 2
+St.Pno2W	St.Piano2w
+EnhPiano	Enh. Piano
+Enh.PnoW	EnhPiano w
+EGndPnoW	EGrndPno w
+EGrdPno2	
 SftRhode	SoftRhodes
 FatRhode	Fat Rhodes
+TrmRhode	
+Stage 73	
+Phs.Dyno	
+StCplHps	
+AtkClv 2	
 St.Glock	St.Glocken
 Tone Whl	Tone Wheel
 RokrSpin	RockerSpin
 StHrmnca	StHarmnica
 NylnGtr2	NylonGtr 2
+SteelGt2	
 JazzGtr3	Jazz Gtr 3
+LdJazGtr	
+Strat2Rr	
 FdbkGtr2	FeedbkGtr2
+MtDstGtr	
+HeavyDsG	
 FatAcBas	FatAco.Bas
+EnhAcBas	
 FngrPkBa	FingrPikBa
 JazzBass	Jazz Bass
+PhsFrtls	
 SlapPop1	SlapPopBa1
 FatSynBa	FatSynthBa
+SynSawBa	
+JpSawRbr	
 Violin2V	Violin 2v
+EnhVioln	
 StTrmStr	StTremStrs
+St.Pizz	
 St. Harp	StereoHarp
 St.Strs2	StStrings2
+StSlStr2	
+StkSyStr	
+StSmlAah	
+BassHit2	
 Solo Trp	SoloTrumpt
 RmntcTrp	RomanticTp
+EnhTrmpt	
 TrombonV	Trombone v
 EnMuteTp	EnhMutedTp
 StFrHorn	St.Fr.Horn
 StBigBrs	StBigBrass
+SpJPBrs2	
+BrthAlto	
 AltoSaxV	Alto Sax v
 BrthTenr	BrthyTenor
 BlowTenr	BlownTenor
 BareBari	Bare Bari.
+BariSaxV	
 ClasOboe	Class.Oboe
 Enh.Oboe	EnhnceOboe
 BrtClari	BriteClari
 JzClari2	JazzClari2
 RecordrV	Recorder v
+FatSqrLd	
 FatSawSl	FatSawSolo
+DelaySeq	
+FlngrSaw	
+FatSawLd	
+LdCaliop	
 ChiffLd3	ChifferLd3
-ChoirPd2	ChoirPad 2
\ No newline at end of file
+SuffleLd	
+ChoirPd2	ChoirPad 2
+Brt.Star	
+Goblins2	
+Goblins3	
+St.Sitar	
\ No newline at end of file
diff --git a/data/map/xg.10.tsv b/data/map/xg.10.tsv
index d8882cf..f7128f7 100644
--- a/data/map/xg.10.tsv
+++ b/data/map/xg.10.tsv
@@ -1,5 +1,6 @@
 ID	Name
-Str Slap	StringSlap
+ClvchrdK	ClvichordK
+ClvinetK	Clavinet K
 GrndPnoK	GrndPianoK
 MelloGrP	MelloGrPno
 PianoStr	PianoStrng
@@ -36,12 +37,11 @@ EPiano2#	El.Piano2#
 HpschrdK	HrpsichrdK
 Hpschrd2	Hrpsichrd2
 Hpschrd3	Hrpsichrd3
-ClvchrdK	ClvichordK
 ClaviWah	ClvchrdWah
 PulseClv	PulseClavi
 PiercClv	PierceClav
 SupClavi	SuperClavi
-Clavi. #	Clavichrd#
+Clavi. #	Clavinet #
 FM Celst	FM Celesta
 S. Orgel	SmallOrgel
 VibrafnK	VibrafoneK
@@ -545,6 +545,7 @@ Glocken+	Glocken +
 CutNoise	Cut Noise
 CutNoiz2	CutNoise 2
 DstCutNz	DstCutNoiz
+Str.Slap	StringSlap
 B.Slide	Bass Slide
 P.Scrape	PickScrape
 Fl.KClik	FltKyClick
diff --git a/data/map/xg.12.tsv b/data/map/xg.12.tsv
index 42c94f9..a8faeee 100644
--- a/data/map/xg.12.tsv
+++ b/data/map/xg.12.tsv
@@ -1,4 +1,6 @@
 ID	Name
+ClvchrdK	Clavichord K
+ClvinetK	Clavinet K.
 GrndPnoK	GrandPiano K
 MelloGrP	MellowGrdPno
 PianoStr	PianoStrings
@@ -32,12 +34,11 @@ EPiano2#	El. Piano 2#
 HpschrdK	HarpsichordK
 Hpschrd2	Harpsichord2
 Hpschrd3	Harpsichord3
-ClvchrdK	Clavichord K
-ClaviWah	Wah Clvichrd
+ClaviWah	Wah Clavinet
 PulseClv	Pulse Clavi.
 PiercClv	Pierce Clavi
 SupClavi	Super Clavi.
-Clavi. #	Clavichord #
+Clavi. #	Clavinet   #
 S. Orgel	Small Orgel
 VibrafnK	Vibraphone K
 HardVibr	HardVibrafon
diff --git a/data/map/xg.24.tsv b/data/map/xg.24.tsv
index 5acbcb4..85f68a2 100644
--- a/data/map/xg.24.tsv
+++ b/data/map/xg.24.tsv
@@ -1,4 +1,6 @@
 ID	Name
+ClvchrdK	Clavichord KSP
+ClvinetK	Clavinet KSP
 GrndPnoK	Grand Piano KSP
 MelloGrP	Mellow Grand Piano
 PianoStr	Piano + Strings
@@ -24,11 +26,11 @@ EPiano2#	Electric Piano 2 #
 HpschrdK	Harpsichord KSP
 Hpschrd2	Harpsichord 2
 Hpschrd3	Harpsichord 3
-ClvchrdK	Clavichord KSP
-ClaviWah	Wah Clavichord
-PulseClv	Pulse Clavichord
-PiercClv	Pierce Clavichord
-SupClavi	Super Clavichord
+ClaviWah	Wah Clavinet
+PulseClv	Pulse Clavinet
+PiercClv	Pierce Clavinet
+SupClavi	Super Clavinet
+Clavi. #	Clavinet #
 VibrafnK	Vibraphone KSP
 HardVibr	Hard Vibraphone
 DetDrwOr	Detuned Drawbar Organ
@@ -67,7 +69,7 @@ Nashvill	Nashville Guitar
 OldSampl	Old Sample Guitar
 SteelGt#	Steel Guitar #
 MelloGtr	Mellow Guitar
-Jazz Amp	Jazz Guitar Amp
+Jazz Amp	Amped Jazz Guitar
 MidSJazz	Mid. Super Jazz Guitar
 NekRough	Roughcaster Neck
 JazzGtr#	Jazz Guitar #
diff --git a/src/cambiare_demo/index.js b/src/cambiare_demo/index.js
index 17399d5..5351e5f 100644
--- a/src/cambiare_demo/index.js
+++ b/src/cambiare_demo/index.js
@@ -367,3 +367,4 @@ getBridge().addEventListener("message", function (ev) {
 
 Alpine.start();
 self.visualizer = visualizer;
+self.gOpenLni();