diff --git a/src/win32/MainWnd.cpp b/src/win32/MainWnd.cpp
index cf7b01fa..597f58db 100644
--- a/src/win32/MainWnd.cpp
+++ b/src/win32/MainWnd.cpp
@@ -167,8 +167,6 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd)
   ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_RENDEROPTIONS_GLNEAREST, OnUpdateOptionsVideoRenderoptionsGlnearest)
   ON_COMMAND(ID_OPTIONS_VIDEO_RENDEROPTIONS_GLBILINEAR, OnOptionsVideoRenderoptionsGlbilinear)
   ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_RENDEROPTIONS_GLBILINEAR, OnUpdateOptionsVideoRenderoptionsGlbilinear)
-  ON_COMMAND(ID_OPTIONS_VIDEO_RENDEROPTIONS_GLSLSHADERS, OnOptionsVideoRenderingoptionsGLSLShaders)
-  ON_UPDATE_COMMAND_UI(ID_OPTIONS_VIDEO_RENDEROPTIONS_GLSLSHADERS, OnUpdateOptionsVideoRenderingoptionsGLSLShaders)
 
   ON_WM_CONTEXTMENU()
   ON_COMMAND(ID_OPTIONS_EMULATOR_ASSOCIATE, OnOptionsEmulatorAssociate)
diff --git a/src/win32/MainWnd.h b/src/win32/MainWnd.h
index 08c60658..472fb8ba 100644
--- a/src/win32/MainWnd.h
+++ b/src/win32/MainWnd.h
@@ -192,14 +192,6 @@ class MainWnd : public CWnd
   afx_msg void OnUpdateOptionsVideoRenderoptionsGlnearest(CCmdUI* pCmdUI);
   afx_msg void OnOptionsVideoRenderoptionsGlbilinear();
   afx_msg void OnUpdateOptionsVideoRenderoptionsGlbilinear(CCmdUI* pCmdUI);
-  afx_msg void OnOptionsVideoRenderingoptionsGLSLShaders();
-  afx_msg void OnUpdateOptionsVideoRenderingoptionsGLSLShaders(CCmdUI* pCmdUI);
-  afx_msg void OnOptionsVideoRenderoptionsGltriangle();
-  afx_msg void OnUpdateOptionsVideoRenderoptionsGltriangle(CCmdUI* pCmdUI);
-  afx_msg void OnOptionsVideoRenderoptionsGlquads();
-  afx_msg void OnUpdateOptionsVideoRenderoptionsGlquads(CCmdUI* pCmdUI);
-  afx_msg void OnOptionsVideoRenderoptionsGlpolygons();
-  afx_msg void OnUpdateOptionsVideoRenderoptionsGlpolygons(CCmdUI* pCmdUI);
   afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
   afx_msg void OnOptionsEmulatorAssociate();
   afx_msg void OnOptionsEmulatorDirectories();
diff --git a/src/win32/MainWndOptions.cpp b/src/win32/MainWndOptions.cpp
index a6445c91..3e144679 100644
--- a/src/win32/MainWndOptions.cpp
+++ b/src/win32/MainWndOptions.cpp
@@ -552,25 +552,6 @@ void MainWnd::OnUpdateOptionsVideoRenderoptionsGlbilinear(CCmdUI* pCmdUI)
 }
 
 
