diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp
index e330608be3..e9f92ee7df 100644
--- a/plugins/GSdx/GSSettingsDlg.cpp
+++ b/plugins/GSdx/GSSettingsDlg.cpp
@@ -162,17 +162,6 @@ void GSSettingsDlg::OnInit()
 	CheckDlgButton(m_hWnd, IDC_MIPMAP, theApp.GetConfig("mipmap", 1));
 	CheckDlgButton(m_hWnd, IDC_ACCURATE_DATE, theApp.GetConfig("accurate_date", 0));
 	CheckDlgButton(m_hWnd, IDC_TC_DEPTH, theApp.GetConfig("texture_cache_depth", 0));
-
-	// Shade Boost
-	CheckDlgButton(m_hWnd, IDC_SHADEBOOST, theApp.GetConfig("ShadeBoost", 0));
-
-	// FXAA shader
-	CheckDlgButton(m_hWnd, IDC_FXAA, theApp.GetConfig("Fxaa", 0));
-
-	// External FX shader
-	CheckDlgButton(m_hWnd, IDC_SHADER_FX, theApp.GetConfig("shaderfx", 0));
-	SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_EDIT), WM_SETTEXT, 0, (LPARAM)theApp.GetConfig("shaderfx_glsl", "shaders\\GSdx.fx").c_str());
-	SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_EDIT), WM_SETTEXT, 0, (LPARAM)theApp.GetConfig("shaderfx_conf", "shaders\\GSdx_FX_Settings.ini").c_str());
 	
 	// Hacks
 	CheckDlgButton(m_hWnd, IDC_HACKS_ENABLED, theApp.GetConfig("UserHacks", 0));
@@ -197,9 +186,6 @@ void GSSettingsDlg::OnInit()
 	AddTooltip(IDC_MIPMAP);
 	AddTooltip(IDC_SWTHREADS);
 	AddTooltip(IDC_SWTHREADS_EDIT);
-	AddTooltip(IDC_SHADEBOOST);
-	AddTooltip(IDC_SHADER_FX);
-	AddTooltip(IDC_FXAA);
 	AddTooltip(IDC_FBA);
 	AddTooltip(IDC_LOGZ);
 
@@ -223,8 +209,6 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code)
 			if (code == CBN_SELCHANGE)
 				UpdateControls();
 			break;
-		case IDC_SHADEBOOST:
-		case IDC_SHADER_FX:
 		case IDC_PALTEX:
 		case IDC_HACKS_ENABLED:
 			if (code == BN_CLICKED)
@@ -232,20 +216,12 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code)
 			break;
 		case IDC_SHADEBUTTON:
 			if (code == BN_CLICKED)
-				ShadeBoostDlg.DoModal();
+				ShaderDlg.DoModal();
 			break;
 		case IDC_HACKSBUTTON:
 			if (code == BN_CLICKED)
 				HacksDlg.DoModal();
 			break;
-		case IDC_SHADER_FX_BUTTON:
-			if (code == BN_CLICKED)
-				OpenFileDialog(IDC_SHADER_FX_EDIT, "Select External Shader");
-			break;
-		case IDC_SHADER_FX_CONF_BUTTON:
-			if (code == BN_CLICKED)
-				OpenFileDialog(IDC_SHADER_FX_CONF_EDIT, "Select External Shader Config");
-			break;
 		case IDOK:
 		{
 			INT_PTR data;
@@ -311,29 +287,6 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code)
 			theApp.SetConfig("extrathreads", (int)SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_GETPOS, 0, 0));
 			theApp.SetConfig("accurate_date", (int)IsDlgButtonChecked(m_hWnd, IDC_ACCURATE_DATE));
 			theApp.SetConfig("texture_cache_depth", (int)IsDlgButtonChecked(m_hWnd, IDC_TC_DEPTH));
