diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.cpp b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.cpp
index 32724cc15..92ac91c2a 100644
--- a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.cpp
+++ b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.cpp
@@ -15,336 +15,336 @@
 
 CGamePluginPage::CGamePluginPage(HWND hParent, const RECT & rcDispay)
 {
-	if (!Create(hParent, rcDispay))
-	{
-		return;
-	}
+    if (!Create(hParent, rcDispay))
+    {
+        return;
+    }
 
-	//Set the text for all gui Items
-	SetDlgItemTextW(m_hWnd, RSP_ABOUT, GS(PLUG_ABOUT));
-	SetDlgItemTextW(m_hWnd, GFX_ABOUT, GS(PLUG_ABOUT));
-	SetDlgItemTextW(m_hWnd, AUDIO_ABOUT, GS(PLUG_ABOUT));
-	SetDlgItemTextW(m_hWnd, CONT_ABOUT, GS(PLUG_ABOUT));
+    //Set the text for all gui Items
+    SetDlgItemTextW(m_hWnd, RSP_ABOUT, GS(PLUG_ABOUT));
+    SetDlgItemTextW(m_hWnd, GFX_ABOUT, GS(PLUG_ABOUT));
+    SetDlgItemTextW(m_hWnd, AUDIO_ABOUT, GS(PLUG_ABOUT));
+    SetDlgItemTextW(m_hWnd, CONT_ABOUT, GS(PLUG_ABOUT));
 
-	SetDlgItemTextW(m_hWnd, IDC_RSP_NAME, GS(PLUG_RSP));
-	SetDlgItemTextW(m_hWnd, IDC_GFX_NAME, GS(PLUG_GFX));
-	SetDlgItemTextW(m_hWnd, IDC_AUDIO_NAME, GS(PLUG_AUDIO));
-	SetDlgItemTextW(m_hWnd, IDC_CONT_NAME, GS(PLUG_CTRL));
+    SetDlgItemTextW(m_hWnd, IDC_RSP_NAME, GS(PLUG_RSP));
+    SetDlgItemTextW(m_hWnd, IDC_GFX_NAME, GS(PLUG_GFX));
+    SetDlgItemTextW(m_hWnd, IDC_AUDIO_NAME, GS(PLUG_AUDIO));
+    SetDlgItemTextW(m_hWnd, IDC_CONT_NAME, GS(PLUG_CTRL));
 
-	SetDlgItemTextW(m_hWnd, IDC_HLE_GFX, GS(PLUG_HLE_GFX));
-	SetDlgItemTextW(m_hWnd, IDC_HLE_AUDIO, GS(PLUG_HLE_AUDIO));
+    SetDlgItemTextW(m_hWnd, IDC_HLE_GFX, GS(PLUG_HLE_GFX));
+    SetDlgItemTextW(m_hWnd, IDC_HLE_AUDIO, GS(PLUG_HLE_AUDIO));
 
-	m_GfxGroup.Attach(GetDlgItem(IDC_GFX_NAME));
-	m_AudioGroup.Attach(GetDlgItem(IDC_AUDIO_NAME));
-	m_ControlGroup.Attach(GetDlgItem(IDC_CONT_NAME));
-	m_RspGroup.Attach(GetDlgItem(IDC_RSP_NAME));
+    m_GfxGroup.Attach(GetDlgItem(IDC_GFX_NAME));
+    m_AudioGroup.Attach(GetDlgItem(IDC_AUDIO_NAME));
+    m_ControlGroup.Attach(GetDlgItem(IDC_CONT_NAME));
+    m_RspGroup.Attach(GetDlgItem(IDC_RSP_NAME));
 
-	AddPlugins(GFX_LIST, Game_EditPlugin_Gfx, PLUGIN_TYPE_GFX);
-	AddPlugins(AUDIO_LIST, Game_EditPlugin_Audio, PLUGIN_TYPE_AUDIO);
-	AddPlugins(CONT_LIST, Game_EditPlugin_Contr, PLUGIN_TYPE_CONTROLLER);
-	AddPlugins(RSP_LIST, Game_EditPlugin_RSP, PLUGIN_TYPE_RSP);
+    AddPlugins(GFX_LIST, Game_EditPlugin_Gfx, PLUGIN_TYPE_GFX);
+    AddPlugins(AUDIO_LIST, Game_EditPlugin_Audio, PLUGIN_TYPE_AUDIO);
+    AddPlugins(CONT_LIST, Game_EditPlugin_Contr, PLUGIN_TYPE_CONTROLLER);
+    AddPlugins(RSP_LIST, Game_EditPlugin_RSP, PLUGIN_TYPE_RSP);
 
-	AddModCheckBox(GetDlgItem(IDC_HLE_GFX), Game_UseHleGfx);
-	AddModCheckBox(GetDlgItem(IDC_HLE_AUDIO), Game_UseHleAudio);
+    AddModCheckBox(GetDlgItem(IDC_HLE_GFX), Game_UseHleGfx);
+    AddModCheckBox(GetDlgItem(IDC_HLE_AUDIO), Game_UseHleAudio);
 
-	UpdatePageSettings();
+    UpdatePageSettings();
 }
 
 void CGamePluginPage::AddPlugins(int ListId, SettingID Type, PLUGIN_TYPE PluginType)
 {
-	stdstr Default;
-	bool PluginSelected = g_Settings->LoadStringVal(Type, Default);
+    stdstr Default;
+    bool PluginSelected = g_Settings->LoadStringVal(Type, Default);
 
-	CModifiedComboBox * ComboBox;
-	ComboBox = AddModComboBox(GetDlgItem(ListId), Type);
-	if (!PluginSelected)
-	{
-		ComboBox->SetDefault(NULL);
-	}
-	ComboBox->AddItemW(GS(PLUG_DEFAULT), NULL);
+    CModifiedComboBox * ComboBox;
+    ComboBox = AddModComboBox(GetDlgItem(ListId), Type);
+    if (!PluginSelected)
+    {
+        ComboBox->SetDefault(NULL);
+    }
+    ComboBox->AddItemW(GS(PLUG_DEFAULT), NULL);
 
-	for (int i = 0, n = m_PluginList.GetPluginCount(); i < n; i++)
-	{
-		const CPluginList::PLUGIN * Plugin = m_PluginList.GetPluginInfo(i);
-		if (Plugin == NULL)
-		{
-			continue;
-		}
-		if (Plugin->Info.Type != PluginType)
-		{
-			continue;
-		}
-		if (PluginSelected && _stricmp(Default.c_str(), Plugin->FileName.c_str()) == 0)
-		{
-			ComboBox->SetDefault((WPARAM)Plugin);
-		}
-		ComboBox->AddItem(Plugin->Info.Name, (WPARAM)Plugin);
-	}
+    for (int i = 0, n = m_PluginList.GetPluginCount(); i < n; i++)
+    {
+        const CPluginList::PLUGIN * Plugin = m_PluginList.GetPluginInfo(i);
+        if (Plugin == NULL)
+        {
+            continue;
+        }
+        if (Plugin->Info.Type != PluginType)
+        {
+            continue;
+        }
+        if (PluginSelected && _stricmp(Default.c_str(), Plugin->FileName.c_str()) == 0)
+        {
+            ComboBox->SetDefault((WPARAM)Plugin);
+        }
+        ComboBox->AddItem(Plugin->Info.Name, (WPARAM)Plugin);
+    }
 }
 
 void CGamePluginPage::ShowAboutButton(int id)
 {
-	CModifiedComboBox * ComboBox = NULL;
-	for (ComboBoxList::iterator cb_iter = m_ComboBoxList.begin(); cb_iter != m_ComboBoxList.end(); cb_iter++)
-	{
-		if ((int)(cb_iter->second->GetMenu()) != id)
-		{
-			continue;
-		}
-		ComboBox = cb_iter->second;
-		break;
-	}
-	if (ComboBox == NULL)
-	{
-		return;
-	}
-	int index = ComboBox->GetCurSel();
-	if (index == CB_ERR)
-	{
-		return;
-	}
+    CModifiedComboBox * ComboBox = NULL;
+    for (ComboBoxList::iterator cb_iter = m_ComboBoxList.begin(); cb_iter != m_ComboBoxList.end(); cb_iter++)
+    {
+        if ((int)(cb_iter->second->GetMenu()) != id)
+        {
+            continue;
+        }
+        ComboBox = cb_iter->second;
+        break;
+    }
+    if (ComboBox == NULL)
+    {
+        return;
+    }
+    int index = ComboBox->GetCurSel();
+    if (index == CB_ERR)
+    {
+        return;
+    }
 
-	const CPluginList::PLUGIN ** PluginPtr = (const CPluginList::PLUGIN **)ComboBox->GetItemDataPtr(index);
-	if (PluginPtr == NULL)
-	{
-		return;
-	}
+    const CPluginList::PLUGIN ** PluginPtr = (const CPluginList::PLUGIN **)ComboBox->GetItemDataPtr(index);
+    if (PluginPtr == NULL)
+    {
+        return;
+    }
 
-	const CPluginList::PLUGIN * Plugin = *PluginPtr;
-	if (Plugin == NULL)
-	{
-		return;
-	}
+    const CPluginList::PLUGIN * Plugin = *PluginPtr;
+    if (Plugin == NULL)
+    {
+        return;
+    }
 
-	//Load the plugin
-	UINT LastErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
-	HMODULE hLib = LoadLibrary(Plugin->FullPath);
-	SetErrorMode(LastErrorMode);
-	if (hLib == NULL)
-	{
-		return;
-	}
+    //Load the plugin
+    UINT LastErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
+    HMODULE hLib = LoadLibrary(Plugin->FullPath);
+    SetErrorMode(LastErrorMode);
+    if (hLib == NULL)
+    {
+        return;
+    }
 
-	//Get DLL about
-	void(__cdecl *DllAbout) (HWND hWnd);
-	DllAbout = (void(__cdecl *)(HWND))GetProcAddress(hLib, "DllAbout");
+    //Get DLL about
+    void(__cdecl *DllAbout) (HWND hWnd);
+    DllAbout = (void(__cdecl *)(HWND))GetProcAddress(hLib, "DllAbout");
 
-	//call the function from the dll
-	DllAbout(m_hWnd);
+    //call the function from the dll
+    DllAbout(m_hWnd);
 
-	FreeLibrary(hLib);
+    FreeLibrary(hLib);
 }
 
 void CGamePluginPage::PluginItemChanged(int id, int AboutID, bool bSetChanged)
 {
-	CModifiedComboBox * ComboBox = NULL;
-	for (ComboBoxList::iterator cb_iter = m_ComboBoxList.begin(); cb_iter != m_ComboBoxList.end(); cb_iter++)
-	{
-		if ((int)(cb_iter->second->GetMenu()) != id)
-		{
-			continue;
-		}
-		ComboBox = cb_iter->second;
-		break;
-	}
-	if (ComboBox == NULL)
-	{
-		return;
-	}
+    CModifiedComboBox * ComboBox = NULL;
+    for (ComboBoxList::iterator cb_iter = m_ComboBoxList.begin(); cb_iter != m_ComboBoxList.end(); cb_iter++)
+    {
+        if ((int)(cb_iter->second->GetMenu()) != id)
+        {
+            continue;
+        }
+        ComboBox = cb_iter->second;
+        break;
+    }
+    if (ComboBox == NULL)
+    {
+        return;
+    }
 
-	int index = ComboBox->GetCurSel();
-	if (index == CB_ERR)
-	{
-		return;
-	}
-	const CPluginList::PLUGIN ** PluginPtr = (const CPluginList::PLUGIN **)ComboBox->GetItemDataPtr(index);
-	if (PluginPtr)
-	{
-		const CPluginList::PLUGIN * Plugin = *PluginPtr;
-		if (Plugin)
-		{
-			::EnableWindow(GetDlgItem(AboutID), Plugin->AboutFunction);
-		}
-	}
+    int index = ComboBox->GetCurSel();
+    if (index == CB_ERR)
+    {
+        return;
+    }
+    const CPluginList::PLUGIN ** PluginPtr = (const CPluginList::PLUGIN **)ComboBox->GetItemDataPtr(index);
+    if (PluginPtr)
+    {
+        const CPluginList::PLUGIN * Plugin = *PluginPtr;
+        if (Plugin)
+        {
+            ::EnableWindow(GetDlgItem(AboutID), Plugin->AboutFunction);
+        }
+    }
 
-	if (bSetChanged)
-	{
-		ComboBox->SetChanged(true);
-		SendMessage(GetParent(), PSM_CHANGED, (WPARAM)m_hWnd, 0);
-	}
+    if (bSetChanged)
+    {
+        ComboBox->SetChanged(true);
+        SendMessage(GetParent(), PSM_CHANGED, (WPARAM)m_hWnd, 0);
+    }
 }
 
 void CGamePluginPage::UpdatePageSettings(void)
 {
-	UpdateCheckBoxes();
-	for (ComboBoxList::iterator cb_iter = m_ComboBoxList.begin(); cb_iter != m_ComboBoxList.end(); cb_iter++)
-	{
-		CModifiedComboBox * ComboBox = cb_iter->second;
-		stdstr SelectedValue;
+    UpdateCheckBoxes();
+    for (ComboBoxList::iterator cb_iter = m_ComboBoxList.begin(); cb_iter != m_ComboBoxList.end(); cb_iter++)
+    {
+        CModifiedComboBox * ComboBox = cb_iter->second;
+        stdstr SelectedValue;
 
-		bool PluginChanged = g_Settings->LoadStringVal(cb_iter->first, SelectedValue);
-		ComboBox->SetChanged(PluginChanged);
-		if (PluginChanged)
-		{
-			for (int i = 0, n = m_PluginList.GetPluginCount(); i < n; i++)
-			{
-				const CPluginList::PLUGIN * Plugin = m_PluginList.GetPluginInfo(i);
-				if (Plugin == NULL)
-				{
-					continue;
-				}
-				if (_stricmp(SelectedValue.c_str(), Plugin->FileName.c_str()) != 0)
-				{
-					continue;
-				}
-				ComboBox->SetDefault((WPARAM)Plugin);
-			}
-		}
-		else {
-			ComboBox->SetDefault(NULL);
-		}
-	}
-	PluginItemChanged(GFX_LIST, GFX_ABOUT, false);
-	PluginItemChanged(AUDIO_LIST, AUDIO_ABOUT, false);
-	PluginItemChanged(CONT_LIST, CONT_ABOUT, false);
-	PluginItemChanged(RSP_LIST, RSP_ABOUT, false);
+        bool PluginChanged = g_Settings->LoadStringVal(cb_iter->first, SelectedValue);
+        ComboBox->SetChanged(PluginChanged);
+        if (PluginChanged)
+        {
+            for (int i = 0, n = m_PluginList.GetPluginCount(); i < n; i++)
+            {
+                const CPluginList::PLUGIN * Plugin = m_PluginList.GetPluginInfo(i);
+                if (Plugin == NULL)
+                {
+                    continue;
+                }
+                if (_stricmp(SelectedValue.c_str(), Plugin->FileName.c_str()) != 0)
+                {
+                    continue;
+                }
+                ComboBox->SetDefault((WPARAM)Plugin);
+            }
+        }
+        else {
+            ComboBox->SetDefault(NULL);
+        }
+    }
+    PluginItemChanged(GFX_LIST, GFX_ABOUT, false);
+    PluginItemChanged(AUDIO_LIST, AUDIO_ABOUT, false);
+    PluginItemChanged(CONT_LIST, CONT_ABOUT, false);
+    PluginItemChanged(RSP_LIST, RSP_ABOUT, false);
 }
 
 void CGamePluginPage::HidePage()
 {
-	ShowWindow(SW_HIDE);
+    ShowWindow(SW_HIDE);
 }
 
 void CGamePluginPage::ShowPage()
 {
-	ShowWindow(SW_SHOW);
+    ShowWindow(SW_SHOW);
 }
 
 void CGamePluginPage::ApplySettings(bool UpdateScreen)
 {
-	CSettingsPageImpl<CGamePluginPage>::ApplySettings(UpdateScreen);
+    CSettingsPageImpl<CGamePluginPage>::ApplySettings(UpdateScreen);
 }
 
 bool CGamePluginPage::EnableReset(void)
 {
-	if (CSettingsPageImpl<CGamePluginPage>::EnableReset()) { return true; }
-	return false;
+    if (CSettingsPageImpl<CGamePluginPage>::EnableReset()) { return true; }
+    return false;
 }
 
 void CGamePluginPage::ResetPage()
 {
-	CSettingsPageImpl<CGamePluginPage>::ResetPage();
+    CSettingsPageImpl<CGamePluginPage>::ResetPage();
 }
 
 void CGamePluginPage::ApplyComboBoxes(void)
 {
-	for (ComboBoxList::iterator cb_iter = m_ComboBoxList.begin(); cb_iter != m_ComboBoxList.end(); cb_iter++)
-	{
-		CModifiedComboBox * ComboBox = cb_iter->second;
-		if (ComboBox->IsChanged())
-		{
-			int index = ComboBox->GetCurSel();
-			if (index == CB_ERR)
-			{
-				return;
-			}
+    for (ComboBoxList::iterator cb_iter = m_ComboBoxList.begin(); cb_iter != m_ComboBoxList.end(); cb_iter++)
+    {
+        CModifiedComboBox * ComboBox = cb_iter->second;
+        if (ComboBox->IsChanged())
+        {
+            int index = ComboBox->GetCurSel();
+            if (index == CB_ERR)
+            {
+                return;
+            }
 
-			const CPluginList::PLUGIN ** PluginPtr = (const CPluginList::PLUGIN **)ComboBox->GetItemDataPtr(index);
-			if (PluginPtr == NULL)
-			{
-				return;
-			}
+            const CPluginList::PLUGIN ** PluginPtr = (const CPluginList::PLUGIN **)ComboBox->GetItemDataPtr(index);
+            if (PluginPtr == NULL)
+            {
+                return;
+            }
 
-			const CPluginList::PLUGIN * Plugin = *PluginPtr;
+            const CPluginList::PLUGIN * Plugin = *PluginPtr;
 
-			if (Plugin)
-			{
-				if (g_Settings->LoadStringVal(cb_iter->first) != Plugin->FileName.c_str())
-				{
-					g_Settings->SaveString(cb_iter->first, Plugin->FileName.c_str());
-				}
-			}
-			else {
-				g_Settings->DeleteSetting(cb_iter->first);
-			}
-		}
-		if (ComboBox->IsReset())
-		{
-			g_Settings->DeleteSetting(cb_iter->first);
-			ComboBox->SetReset(false);
-		}
-	}
+            if (Plugin)
+            {
+                if (g_Settings->LoadStringVal(cb_iter->first) != Plugin->FileName.c_str())
+                {
+                    g_Settings->SaveString(cb_iter->first, Plugin->FileName.c_str());
+                }
+            }
+            else {
+                g_Settings->DeleteSetting(cb_iter->first);
+            }
+        }
+        if (ComboBox->IsReset())
+        {
+            g_Settings->DeleteSetting(cb_iter->first);
+            ComboBox->SetReset(false);
+        }
+    }
 }
 
 bool CGamePluginPage::ResetComboBox(CModifiedComboBox & ComboBox, SettingID /*Type*/)
 {
-	if (!ComboBox.IsChanged())
-	{
-		return false;
-	}
+    if (!ComboBox.IsChanged())
+    {
+        return false;
+    }
 
-	ComboBox.SetReset(true);
-	for (int i = 0, n = ComboBox.GetCount(); i < n; i++)
-	{
-		const CPluginList::PLUGIN ** PluginPtr = (const CPluginList::PLUGIN **)ComboBox.GetItemDataPtr(i);
-		if (PluginPtr == NULL)
-		{
-			continue;
-		}
-		if (*PluginPtr != NULL)
-		{
-			continue;
-		}
-		ComboBox.SetCurSel(i);
-		return true;
-	}
-	return false;
+    ComboBox.SetReset(true);
+    for (int i = 0, n = ComboBox.GetCount(); i < n; i++)
+    {
+        const CPluginList::PLUGIN ** PluginPtr = (const CPluginList::PLUGIN **)ComboBox.GetItemDataPtr(i);
+        if (PluginPtr == NULL)
+        {
+            continue;
+        }
+        if (*PluginPtr != NULL)
+        {
+            continue;
+        }
+        ComboBox.SetCurSel(i);
+        return true;
+    }
+    return false;
 }
 
 void CGamePluginPage::HleGfxChanged(UINT /*Code*/, int id, HWND /*ctl*/)
 {
-	for (ButtonList::iterator iter = m_ButtonList.begin(); iter != m_ButtonList.end(); iter++)
-	{
-		CModifiedButton * Button = iter->second;
-		if ((int)Button->GetMenu() != id)
-		{
-			continue;
-		}
-		if ((Button->GetCheck() & BST_CHECKED) == 0)
-		{
-			int res = MessageBoxW(m_hWnd, GS(MSG_SET_LLE_GFX_MSG), GS(MSG_SET_LLE_GFX_TITLE), MB_YESNO | MB_ICONWARNING);
-			if (res != IDYES)
-			{
-				Button->SetCheck(BST_CHECKED);
-				return;
-			}
-		}
-		Button->SetChanged(true);
-		SendMessage(GetParent(), PSM_CHANGED, (WPARAM)m_hWnd, 0);
-		break;
-	}
+    for (ButtonList::iterator iter = m_ButtonList.begin(); iter != m_ButtonList.end(); iter++)
+    {
+        CModifiedButton * Button = iter->second;
+        if ((int)Button->GetMenu() != id)
+        {
+            continue;
+        }
+        if ((Button->GetCheck() & BST_CHECKED) == 0)
+        {
+            int res = MessageBoxW(m_hWnd, GS(MSG_SET_LLE_GFX_MSG), GS(MSG_SET_LLE_GFX_TITLE), MB_YESNO | MB_ICONWARNING);
+            if (res != IDYES)
+            {
+                Button->SetCheck(BST_CHECKED);
+                return;
+            }
+        }
+        Button->SetChanged(true);
+        SendMessage(GetParent(), PSM_CHANGED, (WPARAM)m_hWnd, 0);
+        break;
+    }
 }
 
 void CGamePluginPage::HleAudioChanged(UINT /*Code*/, int id, HWND /*ctl*/)
 {
-	for (ButtonList::iterator iter = m_ButtonList.begin(); iter != m_ButtonList.end(); iter++)
-	{
-		CModifiedButton * Button = iter->second;
-		if ((int)Button->GetMenu() != id)
-		{
-			continue;
-		}
-		if ((Button->GetCheck() & BST_CHECKED) != 0)
-		{
-			int res = MessageBoxW(m_hWnd, GS(MSG_SET_HLE_AUD_MSG), GS(MSG_SET_HLE_AUD_TITLE), MB_ICONWARNING | MB_YESNO);
-			if (res != IDYES)
-			{
-				Button->SetCheck(BST_UNCHECKED);
-				return;
-			}
-		}
-		Button->SetChanged(true);
-		SendMessage(GetParent(), PSM_CHANGED, (WPARAM)m_hWnd, 0);
-		break;
-	}
-}
+    for (ButtonList::iterator iter = m_ButtonList.begin(); iter != m_ButtonList.end(); iter++)
+    {
+        CModifiedButton * Button = iter->second;
+        if ((int)Button->GetMenu() != id)
+        {
+            continue;
+        }
+        if ((Button->GetCheck() & BST_CHECKED) != 0)
+        {
+            int res = MessageBoxW(m_hWnd, GS(MSG_SET_HLE_AUD_MSG), GS(MSG_SET_HLE_AUD_TITLE), MB_ICONWARNING | MB_YESNO);
+            if (res != IDYES)
+            {
+                Button->SetCheck(BST_UNCHECKED);
+                return;
+            }
+        }
+        Button->SetChanged(true);
+        SendMessage(GetParent(), PSM_CHANGED, (WPARAM)m_hWnd, 0);
+        break;
+    }
+}
\ No newline at end of file
diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h
index ba1c42622..11e3d0eef 100644
--- a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h
+++ b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h
@@ -14,56 +14,56 @@
 #include <Project64\Plugins\PluginList.h>
 
 class CGamePluginPage :