-void MainWnd::OnUpdateOptionsVideoRenderingoptionsGLSLShaders(CCmdUI* pCmdUI)
-{
-#ifndef NO_OGL
-	pCmdUI->SetCheck(theApp.GLSLShaders);
-#else
-	pCmdUI->Enable( FALSE );
-#endif
-}
-
-void MainWnd::OnOptionsVideoRenderingoptionsGLSLShaders()
-{
-#ifndef NO_OGL
-	theApp.GLSLShaders = !theApp.GLSLShaders;
-	if( theApp.GLSLShaders ) {
-		theApp.display->setOption( _T("GLSLShaders"), theApp.GLSLShaders );
-	}
-#endif
-}
-
 void MainWnd::OnOptionsEmulatorAssociate()
 {
   Associate dlg;
diff --git a/src/win32/OpenGL.cpp b/src/win32/OpenGL.cpp
index dfbda818..dfcc4a81 100644
--- a/src/win32/OpenGL.cpp
+++ b/src/win32/OpenGL.cpp
@@ -40,6 +40,7 @@
 
 //Math
 #include <cmath>
+#include <sys/stat.h>
 
 // OpenGL
 #include <gl/GL.h> // main include file
@@ -93,10 +94,12 @@ private:
 	float size;
 	u8 *filterData;
 	RECT destRect;
-	bool failed,shaderFuncInited;
+	bool failed;
 	GLFONT font;
-	int VertexShader,FragmentShader,textureLocation,ShaderProgram,g_location_grayScaleWeights;
-	char *VertexShaderSource,*FragmentShaderSource;
+	int pitch;
+	GLuint displaylist; 
+	u8 *data;
+	GLhandleARB v,f,p,t;
 	DWORD currentAdapter;
 
 	void initializeMatrices( int w, int h );
@@ -105,9 +108,7 @@ private:
 	void setVSync( int interval = 1 );
 	void calculateDestRect( int w, int h );
 	void initializeFont();
-	void InitGLSLShader();
-	void DeInitGLSLShader();
-	void SetGLSLShaderConstants();
+	void renderlist();
 
 public:
 	OpenGLDisplay();
@@ -158,84 +159,6 @@ void OpenGLDisplay::initializeFont()
 	free(buf);
     (void)inflateEnd(&strm);
 }
-//Load shader files
-char *readShaderFile(char *FileName) {
-	FILE *fp;
-	char *DATA = NULL;
-
-	size_t flength = 0;
-
-	fp = fopen(FileName,"rt");
-
-    fseek(fp, 0, SEEK_END);
-    flength = ftell(fp);
-    rewind(fp);
-
-	DATA = (char *)malloc(sizeof(char) * (flength+1));
-	flength = fread(DATA, sizeof(char), flength, fp);
-	DATA[flength] = '\0';
-		
-	fclose(fp);	
-
-	return DATA;
-}
-//Init and compile shaders
-void OpenGLDisplay::InitGLSLShader (void) {
-    //create GLSL shader objects
-    VertexShader = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
-	FragmentShader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
-
-	//Read shader text files
-	VertexShaderSource = readShaderFile("vertex_shader.vert");
-	FragmentShaderSource = readShaderFile("fragment_shader.frag");
-
-	const char * VS = VertexShaderSource;
-	const char * FS = FragmentShaderSource;
-
-	glShaderSourceARB(VertexShader, 1, &VS,NULL);
-	glShaderSourceARB(FragmentShader, 1, &FS,NULL);
-		
-	free(VertexShaderSource);free(FragmentShaderSource);
-	//compile shaders
-	glCompileShaderARB(VertexShader);
-	glCompileShaderARB(FragmentShader);
-	//create shader program object
-	ShaderProgram = glCreateProgramObjectARB();
-	//attach VS/FS to shader program object
-	glAttachObjectARB(ShaderProgram,VertexShader);
-	glAttachObjectARB(ShaderProgram,FragmentShader);
-    //link the object
-	glLinkProgramARB(ShaderProgram);	 
-}
-//set shader samplers and constants
-void OpenGLDisplay::SetGLSLShaderConstants()
-{
-	//get shader uniforms and shader weights
-	textureLocation = glGetUniformLocationARB( ShaderProgram, "OGL2Texture" );
-	g_location_grayScaleWeights = glGetUniformLocationARB( ShaderProgram, "grayScaleWeights" );
-	glUniform1iARB( textureLocation, 1 );
-
-    // Load the greyscale weights for the luminance (B/W) filter.
-    float fGrayScaleWeights[] = { 0.30f, 0.59f, 0.11f, 0.0f };
-    glUniform4fARB( g_location_grayScaleWeights, fGrayScaleWeights[0], 
-    fGrayScaleWeights[1], fGrayScaleWeights[2], fGrayScaleWeights[3] );
-
-}
-//Delete shaders
-void OpenGLDisplay::DeInitGLSLShader (void) {
-	if( !shaderFuncInited ) return;
-
-	if (VertexShader != 0){
-    glDeleteObjectARB(VertexShader);
-	}
-	if (FragmentShader != 0){
-    glDeleteObjectARB(FragmentShader);
-	}
-	if (FragmentShader != 0){
-    glDeleteObjectARB(ShaderProgram);
-	}
-	shaderFuncInited = false;
-}
 
 //OpenGL class constructor
 OpenGLDisplay::OpenGLDisplay()