-
-			// Shade Boost
-			theApp.SetConfig("ShadeBoost", (int)IsDlgButtonChecked(m_hWnd, IDC_SHADEBOOST));
-
-			// FXAA shader
-			theApp.SetConfig("Fxaa", (int)IsDlgButtonChecked(m_hWnd, IDC_FXAA));
-
-			// External FX Shader
-			theApp.SetConfig("shaderfx", (int)IsDlgButtonChecked(m_hWnd, IDC_SHADER_FX));
-			
-			// External FX Shader(OpenGL)
-			int shader_fx_length = (int)SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_EDIT), WM_GETTEXTLENGTH, 0, 0);
-			int shader_fx_conf_length = (int)SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_EDIT), WM_GETTEXTLENGTH, 0, 0);
-			int length = std::max(shader_fx_length, shader_fx_conf_length) + 1;
-			char *buffer = new char[length];
-
-			SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_EDIT), WM_GETTEXT, (WPARAM)length, (LPARAM)buffer);
-			theApp.SetConfig("shaderfx_glsl", buffer); // Not really glsl only ;)
-			SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_EDIT), WM_GETTEXT, (WPARAM)length, (LPARAM)buffer);
-			theApp.SetConfig("shaderfx_conf", buffer);
-
-			delete [] buffer;
-
 			theApp.SetConfig("UserHacks", (int)IsDlgButtonChecked(m_hWnd, IDC_HACKS_ENABLED));
 		}
 		break;
@@ -454,35 +407,41 @@ void GSSettingsDlg::UpdateControls()
 		EnableWindow(GetDlgItem(m_hWnd, IDC_HACKSBUTTON), hw && IsDlgButtonChecked(m_hWnd, IDC_HACKS_ENABLED));
 	}
 
-	// External shader
-	bool external_shader_selected = IsDlgButtonChecked(m_hWnd, IDC_SHADER_FX) == BST_CHECKED;
-	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_TEXT), external_shader_selected);
-	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_EDIT), external_shader_selected);
-	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_BUTTON), external_shader_selected);
-	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_TEXT), external_shader_selected);
-	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_EDIT), external_shader_selected);
-	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_BUTTON), external_shader_selected);
-
-	// Shade Boost
-	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADEBUTTON), IsDlgButtonChecked(m_hWnd, IDC_SHADEBOOST) == BST_CHECKED);
 }
 
-// Shade Boost Dialog
+// Shader Configuration Dialog
 
-GSShadeBostDlg::GSShadeBostDlg() : 
-	GSDialog(IDD_SHADEBOOST)
+GSShaderDlg::GSShaderDlg() :
+	GSDialog(IDD_SHADER)
 {}
 
-void GSShadeBostDlg::OnInit()
+void GSShaderDlg::OnInit()
 {
+	//TV Shader
+	ComboBoxInit(IDC_TVSHADER, theApp.m_gs_tv_shaders, theApp.GetConfig("TVshader", 0));
+
+	//Shade Boost
+	CheckDlgButton(m_hWnd, IDC_SHADEBOOST, theApp.GetConfig("ShadeBoost", 0));
 	contrast = theApp.GetConfig("ShadeBoost_Contrast", 50);
 	brightness = theApp.GetConfig("ShadeBoost_Brightness", 50);
 	saturation = theApp.GetConfig("ShadeBoost_Saturation", 50);
 
+	// External FX shader
+	CheckDlgButton(m_hWnd, IDC_SHADER_FX, theApp.GetConfig("shaderfx", 0));
+	SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_EDIT), WM_SETTEXT, 0, (LPARAM)theApp.GetConfig("shaderfx_glsl", "shaders\\GSdx.fx").c_str());
+	SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_EDIT), WM_SETTEXT, 0, (LPARAM)theApp.GetConfig("shaderfx_conf", "shaders\\GSdx_FX_Settings.ini").c_str());
+
+	// FXAA shader
+	CheckDlgButton(m_hWnd, IDC_FXAA, theApp.GetConfig("Fxaa", 0));
+
+	AddTooltip(IDC_SHADEBOOST);
+	AddTooltip(IDC_SHADER_FX);
+	AddTooltip(IDC_FXAA);
+
 	UpdateControls();
 }
 