-	public CSettingsPageImpl<CGamePluginPage>,
-	public CSettingsPage
+    public CSettingsPageImpl<CGamePluginPage>,
+    public CSettingsPage
 {
-	BEGIN_MSG_MAP_EX(CGamePluginPage)
-		COMMAND_HANDLER_EX(GFX_LIST, LBN_SELCHANGE, GfxPluginChanged)
-		COMMAND_HANDLER_EX(AUDIO_LIST, LBN_SELCHANGE, AudioPluginChanged)
-		COMMAND_HANDLER_EX(CONT_LIST, LBN_SELCHANGE, ControllerPluginChanged)
-		COMMAND_HANDLER_EX(RSP_LIST, LBN_SELCHANGE, RspPluginChanged)
-		COMMAND_ID_HANDLER_EX(GFX_ABOUT, GfxPluginAbout)
-		COMMAND_ID_HANDLER_EX(AUDIO_ABOUT, AudioPluginAbout)
-		COMMAND_ID_HANDLER_EX(CONT_ABOUT, ControllerPluginAbout)
-		COMMAND_ID_HANDLER_EX(RSP_ABOUT, RspPluginAbout)
-		COMMAND_ID_HANDLER_EX(IDC_HLE_GFX, HleGfxChanged)
-		COMMAND_ID_HANDLER_EX(IDC_HLE_AUDIO, HleAudioChanged)
-		END_MSG_MAP()
+    BEGIN_MSG_MAP_EX(CGamePluginPage)
+        COMMAND_HANDLER_EX(GFX_LIST, LBN_SELCHANGE, GfxPluginChanged)
+        COMMAND_HANDLER_EX(AUDIO_LIST, LBN_SELCHANGE, AudioPluginChanged)
+        COMMAND_HANDLER_EX(CONT_LIST, LBN_SELCHANGE, ControllerPluginChanged)
+        COMMAND_HANDLER_EX(RSP_LIST, LBN_SELCHANGE, RspPluginChanged)
+        COMMAND_ID_HANDLER_EX(GFX_ABOUT, GfxPluginAbout)
+        COMMAND_ID_HANDLER_EX(AUDIO_ABOUT, AudioPluginAbout)
+        COMMAND_ID_HANDLER_EX(CONT_ABOUT, ControllerPluginAbout)
+        COMMAND_ID_HANDLER_EX(RSP_ABOUT, RspPluginAbout)
+        COMMAND_ID_HANDLER_EX(IDC_HLE_GFX, HleGfxChanged)
+        COMMAND_ID_HANDLER_EX(IDC_HLE_AUDIO, HleAudioChanged)
+    END_MSG_MAP()
 
-		enum { IDD = IDD_Settings_GamePlugin };
+    enum { IDD = IDD_Settings_GamePlugin };
 
 public:
-	CGamePluginPage(HWND hParent, const RECT & rcDispay);
+    CGamePluginPage(HWND hParent, const RECT & rcDispay);
 
-	LanguageStringID PageTitle(void) { return TAB_PLUGIN; }
-	void             HidePage(void);
-	void             ShowPage(void);
-	void             ApplySettings(bool UpdateScreen);
-	bool             EnableReset(void);
-	void             ResetPage(void);
+    LanguageStringID PageTitle(void) { return TAB_PLUGIN; }
+    void             HidePage(void);
+    void             ShowPage(void);
+    void             ApplySettings(bool UpdateScreen);
+    bool             EnableReset(void);
+    void             ResetPage(void);
 
 private:
-	void GfxPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(GFX_LIST); }
-	void AudioPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(AUDIO_LIST); }
-	void ControllerPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(CONT_LIST); }
-	void RspPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(RSP_LIST); }
+    void GfxPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(GFX_LIST); }
+    void AudioPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(AUDIO_LIST); }
+    void ControllerPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(CONT_LIST); }
+    void RspPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(RSP_LIST); }
 