@@ -248,11 +171,10 @@ OpenGLDisplay::OpenGLDisplay()
 	size = 0.0f;
 	failed = false;
 	filterData = NULL;
-	shaderFuncInited = false;
 	currentAdapter = 0;
 }
 
-//OpenHL class destroyer
+//OpenGL class destroyer
 OpenGLDisplay::~OpenGLDisplay()
 {
 	cleanup();
@@ -286,12 +208,17 @@ void OpenGLDisplay::DisableOpenGL()
 //Remove resources used
 void OpenGLDisplay::cleanup()
 {
-	DeInitGLSLShader();
-
 	if(texture != 0) {
 		glDeleteTextures(1, &texture);
 		texture = 0;
 	}
+    
+	if (displaylist)
+	{
+	glDeleteLists(displaylist, 1);
+	displaylist = 0;
+	}
+
 	DisableOpenGL();
 	if(filterData) {
 		free(filterData);
@@ -352,25 +279,6 @@ bool OpenGLDisplay::initialize()
 	glEnable( GL_TEXTURE_2D );
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-
-	if(theApp.GLSLShaders)
-	{
-	//load shader functions
-	glCreateProgramObjectARB  = (PFNGLCREATEPROGRAMOBJECTARBPROC)wglGetProcAddress("glCreateProgramObjectARB");
-    glDeleteObjectARB         = (PFNGLDELETEOBJECTARBPROC)wglGetProcAddress("glDeleteObjectARB");
-    glUseProgramObjectARB     = (PFNGLUSEPROGRAMOBJECTARBPROC)wglGetProcAddress("glUseProgramObjectARB");
-    glCreateShaderObjectARB   = (PFNGLCREATESHADEROBJECTARBPROC)wglGetProcAddress("glCreateShaderObjectARB");
-    glShaderSourceARB         = (PFNGLSHADERSOURCEARBPROC)wglGetProcAddress("glShaderSourceARB");
-    glCompileShaderARB        = (PFNGLCOMPILESHADERARBPROC)wglGetProcAddress("glCompileShaderARB");
-    glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC)wglGetProcAddress("glGetObjectParameterivARB");
-    glAttachObjectARB         = (PFNGLATTACHOBJECTARBPROC)wglGetProcAddress("glAttachObjectARB");
-    glGetInfoLogARB           = (PFNGLGETINFOLOGARBPROC)wglGetProcAddress("glGetInfoLogARB");
-    glLinkProgramARB          = (PFNGLLINKPROGRAMARBPROC)wglGetProcAddress("glLinkProgramARB");
-    glGetUniformLocationARB   = (PFNGLGETUNIFORMLOCATIONARBPROC)wglGetProcAddress("glGetUniformLocationARB");
-    glUniform4fARB            = (PFNGLUNIFORM4FARBPROC)wglGetProcAddress("glUniform4fARB");
-	glUniform1iARB            = (PFNGLUNIFORM1IARBPROC)wglGetProcAddress("glUniform1iARB");
-	shaderFuncInited = true;
-	}
 	
 	initializeMatrices( theApp.surfaceSizeX, theApp.surfaceSizeY );
 
@@ -394,6 +302,9 @@ bool OpenGLDisplay::initialize()
 	utilUpdateSystemColorMaps();
 	theApp.updateFilter();
 	theApp.updateIFB();
+	pitch = theApp.filterWidth * (systemColorDepth>>3) + 4;
+	data = pix + ( theApp.sizeX + 1 ) * 4;
+	renderlist();
 
 	if(failed)
 		return false;
@@ -407,22 +318,36 @@ void OpenGLDisplay::clear()
 	glClearColor(0.0,0.0,0.0,1.0);
 	glClear( GL_COLOR_BUFFER_BIT );
 }
+
+//dlist
+void OpenGLDisplay::renderlist()
+{
+	displaylist = glGenLists(1); //set the cube list to Generate a List
+    glNewList(displaylist,GL_COMPILE); //compile the new list
+    glBegin( GL_QUADS );
+
+	glTexCoord2f( 0.0f, 0.0f );
+	glVertex3i( 0, 0, 0 );
+
+	glTexCoord2f( (float)(width) / size, 0.0f );
+	glVertex3i( theApp.surfaceSizeX, 0, 0 );
+
+	glTexCoord2f( (float)(width) / size, (float)(height) / size );
+	glVertex3i( theApp.surfaceSizeX, theApp.surfaceSizeY, 0 );
+
+	glTexCoord2f( 0.0f, (float)(height) / size );
+	glVertex3i( 0, theApp.surfaceSizeY, 0 );
+	glEnd();
+	glEndList();
+}
+
 //main render func
 void OpenGLDisplay::render()
 { 
 	clear();
 
-	/* Might need to relocate?
-	Jeez, damn me losing old code that works well :/*/
-	if (theApp.GLSLShaders && shaderFuncInited){
-	InitGLSLShader();
-    glUseProgramObjectARB( ShaderProgram );
-	SetGLSLShaderConstants();
-	}
-	
-	
-	int pitch = theApp.filterWidth * (systemColorDepth>>3) + 4;
-	u8 *data = pix + ( theApp.sizeX + 1 ) * 4;
+	pitch = theApp.filterWidth * (systemColorDepth>>3) + 4;
+	data = pix + ( theApp.sizeX + 1 ) * 4;
 
 	// apply pixel filter
 	if(theApp.filterFunction) {
@@ -446,22 +371,10 @@ void OpenGLDisplay::render()
 		glPixelStorei( GL_UNPACK_ROW_LENGTH, theApp.sizeX + 1 );
 	}
     glTexSubImage2D(GL_TEXTURE_2D,0,0,0,width,height,GL_RGBA,GL_UNSIGNED_BYTE,data );
-   
-	glBegin( GL_QUADS );
+    
 
-	glTexCoord2f( 0.0f, 0.0f );
-	glVertex3i( 0, 0, 0 );
-
-	glTexCoord2f( (float)(width) / size, 0.0f );
-	glVertex3i( theApp.surfaceSizeX, 0, 0 );
-
-	glTexCoord2f( (float)(width) / size, (float)(height) / size );
-	glVertex3i( theApp.surfaceSizeX, theApp.surfaceSizeY, 0 );
-
-	glTexCoord2f( 0.0f, (float)(height) / size );
-	glVertex3i( 0, theApp.surfaceSizeY, 0 );
-
-	glEnd();
+	glCallList(displaylist); 
+ 
        
 	if( theApp.showSpeed ) { // && ( theApp.videoOption > VIDEO_4X ) ) {
 		char buffer[30];
@@ -510,6 +423,13 @@ void OpenGLDisplay::render()
 void OpenGLDisplay::resize( int w, int h )
 {
 	initializeMatrices( w, h );
+	/* Display lists are not mutable, so we have to do this*/
+	if (displaylist)
+	{
+	glDeleteLists(displaylist, 1);
+	displaylist = 0;
+	renderlist();
+	}
 }
 
 //update filtering methods
@@ -640,9 +560,13 @@ bool OpenGLDisplay::changeRenderSize( int w, int h )
 		if (filterData)
 			free(filterData);
 		filterData = (u8 *)malloc(4*w*h);
-
 	}
-
+	if (displaylist)
+	{
+	glDeleteLists(displaylist, 1);
+	displaylist = 0;
+	renderlist();
+	}
 	return true;
 }
 
diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index 75a8117f..f6edc378 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -288,7 +288,6 @@ VBA::VBA()
   d3dMotionBlur = false;
 #endif
   glFilter = 0;
-  GLSLShaders = 0;
   regEnabled = false;
   pauseWhenInactive = true;
   speedupToggle = false;
@@ -1486,10 +1485,6 @@ void VBA::loadSettings()
   if(glFilter < 0 || glFilter > 1)
     glFilter = 1;
 
-  GLSLShaders = regQueryDwordValue("GLSLShaders", 0);
-  if(GLSLShaders < 0 || GLSLShaders > 1)
-    GLSLShaders = 0;
-
 
   filterType = regQueryDwordValue("filter", 0);
   if(filterType < 0 || filterType > 17)
@@ -2458,7 +2453,6 @@ void VBA::saveSettings()
 #endif
 
   regSetDwordValue("glFilter", glFilter);
-  regSetDwordValue("GLSLShaders", GLSLShaders);
 
   regSetDwordValue("filter", filterType);
 
diff --git a/src/win32/VBA.h b/src/win32/VBA.h
index 4d63f383..9fb7f6fa 100644
--- a/src/win32/VBA.h
+++ b/src/win32/VBA.h
@@ -158,7 +158,6 @@ class VBA : public CWinApp
   bool d3dMotionBlur;
 #endif
   int glFilter;
-  int GLSLShaders;
   bool dinputKeyFocus;
   bool pauseWhenInactive;
   bool speedupToggle;
diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc
index 12140a17..7af434fd 100644
--- a/src/win32/VBA.rc
+++ b/src/win32/VBA.rc
@@ -1582,7 +1582,6 @@ BEGIN
                 MENUITEM "&OpenGL",                     ID_OPTIONS_VIDEO_RENDERMETHOD_OPENGL
                 MENUITEM "   Filter: Nearest",          ID_OPTIONS_VIDEO_RENDEROPTIONS_GLNEAREST
                 MENUITEM "   Filter: Bilinear",         ID_OPTIONS_VIDEO_RENDEROPTIONS_GLBILINEAR
-                MENUITEM "   GLSL Shaders",             ID_OPTIONS_VIDEO_RENDEROPTIONS_GLSLSHADERS
                 MENUITEM SEPARATOR
                 MENUITEM "&VSync",                      ID_OPTIONS_VIDEO_VSYNC
                 MENUITEM "Triple Buffering",            ID_OPTIONS_VIDEO_TRIPLEBUFFERING
@@ -1837,7 +1836,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "&Colors...",                  ID_OPTIONS_GAMEBOY_COLORS
         END
-        POPUP "&Link", GRAYED
+        POPUP "&Link"
         BEGIN
             MENUITEM "Enable GBA Linking",          ID_OPTIONS_LINK_ENABLE
             MENUITEM "&Wireless Adapter",           ID_OPTIONS_LINK_WIRELESSADAPTER
diff --git a/src/win32/resource.h b/src/win32/resource.h
index 8e0ab978..f44a5062 100644
--- a/src/win32/resource.h
+++ b/src/win32/resource.h
@@ -837,7 +837,6 @@
 #define ID_OUTPUTAPI_CONFIGURATION      40349
 #define ID_OUTPUTAPI_OALCONFIGURATION   40350
 #define ID_RENDERAPI_FILTER             40351
-#define ID_OPTIONS_VIDEO_RENDEROPTIONS_GLSLSHADERS 40352
 #define ID_OPTIONS_SPEED                40353
 #define ID_RENDERAPI_MOTIONBLUR         40354
 #define ID_RENDERAPI_D3DMOTIONBLUR      40355