-void GSShadeBostDlg::UpdateControls()
+void GSShaderDlg::UpdateControls()
 {
 	SendMessage(GetDlgItem(m_hWnd, IDC_SATURATION_SLIDER), TBM_SETRANGE, TRUE, MAKELONG(0, 100));
 	SendMessage(GetDlgItem(m_hWnd, IDC_BRIGHTNESS_SLIDER), TBM_SETRANGE, TRUE, MAKELONG(0, 100));
@@ -500,9 +459,25 @@ void GSShadeBostDlg::UpdateControls()
 	SetDlgItemText(m_hWnd, IDC_BRIGHTNESS_TEXT, text);
 	sprintf(text, "%d", contrast);
 	SetDlgItemText(m_hWnd, IDC_CONTRAST_TEXT, text);
+
+	// Shader Settings
+	bool external_shader_selected = IsDlgButtonChecked(m_hWnd, IDC_SHADER_FX) == BST_CHECKED;
+	bool shadeboost_selected = IsDlgButtonChecked(m_hWnd, IDC_SHADEBOOST) == BST_CHECKED;
+	EnableWindow(GetDlgItem(m_hWnd, IDC_SATURATION_SLIDER), shadeboost_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_BRIGHTNESS_SLIDER), shadeboost_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_CONTRAST_SLIDER), shadeboost_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_SATURATION_TEXT), shadeboost_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_BRIGHTNESS_TEXT), shadeboost_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_CONTRAST_TEXT), shadeboost_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_TEXT), external_shader_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_EDIT), external_shader_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_BUTTON), external_shader_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_TEXT), external_shader_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_EDIT), external_shader_selected);
+	EnableWindow(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_BUTTON), external_shader_selected);
 }
 
-bool GSShadeBostDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
+bool GSShaderDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
 {
 	switch(message)
 	{
@@ -543,21 +518,60 @@ bool GSShadeBostDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
 
 		switch(id)
 		{
-		case IDOK: 
+		case IDOK:
 		{
+			INT_PTR data;
+			//TV Shader
+			if (ComboBoxGetSelData(IDC_TVSHADER, data))
+			{
+				theApp.SetConfig("TVshader", (int)data);
+			}
+			// Shade Boost
+			theApp.SetConfig("ShadeBoost", (int)IsDlgButtonChecked(m_hWnd, IDC_SHADEBOOST));
 			theApp.SetConfig("ShadeBoost_Contrast", contrast);
 			theApp.SetConfig("ShadeBoost_Brightness", brightness);
 			theApp.SetConfig("ShadeBoost_Saturation", saturation);
+
+			// FXAA shader
+			theApp.SetConfig("Fxaa", (int)IsDlgButtonChecked(m_hWnd, IDC_FXAA));
+
+			// External FX Shader
+			theApp.SetConfig("shaderfx", (int)IsDlgButtonChecked(m_hWnd, IDC_SHADER_FX));
+
+			// External FX Shader(OpenGL)
+			int shader_fx_length = (int)SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_EDIT), WM_GETTEXTLENGTH, 0, 0);
+			int shader_fx_conf_length = (int)SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_EDIT), WM_GETTEXTLENGTH, 0, 0);
+			int length = std::max(shader_fx_length, shader_fx_conf_length) + 1;
+			char *buffer = new char[length];
+
+
+			SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_EDIT), WM_GETTEXT, (WPARAM)length, (LPARAM)buffer);
+			theApp.SetConfig("shaderfx_glsl", buffer); // Not really glsl only ;)
+			SendMessage(GetDlgItem(m_hWnd, IDC_SHADER_FX_CONF_EDIT), WM_GETTEXT, (WPARAM)length, (LPARAM)buffer);
+			theApp.SetConfig("shaderfx_conf", buffer);
+			delete[] buffer;
+
 			EndDialog(m_hWnd, id);		
 		} break;
-
-		case IDRESET:
-		{
-			contrast = 50;
-			brightness = 50;
-			saturation = 50;
-
+		case IDC_SHADEBOOST:
 			UpdateControls();
+		case IDC_SHADER_FX:
+			if (HIWORD(wParam) == BN_CLICKED)
+				UpdateControls();
+			break;
+		case IDC_SHADER_FX_BUTTON:
+			if (HIWORD(wParam) == BN_CLICKED)
+				OpenFileDialog(IDC_SHADER_FX_EDIT, "Select External Shader");
+			break;
+
+		case IDC_SHADER_FX_CONF_BUTTON:
+			if (HIWORD(wParam) == BN_CLICKED)
+				OpenFileDialog(IDC_SHADER_FX_CONF_EDIT, "Select External Shader Config");
+			break;
+
+		case IDCANCEL:
+		{
+			EndDialog(m_hWnd, IDCANCEL);
 		} break;
 		}
 
diff --git a/plugins/GSdx/GSSettingsDlg.h b/plugins/GSdx/GSSettingsDlg.h
index 1348341dee..8bfcf3f373 100644
--- a/plugins/GSdx/GSSettingsDlg.h
+++ b/plugins/GSdx/GSSettingsDlg.h
@@ -24,7 +24,7 @@
 #include "GSDialog.h"
 #include "GSSetting.h"
 