-	void GfxPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(GFX_LIST, GFX_ABOUT); }
-	void AudioPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(AUDIO_LIST, AUDIO_ABOUT); }
-	void ControllerPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(CONT_LIST, CONT_ABOUT); }
-	void RspPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(RSP_LIST, RSP_ABOUT); }
+    void GfxPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(GFX_LIST, GFX_ABOUT); }
+    void AudioPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(AUDIO_LIST, AUDIO_ABOUT); }
+    void ControllerPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(CONT_LIST, CONT_ABOUT); }
+    void RspPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(RSP_LIST, RSP_ABOUT); }
 
-	void HleGfxChanged(UINT Code, int id, HWND ctl);
-	void HleAudioChanged(UINT Code, int id, HWND ctl);
+    void HleGfxChanged(UINT Code, int id, HWND ctl);
+    void HleAudioChanged(UINT Code, int id, HWND ctl);
 
-	void ShowAboutButton(int id);
-	void PluginItemChanged(int id, int AboutID, bool bSetChanged = true);
+    void ShowAboutButton(int id);
+    void PluginItemChanged(int id, int AboutID, bool bSetChanged = true);
 
-	void AddPlugins(int ListId, SettingID Type, PLUGIN_TYPE PluginType);
-	void UpdatePageSettings(void);
-	void ApplyComboBoxes(void);
-	bool ResetComboBox(CModifiedComboBox & ComboBox, SettingID Type);
+    void AddPlugins(int ListId, SettingID Type, PLUGIN_TYPE PluginType);
+    void UpdatePageSettings(void);
+    void ApplyComboBoxes(void);
+    bool ResetComboBox(CModifiedComboBox & ComboBox, SettingID Type);
 
-	CPartialGroupBox m_GfxGroup, m_AudioGroup, m_ControlGroup, m_RspGroup;
-	CPluginList      m_PluginList;
+    CPartialGroupBox m_GfxGroup, m_AudioGroup, m_ControlGroup, m_RspGroup;
+    CPluginList      m_PluginList;
 };