diff --git a/include/PR/os_vi.h b/include/PR/os_vi.h
index 5a17f2587..53bf935c1 100644
--- a/include/PR/os_vi.h
+++ b/include/PR/os_vi.h
@@ -21,7 +21,7 @@
 
 /*---------------------------------------------------------------------*
         Copyright (C) 1998 Nintendo. (Originated by SGI)
-        
+
         $RCSfile: os_vi.h,v $
         $Revision: 1.1 $
         $Date: 1998/10/09 08:01:20 $
@@ -69,7 +69,7 @@ typedef struct {
 typedef struct {
     u32	origin;
     u32	yScale;
-    u32	vStart;	
+    u32	vStart;
     u32	vBurst;
     u32	vIntr;
 } OSViFieldRegs;
@@ -96,65 +96,10 @@ typedef struct {
 /*
  * Video Interface (VI) mode type
  */
-#define OS_VI_NTSC_LPN1		0	/* NTSC */
-#define OS_VI_NTSC_LPF1		1
-#define OS_VI_NTSC_LAN1		2
-#define OS_VI_NTSC_LAF1		3
-#define OS_VI_NTSC_LPN2		4
-#define OS_VI_NTSC_LPF2		5
-#define OS_VI_NTSC_LAN2		6
-#define OS_VI_NTSC_LAF2		7
-#define OS_VI_NTSC_HPN1		8
-#define OS_VI_NTSC_HPF1		9
-#define OS_VI_NTSC_HAN1		10
-#define OS_VI_NTSC_HAF1		11
-#define OS_VI_NTSC_HPN2		12
-#define OS_VI_NTSC_HPF2		13
-
-#define OS_VI_PAL_LPN1		14	/* PAL */
-#define OS_VI_PAL_LPF1		15
-#define OS_VI_PAL_LAN1		16
-#define OS_VI_PAL_LAF1		17
-#define OS_VI_PAL_LPN2		18
-#define OS_VI_PAL_LPF2		19
-#define OS_VI_PAL_LAN2		20
-#define OS_VI_PAL_LAF2		21
-#define OS_VI_PAL_HPN1		22
-#define OS_VI_PAL_HPF1		23
-#define OS_VI_PAL_HAN1		24
-#define OS_VI_PAL_HAF1		25
-#define OS_VI_PAL_HPN2		26
-#define OS_VI_PAL_HPF2		27
-
-#define OS_VI_MPAL_LPN1		28	/* MPAL - mainly Brazil */
-#define OS_VI_MPAL_LPF1		29
-#define OS_VI_MPAL_LAN1		30
-#define OS_VI_MPAL_LAF1		31
-#define OS_VI_MPAL_LPN2		32
-#define OS_VI_MPAL_LPF2		33
-#define OS_VI_MPAL_LAN2		34
-#define OS_VI_MPAL_LAF2		35
-#define OS_VI_MPAL_HPN1		36
-#define OS_VI_MPAL_HPF1		37
-#define OS_VI_MPAL_HAN1		38
-#define OS_VI_MPAL_HAF1		39
-#define OS_VI_MPAL_HPN2		40
-#define OS_VI_MPAL_HPF2		41
-
-#define OS_VI_FPAL_LPN1         42      /* FPAL - Full screen PAL */
-#define OS_VI_FPAL_LPF1         43
-#define OS_VI_FPAL_LAN1         44
-#define OS_VI_FPAL_LAF1         45
-#define OS_VI_FPAL_LPN2         46
-#define OS_VI_FPAL_LPF2         47
-#define OS_VI_FPAL_LAN2         48
-#define OS_VI_FPAL_LAF2         49
-#define OS_VI_FPAL_HPN1         50
-#define OS_VI_FPAL_HPF1         51
-#define OS_VI_FPAL_HAN1         52
-#define OS_VI_FPAL_HAF1         53
-#define OS_VI_FPAL_HPN2         54
-#define OS_VI_FPAL_HPF2         55
+#define OS_VI_NTSC_LAN1		0
+#define OS_VI_NTSC_HAF1		1
+#define OS_VI_MPAL_LAN1		2
+#define OS_VI_MPAL_HAF1		3
 
 /*
  * Video Interface (VI) special features
diff --git a/src/lib/ultra/io/vitbl.c b/src/lib/ultra/io/vitbl.c
index 55fb22fbf..71bc78dd7 100644
--- a/src/lib/ultra/io/vitbl.c
+++ b/src/lib/ultra/io/vitbl.c
@@ -3,75 +3,6 @@
 #include "viint.h"
 
 OSViMode osViModeTable[] = {
-	{OS_VI_NTSC_LPN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(525),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),        //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),        //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_NTSC_LPF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(35, 509),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
 	{OS_VI_NTSC_LAN1, //type
 		{
 			//comRegs
@@ -107,284 +38,6 @@ OSViMode osViModeTable[] = {
 				BURST(4, 2, 14, 0), //vBurst
 				VINTR(2),           //vIntr
 			}}},
-	{OS_VI_NTSC_LAF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(35, 509),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_NTSC_LPN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_ANTIALIAS_MODE_3 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(525),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_NTSC_LPF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(35, 509),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_NTSC_LAN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(525),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_NTSC_LAF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(35, 509),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_NTSC_HPN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(35, 509),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_NTSC_HPF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(640),           //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(35, 509),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_NTSC_HAN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(35, 509),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
 	{OS_VI_NTSC_HAF1, //type
 		{
 			//comRegs
@@ -420,632 +73,6 @@ OSViMode osViModeTable[] = {
 				BURST(4, 2, 14, 0), //vBurst
 				VINTR(2),           //vIntr
 			}}},
-	{OS_VI_NTSC_HPN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_3 |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(2560),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(35, 509),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(5120),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_NTSC_HPF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(640),           //width
-			BURST(57, 34, 5, 62), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3093, 0),       //hSync
-			LEAP(3093, 3093),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(2560),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(35, 509),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(5120),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_PAL_LPN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(625),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),         //origin
-				SCALE(1, 0),         //yScale
-				HSTART(95, 569),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),         //origin
-				SCALE(1, 0),         //yScale
-				HSTART(95, 569),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			}}},
-	{OS_VI_PAL_LPF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),         //origin
-				SCALE(1, 0.25),      //yScale
-				HSTART(93, 567),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),          //origin
-				SCALE(1, 0.75),       //yScale
-				HSTART(95, 569),      //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),             //vIntr
-			}}},
-	{OS_VI_PAL_LAN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_ANTIALIAS_MODE_1 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(625),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),         //origin
-				SCALE(1, 0),         //yScale
-				HSTART(95, 569),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),         //origin
-				SCALE(1, 0),         //yScale
-				HSTART(95, 569),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			}}},
-	{OS_VI_PAL_LAF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),         //origin
-				SCALE(1, 0.25),      //yScale
-				HSTART(93, 567),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),          //origin
-				SCALE(1, 0.75),       //yScale
-				HSTART(95, 569),      //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),             //vIntr
-			}}},
-	{OS_VI_PAL_LPN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_ANTIALIAS_MODE_3 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(625),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),        //origin
-				SCALE(1, 0),         //yScale
-				HSTART(95, 569),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),        //origin
-				SCALE(1, 0),         //yScale
-				HSTART(95, 569),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			}}},
-	{OS_VI_PAL_LPF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),        //origin
-				SCALE(1, 0.25),      //yScale
-				HSTART(93, 567),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),         //origin
-				SCALE(1, 0.75),       //yScale
-				HSTART(95, 569),      //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),             //vIntr
-			}}},
-	{OS_VI_PAL_LAN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(625),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),        //origin
-				SCALE(1, 0),         //yScale
-				HSTART(95, 569),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),        //origin
-				SCALE(1, 0),         //yScale
-				HSTART(95, 569),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			}}},
-	{OS_VI_PAL_LAF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),        //origin
-				SCALE(1, 0.25),      //yScale
-				HSTART(93, 567),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),         //origin
-				SCALE(1, 0.75),       //yScale
-				HSTART(95, 569),      //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),             //vIntr
-			}}},
-	{OS_VI_PAL_HPN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),        //origin
-				SCALE(1, 0),         //yScale
-				HSTART(93, 567),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),         //origin
-				SCALE(1, 0),          //yScale
-				HSTART(95, 569),      //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),             //vIntr
-			}}},
-	{OS_VI_PAL_HPF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(640),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),        //origin
-				SCALE(0.5, 0.5),     //yScale
-				HSTART(93, 567),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),         //origin
-				SCALE(0.5, 0.5),      //yScale
-				HSTART(95, 569),      //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),             //vIntr
-			}}},
-	{OS_VI_PAL_HAN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),        //origin
-				SCALE(1, 0),         //yScale
-				HSTART(93, 567),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),         //origin
-				SCALE(1, 0),          //yScale
-				HSTART(95, 569),      //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),             //vIntr
-			}}},
-	{OS_VI_PAL_HAF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(640),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),        //origin
-				SCALE(0.5, 0.5),     //yScale
-				HSTART(93, 567),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),         //origin
-				SCALE(0.5, 0.5),      //yScale
-				HSTART(95, 569),      //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),             //vIntr
-			}}},
-	{OS_VI_PAL_HPN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_3 |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(2560),        //origin
-				SCALE(1, 0),         //yScale
-				HSTART(93, 567),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(5120),         //origin
-				SCALE(1, 0),          //yScale
-				HSTART(95, 569),      //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),             //vIntr
-			}}},
-	{OS_VI_PAL_HPF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(640),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(2560),        //origin
-				SCALE(0.5, 0.5),     //yScale
-				HSTART(93, 567),     //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),            //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(5120),         //origin
-				SCALE(0.5, 0.5),      //yScale
-				HSTART(95, 569),      //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),             //vIntr
-			}}},
-	{OS_VI_MPAL_LPN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(525),           //vSync
-			HSYNC(3089, 4),       //hSync
-			LEAP(3097, 3098),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),        //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),        //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_MPAL_LPF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3088, 0),       //hSync
-			LEAP(3100, 3100),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(35, 509),    //vStart
-				BURST(2, 2, 11, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
 	{OS_VI_MPAL_LAN1, //type
 		{
 			//comRegs
@@ -1081,284 +108,6 @@ OSViMode osViModeTable[] = {
 				BURST(4, 2, 14, 0), //vBurst
 				VINTR(2),           //vIntr
 			}}},
-	{OS_VI_MPAL_LAF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3088, 0),       //hSync
-			LEAP(3100, 3100),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(35, 509),    //vStart
-				BURST(2, 2, 11, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_MPAL_LPN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_ANTIALIAS_MODE_3 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(525),           //vSync
-			HSYNC(3089, 4),       //hSync
-			LEAP(3097, 3098),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_MPAL_LPF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3088, 0),       //hSync
-			LEAP(3100, 3100),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(35, 509),    //vStart
-				BURST(2, 2, 11, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_MPAL_LAN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(525),           //vSync
-			HSYNC(3089, 4),       //hSync
-			LEAP(3097, 3098),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_MPAL_LAF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3088, 0),       //hSync
-			LEAP(3100, 3100),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(35, 509),    //vStart
-				BURST(2, 2, 11, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_MPAL_HPN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3088, 0),       //hSync
-			LEAP(3100, 3100),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(35, 509),    //vStart
-				BURST(2, 2, 11, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_MPAL_HPF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(640),           //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3088, 0),       //hSync
-			LEAP(3100, 3100),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(35, 509),    //vStart
-				BURST(2, 2, 11, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_MPAL_HAN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3088, 0),       //hSync
-			LEAP(3100, 3100),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(35, 509),    //vStart
-				BURST(2, 2, 11, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
 	{OS_VI_MPAL_HAF1, //type
 		{
 			//comRegs
@@ -1394,561 +143,4 @@ OSViMode osViModeTable[] = {
 				BURST(4, 2, 14, 0), //vBurst
 				VINTR(2),           //vIntr
 			}}},
-	{OS_VI_MPAL_HPN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_3 |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3088, 0),       //hSync
-			LEAP(3100, 3100),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(2560),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(35, 509),    //vStart
-				BURST(2, 2, 11, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(5120),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_MPAL_HPF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(640),           //width
-			BURST(57, 30, 5, 70), //burst
-			VSYNC(524),           //vSync
-			HSYNC(3088, 0),       //hSync
-			LEAP(3100, 3100),     //leap
-			HSTART(108, 748),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(2560),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(35, 509),    //vStart
-				BURST(2, 2, 11, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(5120),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(37, 511),    //vStart
-				BURST(4, 2, 14, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_LPN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(625),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),        //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(107, 2, 9, 0),//vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),        //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(107, 2, 9, 0),//vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_LPF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),      //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(45, 615),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(47, 617),    //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_LAN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_ANTIALIAS_MODE_1 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(625),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),        //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),        //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_LAF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(45, 615),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(640),        //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(47, 617),    //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_LPN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_ANTIALIAS_MODE_3 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(625),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_LPF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(45, 615),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(47, 617),    //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_LAN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(625),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_LAF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(320),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(2, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.25),     //yScale
-				HSTART(45, 615),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0.75),     //yScale
-				HSTART(47, 617),    //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_HPN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(45, 615),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_HPF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(640),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(45, 615),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(47, 617),    //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_HAN1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(45, 615),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_HAF1, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_16 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_DIVOT_ON |
-				VI_CTRL_SERRATE_ON |
-				0x3000,           //ctrl
-			WIDTH(640),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(1280),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(45, 615),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(2560),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(47, 617),    //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_HPN2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_3 |
-				0x3000,           //ctrl
-			WIDTH(1280),          //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(2560),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(45, 615),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(5120),       //origin
-				SCALE(1, 0),        //yScale
-				HSTART(47, 617),    //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
-	{OS_VI_FPAL_HPF2, //type
-		{
-			//comRegs
-			VI_CTRL_TYPE_32 |
-				VI_CTRL_GAMMA_DITHER_ON |
-				VI_CTRL_GAMMA_ON |
-				VI_CTRL_SERRATE_ON |
-				VI_CTRL_ANTIALIAS_MODE_2 |
-				0x3000,           //ctrl
-			WIDTH(640),           //width
-			BURST(58, 30, 4, 69), //burst
-			VSYNC(624),           //vSync
-			HSYNC(3177, 23),       //hSync
-			LEAP(3183, 3181),     //leap
-			HSTART(128, 768),     //hStart
-			SCALE(1, 0),          //xScale
-			VCURRENT(0),          //vCurrent
-		},
-		{//fldRegs
-			{
-				//[0]
-				ORIGIN(2560),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(45, 615),    //vStart
-				BURST(107, 2, 9, 0), //vBurst
-				VINTR(2),           //vIntr
-			},
-			{
-				//[1]
-				ORIGIN(5120),       //origin
-				SCALE(0.5, 0.5),    //yScale
-				HSTART(47, 617),    //vStart
-				BURST(105, 2, 13, 0), //vBurst
-				VINTR(2),           //vIntr
-			}}},
 };
diff --git a/src/lib/vi.c b/src/lib/vi.c
index b384e3259..f360e25d3 100644
--- a/src/lib/vi.c
+++ b/src/lib/vi.c
@@ -2202,18 +2202,10 @@ void viUpdateMode(void)
 
 	// 12c
 	if (g_ViBackData->mode == VIMODE_LO) {
-		if (g_ViIs16Bit) {
-			if (osTvType == OS_TV_MPAL) {
-				var8008dcc0[g_ViSlot] = osViModeTable[OS_VI_MPAL_LAN1];
-			} else {
-				var8008dcc0[g_ViSlot] = osViModeTable[OS_VI_NTSC_LAN1];
-			}
+		if (osTvType == OS_TV_MPAL) {
+			var8008dcc0[g_ViSlot] = osViModeTable[OS_VI_MPAL_LAN1];
 		} else {
-			if (osTvType == OS_TV_MPAL) {
-				var8008dcc0[g_ViSlot] = osViModeTable[OS_VI_MPAL_LAN2];
-			} else {
-				var8008dcc0[g_ViSlot] = osViModeTable[OS_VI_NTSC_LAN2];
-			}
+			var8008dcc0[g_ViSlot] = osViModeTable[OS_VI_NTSC_LAN1];
 		}
 
 		var8008dcc0[g_ViSlot].comRegs.width = g_ViBackData->bufx;