-class GSShadeBostDlg : public GSDialog
+class GSShaderDlg : public GSDialog
 {
 	int saturation;
 	int brightness;
@@ -37,7 +37,7 @@ protected:
 	bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam);	
 
 public:
-	GSShadeBostDlg();
+	GSShaderDlg();
 };
 
 class GSHacksDlg : public GSDialog
@@ -88,7 +88,7 @@ protected:
 	bool OnCommand(HWND hWnd, UINT id, UINT code);
 
 	// Shade Boost
-	GSShadeBostDlg ShadeBoostDlg;
+	GSShaderDlg ShaderDlg;
 	GSHacksDlg HacksDlg;
 
 public:
diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc
index 402e787021..b7a818c3aa 100644
--- a/plugins/GSdx/GSdx.rc
+++ b/plugins/GSdx/GSdx.rc
@@ -119,23 +119,35 @@ BEGIN
     COMBOBOX        IDC_SPRITEHACK,84,125,48,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_SHADEBOOST DIALOGEX 0, 0, 316, 129
+IDD_SHADER DIALOGEX 0, 0, 248, 250
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Shade Boost Settings"
+CAPTION "Shader Configuration"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,259,108,50,14
-    PUSHBUTTON      "Reset",IDRESET,7,108,50,14
-    GROUPBOX        "Color Adjustments",IDC_STATIC,7,7,302,95
-    LTEXT           "Saturation",IDC_STATIC,15,25,34,8
-    CONTROL         "",IDC_SATURATION_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,55,23,236,15
-    LTEXT           "Brightness",IDC_STATIC,15,50,34,8
-    CONTROL         "",IDC_BRIGHTNESS_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,55,48,236,15
-    LTEXT           "Contrast",IDC_STATIC,15,75,29,8
-    CONTROL         "",IDC_CONTRAST_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,55,72,236,15
-    RTEXT           "100",IDC_SATURATION_TEXT,288,25,15,8
-    RTEXT           "100",IDC_BRIGHTNESS_TEXT,288,50,15,8
-    RTEXT           "100",IDC_CONTRAST_TEXT,288,75,15,8
+    DEFPUSHBUTTON   "OK",IDOK,69,231,50,14
+    DEFPUSHBUTTON   "Cancel",IDCANCEL,126,231,50,14
+    CONTROL         "Enable Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,46,90,10
+    LTEXT           "Saturation",IDC_STATIC,15,64,34,8
+    CONTROL         "",IDC_SATURATION_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,55,62,165,15
+    LTEXT           "Brightness",IDC_STATIC,15,89,34,8
+    CONTROL         "",IDC_BRIGHTNESS_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,55,87,165,15
+    LTEXT           "Contrast",IDC_STATIC,15,114,29,8
+    CONTROL         "",IDC_CONTRAST_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,55,111,165,15
+    RTEXT           "100",IDC_SATURATION_TEXT,220,64,15,8
+    RTEXT           "100",IDC_BRIGHTNESS_TEXT,220,89,15,8
+    RTEXT           "100",IDC_CONTRAST_TEXT,220,114,15,8
+    CONTROL         "Enable FXAA",IDC_FXAA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,190,6,54,10
+    CONTROL         "Enable External Shader",IDC_SHADER_FX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,156,90,10
+    LTEXT           "External Shader",IDC_SHADER_FX_TEXT,15,171,75,8
+    EDITTEXT        IDC_SHADER_FX_EDIT,15,179,170,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse",IDC_SHADER_FX_BUTTON,196,179,36,14
+    LTEXT           "External Shader Config",IDC_SHADER_FX_CONF_TEXT,15,196,75,8
+    PUSHBUTTON      "Browse",IDC_SHADER_FX_CONF_BUTTON,196,204,36,14
+    EDITTEXT        IDC_SHADER_FX_CONF_EDIT,15,204,170,14,ES_AUTOHSCROLL
+    COMBOBOX        IDC_TVSHADER,75,4,76,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "TV Shader (F7):",IDC_STATIC,15,6,55,8
+    GROUPBOX        "Shade-Boost Settings",IDC_STATIC,6,28,236,106,BS_CENTER
+    GROUPBOX        "External Shader Settings",IDC_STATIC,6,138,236,88,BS_CENTER
 END
 
 IDD_CAPTURE DIALOGEX 0, 0, 279, 71
@@ -182,7 +194,7 @@ BEGIN
     CONTROL         "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,129,157,49,10
 END
 
-IDD_CONFIG DIALOGEX 0, 0, 243, 422
+IDD_CONFIG DIALOGEX 0, 0, 243, 373
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "GSdx Settings"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -221,25 +233,16 @@ BEGIN
     COMBOBOX        IDC_ACCURATE_BLEND_UNIT,105,251,127,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,239,90,8
     CONTROL         "Alpha Correction",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,239,74,8
-    CONTROL         "Mipmapping", IDC_MIPMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,296,90,8
-    GROUPBOX        "Software Mode Settings",IDC_STATIC,6,267,231,40,BS_CENTER
-    CONTROL         "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,279,91,10
-    LTEXT           "Extra rendering threads:",IDC_STATIC,116,280,83,8
-    EDITTEXT        IDC_SWTHREADS_EDIT,198,278,34,13,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,221,277,11,14
-    GROUPBOX        "Custom Shader Settings",IDC_STATIC,6,305,231,94,BS_CENTER
-    CONTROL         "Enable Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,317,90,10
-    PUSHBUTTON      "Configure Shade Boost",IDC_SHADEBUTTON,105,315,127,14
-    CONTROL         "Enable External Shader",IDC_SHADER_FX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,332,90,10
-    CONTROL         "Enable FXAA",IDC_FXAA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,332,61,10
-    LTEXT           "External Shader",IDC_SHADER_FX_TEXT,22,347,52,8
-    EDITTEXT        IDC_SHADER_FX_EDIT,22,355,170,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse",IDC_SHADER_FX_BUTTON,196,355,36,14
-    LTEXT           "External Shader Config",IDC_SHADER_FX_CONF_TEXT,22,372,75,8
-    EDITTEXT        IDC_SHADER_FX_CONF_EDIT,22,381,170,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse",IDC_SHADER_FX_CONF_BUTTON,196,381,36,14
-    DEFPUSHBUTTON   "OK",IDOK,69,402,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,125,402,50,14
+    CONTROL         "Mipmapping",IDC_MIPMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,304,90,8
+    GROUPBOX        "Software Mode Settings",IDC_STATIC,6,275,231,40,BS_CENTER
+    CONTROL         "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,287,91,10
+    LTEXT           "Extra rendering threads:",IDC_STATIC,116,288,83,8
+    EDITTEXT        IDC_SWTHREADS_EDIT,198,286,34,13,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,221,285,11,14
+    PUSHBUTTON      "Configure",IDC_SHADEBUTTON,105,323,127,14
+    LTEXT           "Shader Configuration:",IDC_STATIC,11,326,90,14
+    DEFPUSHBUTTON   "OK",IDOK,69,353,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,125,353,50,14
 END
 
 
diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h
index 0c18ab94e0..d5521b0bb7 100644
--- a/plugins/GSdx/resource.h
+++ b/plugins/GSdx/resource.h
@@ -44,59 +44,59 @@
 #define IDC_WINDOWED                    2039
 #define IDC_SKIPDRAWHACKEDIT            2040
 #define IDC_SPRITEHACK                  2041
-#define IDRESET                         2042
-#define IDC_SATURATION_SLIDER           2043
-#define IDC_BRIGHTNESS_SLIDER           2044
-#define IDC_CONTRAST_SLIDER             2045
-#define IDC_SHADEBUTTON                 2046
-#define IDC_SHADEBOOST                  2047
-#define IDC_HACKS_ENABLED               2048
-#define IDC_SATURATION_TEXT             2049
-#define IDC_BRIGHTNESS_TEXT             2050
-#define IDC_CONTRAST_TEXT               2051
-#define IDC_MSAACB                      2052
-#define IDC_HACKSBUTTON                 2053
-#define IDC_WILDHACK                    2054
-#define IDC_CHECK_DISABLE_ALL_HACKS     2055
-#define IDC_ALPHASTENCIL                2056
-#define IDC_ADAPTER                     2057
-#define IDC_TCOFFSETX                   2058
-#define IDC_TCOFFSETX2                  2059
-#define IDC_TCOFFSETY                   2060
-#define IDC_TCOFFSETY2                  2061
-#define IDC_FXAA                        2062
-#define IDC_SHADER_FX                   2063
-#define IDC_AFCOMBO_TEXT                2064
-#define IDC_AFCOMBO                     2065
-#define IDC_OPENCL_DEVICE               2066
-#define IDC_ACCURATE_BLEND_UNIT         2067
-#define IDC_ACCURATE_DATE               2068
-#define IDC_ROUND_SPRITE                2069
-#define IDC_ALIGN_SPRITE                2070
-#define IDC_CRC_LEVEL                   2071
-#define IDC_CRC_LEVEL_TEXT              2072
-#define IDC_TC_DEPTH                    2073
-#define IDC_COLORSPACE                  2074
-#define IDC_SHADER_FX_EDIT              2075
-#define IDC_SHADER_FX_CONF_EDIT         2076
-#define IDC_SHADER_FX_BUTTON            2077
-#define IDC_SHADER_FX_CONF_BUTTON       2078
-#define IDC_SHADER_FX_TEXT              2079
-#define IDC_SHADER_FX_CONF_TEXT         2080
-#define IDC_CUSTOM_TEXT                 2081
-#define IDC_UPSCALE_MULTIPLIER_TEXT     2082
+#define IDC_SATURATION_SLIDER           2042
+#define IDC_BRIGHTNESS_SLIDER           2043
+#define IDC_CONTRAST_SLIDER             2044
+#define IDC_SHADEBUTTON                 2045
+#define IDC_SHADEBOOST                  2046
+#define IDC_HACKS_ENABLED               2047
+#define IDC_SATURATION_TEXT             2048
+#define IDC_BRIGHTNESS_TEXT             2049
+#define IDC_CONTRAST_TEXT               2050
+#define IDC_MSAACB                      2051
+#define IDC_HACKSBUTTON                 2052
+#define IDC_WILDHACK                    2053
+#define IDC_CHECK_DISABLE_ALL_HACKS     2054
+#define IDC_ALPHASTENCIL                2055
+#define IDC_ADAPTER                     2056
+#define IDC_TCOFFSETX                   2057
+#define IDC_TCOFFSETX2                  2058
+#define IDC_TCOFFSETY                   2059
+#define IDC_TCOFFSETY2                  2060
+#define IDC_FXAA                        2061
+#define IDC_SHADER_FX                   2062
+#define IDC_AFCOMBO_TEXT                2063
+#define IDC_AFCOMBO                     2064
+#define IDC_OPENCL_DEVICE               2065
+#define IDC_ACCURATE_BLEND_UNIT         2066
+#define IDC_ACCURATE_DATE               2067
+#define IDC_ROUND_SPRITE                2068
+#define IDC_ALIGN_SPRITE                2069
+#define IDC_CRC_LEVEL                   2070
+#define IDC_CRC_LEVEL_TEXT              2071
+#define IDC_TC_DEPTH                    2072
+#define IDC_COLORSPACE                  2073
+#define IDC_SHADER_FX_EDIT              2074
+#define IDC_SHADER_FX_CONF_EDIT         2075
+#define IDC_SHADER_FX_BUTTON            2076
+#define IDC_SHADER_FX_CONF_BUTTON       2077
+#define IDC_SHADER_FX_TEXT              2078
+#define IDC_SHADER_FX_CONF_TEXT         2079
+#define IDC_CUSTOM_TEXT                 2080
+#define IDC_UPSCALE_MULTIPLIER_TEXT     2081
+#define IDC_MIPMAP                      2082
+#define IDC_PRELOAD_GS                  2083
+#define IDC_TVSHADER                    2084
 #define IDR_CONVERT_FX                  10000
 #define IDR_TFX_FX                      10001
 #define IDR_MERGE_FX                    10002
 #define IDR_INTERLACE_FX                10003
 #define IDR_FXAA_FX                     10004
 #define IDR_CS_FX                       10005
-#define IDD_SHADEBOOST                  10006
+#define IDD_SHADER                      10006
 #define IDR_SHADEBOOST_FX               10007
 #define IDR_TFX_CL                      10008
 #define IDD_HACKS                       10009
-#define IDC_MIPMAP                      10010
-#define IDC_PRELOAD_GS                  10011
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
@@ -105,7 +105,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        10013
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         2083
+#define _APS_NEXT_CONTROL_VALUE         2085
 #define _APS_NEXT_SYMED_VALUE           5000
 #endif
 #endif