diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs
index 255728fc6a..8d4e320441 100644
--- a/BizHawk.MultiClient/Config.cs
+++ b/BizHawk.MultiClient/Config.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Drawing;
+using System.Collections.Generic;
 
 namespace BizHawk.MultiClient
 {
@@ -266,71 +267,73 @@ namespace BizHawk.MultiClient
 		public int N64VideoSizeY = 240;
 
 	
-		public int RiceFrameBufferSetting = 0;
-		public int RiceFrameBufferWriteBackControl = 0;
-		public int RiceRenderToTexture = 0;
-		public int RiceScreenUpdateSetting = 4;
-		public int RiceMipmapping = 2;
-		public int RiceFogMethod = 0;
-		public int RiceForceTextureFilter = 0;
-		public int RiceTextureEnhancement = 0;
-		public int RiceTextureEnhancementControl = 0;
-		public int RiceTextureQuality = 0;
-		public int RiceOpenGLDepthBufferSetting = 16;
-		public int RiceMultiSampling = 0;
-		public int RiceColorQuality = 0;
-		public int RiceOpenGLRenderSetting = 0;
-		public int RiceAnisotropicFiltering = 0;
+		//public int RiceFrameBufferSetting = 0;
+		//public int RiceFrameBufferWriteBackControl = 0;
+		//public int RiceRenderToTexture = 0;
+		//public int RiceScreenUpdateSetting = 4;
+		//public int RiceMipmapping = 2;
+		//public int RiceFogMethod = 0;
+		//public int RiceForceTextureFilter = 0;
+		//public int RiceTextureEnhancement = 0;
+		//public int RiceTextureEnhancementControl = 0;
+		//public int RiceTextureQuality = 0;
+		//public int RiceOpenGLDepthBufferSetting = 16;
+		//public int RiceMultiSampling = 0;
+		//public int RiceColorQuality = 0;
+		//public int RiceOpenGLRenderSetting = 0;
+		//public int RiceAnisotropicFiltering = 0;
 
 		
-		public bool RiceNormalAlphaBlender = false; 
-		public bool RiceFastTextureLoading = false;
-		public bool RiceAccurateTextureMapping = true;
-		public bool RiceInN64Resolution = false;
-		public bool RiceSaveVRAM = false;
-		public bool RiceDoubleSizeForSmallTxtrBuf = false;
-		public bool RiceDefaultCombinerDisable = false;
-		public bool RiceEnableHacks = true;
-		public bool RiceWinFrameMode = false;
-		public bool RiceFullTMEMEmulation = false;
-		public bool RiceOpenGLVertexClipper = false;
-		public bool RiceEnableSSE = true;
-		public bool RiceEnableVertexShader = false;
-		public bool RiceSkipFrame = false;
-		public bool RiceTexRectOnly = false;
-		public bool RiceSmallTextureOnly = false;
-		public bool RiceLoadHiResCRCOnly = true;
-		public bool RiceLoadHiResTextures = false;
-		public bool RiceDumpTexturesToFiles = false;
+		//public bool RiceNormalAlphaBlender = false; 
+		//public bool RiceFastTextureLoading = false;
+		//public bool RiceAccurateTextureMapping = true;
+		//public bool RiceInN64Resolution = false;
+		//public bool RiceSaveVRAM = false;
+		//public bool RiceDoubleSizeForSmallTxtrBuf = false;
+		//public bool RiceDefaultCombinerDisable = false;
+		//public bool RiceEnableHacks = true;
+		//public bool RiceWinFrameMode = false;
+		//public bool RiceFullTMEMEmulation = false;
+		//public bool RiceOpenGLVertexClipper = false;
+		//public bool RiceEnableSSE = true;
+		//public bool RiceEnableVertexShader = false;
+		//public bool RiceSkipFrame = false;
+		//public bool RiceTexRectOnly = false;
+		//public bool RiceSmallTextureOnly = false;
+		//public bool RiceLoadHiResCRCOnly = true;
+		//public bool RiceLoadHiResTextures = false;
+		//public bool RiceDumpTexturesToFiles = false;
 
-		public bool RiceUseDefaultHacks = true;
-		public bool RiceDisableTextureCRC = false;
-		public bool RiceDisableCulling = false;
-		public bool RiceIncTexRectEdge = false;
-		public bool RiceZHack = false;
-		public bool RiceTextureScaleHack = false;
-		public bool RicePrimaryDepthHack = false;
-		public bool RiceTexture1Hack = false;
-		public bool RiceFastLoadTile = false;
-		public bool RiceUseSmallerTexture = false;
-		public int RiceVIWidth = -1;
-		public int RiceVIHeight = -1;
-		public int RiceUseCIWidthAndRatio = 0;
-		public int RiceFullTMEM = 0;
-		public bool RiceTxtSizeMethod2 = false;
-		public bool RiceEnableTxtLOD = false;
-		public int RiceFastTextureCRC = 0;
-		public bool RiceEmulateClear = false;
-		public bool RiceForceScreenClear = false;
-		public int RiceAccurateTextureMappingHack = 0;
-		public int RiceNormalBlender = 0;
-		public bool RiceDisableBlender = false;
-		public bool RiceForceDepthBuffer = false;
-		public bool RiceDisableObjBG = false;
-		public int RiceFrameBufferOption = 0;
-		public int RiceRenderToTextureOption = 0;
-		public int RiceScreenUpdateSettingHack = 0;
-		public int RiceEnableHacksForGame = 0;
+		//public bool RiceUseDefaultHacks = true;
+		//public bool RiceDisableTextureCRC = false;
+		//public bool RiceDisableCulling = false;
+		//public bool RiceIncTexRectEdge = false;
+		//public bool RiceZHack = false;
+		//public bool RiceTextureScaleHack = false;
+		//public bool RicePrimaryDepthHack = false;
+		//public bool RiceTexture1Hack = false;
+		//public bool RiceFastLoadTile = false;
+		//public bool RiceUseSmallerTexture = false;
+		//public int RiceVIWidth = -1;
+		//public int RiceVIHeight = -1;
+		//public int RiceUseCIWidthAndRatio = 0;
+		//public int RiceFullTMEM = 0;
+		//public bool RiceTxtSizeMethod2 = false;
+		//public bool RiceEnableTxtLOD = false;
+		//public int RiceFastTextureCRC = 0;
+		//public bool RiceEmulateClear = false;
+		//public bool RiceForceScreenClear = false;
+		//public int RiceAccurateTextureMappingHack = 0;
+		//public int RiceNormalBlender = 0;
+		//public bool RiceDisableBlender = false;
+		//public bool RiceForceDepthBuffer = false;
+		//public bool RiceDisableObjBG = false;
+		//public int RiceFrameBufferOption = 0;
+		//public int RiceRenderToTextureOption = 0;
+		//public int RiceScreenUpdateSettingHack = 0;
+		//public int RiceEnableHacksForGame = 0;
+
+		public N64RicePluginSettings RicePlugin = new N64RicePluginSettings();
 
 		// General Client Settings
 		public int Input_Hotkey_OverrideOptions = 0;
@@ -1948,4 +1951,104 @@ namespace BizHawk.MultiClient
 	{
 		void SetDefaults();
 	}
+
+
+	public enum PLUGINTYPE { RICE }; 
+
+	public interface iPluginSettings
+	{
+		PLUGINTYPE PluginType { get; }
+		Dictionary<string, object> GetPluginSettings();
+	}
+
+	public class N64RicePluginSettings : iPluginSettings
+	{
+		public PLUGINTYPE PluginType
+		{
+			get { return PLUGINTYPE.RICE; }
+		}
+
+		public Dictionary<string, object> GetPluginSettings()
+		{
+			//TODO: deal witn the game depedent settings
+			Dictionary<string, object> dictionary = new Dictionary<string, object>();
+			System.Reflection.MemberInfo[] members = Global.Config.RicePlugin.GetType().GetMembers();
+			foreach (System.Reflection.MemberInfo member in members)
+			{
+				object field = Global.Config.RicePlugin.GetType().GetField(member.Name).GetValue(Global.Config.RicePlugin);
+				if (member.MemberType.ToString() == "Field")
+				{
+					dictionary.Add(member.Name, member);
+				}
+			}
+
+			return dictionary;
+		}
+
+		public int RiceFrameBufferSetting = 0;
+		public int RiceFrameBufferWriteBackControl = 0;
+		public int RiceRenderToTexture = 0;
+		public int RiceScreenUpdateSetting = 4;
+		public int RiceMipmapping = 2;
+		public int RiceFogMethod = 0;
+		public int RiceForceTextureFilter = 0;
+		public int RiceTextureEnhancement = 0;
+		public int RiceTextureEnhancementControl = 0;
+		public int RiceTextureQuality = 0;
+		public int RiceOpenGLDepthBufferSetting = 16;
+		public int RiceMultiSampling = 0;
+		public int RiceColorQuality = 0;
+		public int RiceOpenGLRenderSetting = 0;
+		public int RiceAnisotropicFiltering = 0;
+
+
+		public bool RiceNormalAlphaBlender = false;
+		public bool RiceFastTextureLoading = false;
+		public bool RiceAccurateTextureMapping = true;
+		public bool RiceInN64Resolution = false;
+		public bool RiceSaveVRAM = false;
+		public bool RiceDoubleSizeForSmallTxtrBuf = false;
+		public bool RiceDefaultCombinerDisable = false;
+		public bool RiceEnableHacks = true;
+		public bool RiceWinFrameMode = false;
+		public bool RiceFullTMEMEmulation = false;
+		public bool RiceOpenGLVertexClipper = false;
+		public bool RiceEnableSSE = true;
+		public bool RiceEnableVertexShader = false;
+		public bool RiceSkipFrame = false;
+		public bool RiceTexRectOnly = false;
+		public bool RiceSmallTextureOnly = false;
+		public bool RiceLoadHiResCRCOnly = true;
+		public bool RiceLoadHiResTextures = false;
+		public bool RiceDumpTexturesToFiles = false;
+
+		public bool RiceUseDefaultHacks = true;
+		public bool RiceDisableTextureCRC = false;
+		public bool RiceDisableCulling = false;
+		public bool RiceIncTexRectEdge = false;
+		public bool RiceZHack = false;
+		public bool RiceTextureScaleHack = false;
+		public bool RicePrimaryDepthHack = false;
+		public bool RiceTexture1Hack = false;
+		public bool RiceFastLoadTile = false;
+		public bool RiceUseSmallerTexture = false;
+		public int RiceVIWidth = -1;
+		public int RiceVIHeight = -1;
+		public int RiceUseCIWidthAndRatio = 0;
+		public int RiceFullTMEM = 0;
+		public bool RiceTxtSizeMethod2 = false;
+		public bool RiceEnableTxtLOD = false;
+		public int RiceFastTextureCRC = 0;
+		public bool RiceEmulateClear = false;
+		public bool RiceForceScreenClear = false;
+		public int RiceAccurateTextureMappingHack = 0;
+		public int RiceNormalBlender = 0;
+		public bool RiceDisableBlender = false;
+		public bool RiceForceDepthBuffer = false;
+		public bool RiceDisableObjBG = false;
+		public int RiceFrameBufferOption = 0;
+		public int RiceRenderToTextureOption = 0;
+		public int RiceScreenUpdateSettingHack = 0;
+		public int RiceEnableHacksForGame = 0;
+	}
 }
\ No newline at end of file
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 1ce0921ec0..86fdb2621b 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -3867,42 +3867,46 @@ namespace BizHawk.MultiClient
 			VideoPluginSettings video_settings = new VideoPluginSettings(Global.Config.N64VidPlugin, Global.Config.N64VideoSizeX, Global.Config.N64VideoSizeY);
 			if (Global.Config.N64VidPlugin == "Rice")
 			{
-				video_settings.Parameters.Add("NormalAlphaBlender", Global.Config.RiceNormalAlphaBlender);
-				video_settings.Parameters.Add("FastTextureLoading", Global.Config.RiceFastTextureLoading);
-				video_settings.Parameters.Add("AccurateTextureMapping", Global.Config.RiceAccurateTextureMapping);
-				video_settings.Parameters.Add("InN64Resolution", Global.Config.RiceInN64Resolution);
-				video_settings.Parameters.Add("SaveVRAM", Global.Config.RiceSaveVRAM);
-				video_settings.Parameters.Add("DoubleSizeForSmallTxtrBuf", Global.Config.RiceDoubleSizeForSmallTxtrBuf);
-				video_settings.Parameters.Add("DefaultCombinerDisable", Global.Config.RiceDefaultCombinerDisable);
-				video_settings.Parameters.Add("EnableHacks", Global.Config.RiceEnableHacks);
-				video_settings.Parameters.Add("WinFrameMode", Global.Config.RiceWinFrameMode);
-				video_settings.Parameters.Add("FullTMEMEmulation", Global.Config.RiceFullTMEMEmulation);
-				video_settings.Parameters.Add("OpenGLVertexClipper", Global.Config.RiceOpenGLVertexClipper);
-				video_settings.Parameters.Add("EnableSSE", Global.Config.RiceEnableSSE);
-				video_settings.Parameters.Add("EnableVertexShader", Global.Config.RiceEnableVertexShader);
-				video_settings.Parameters.Add("SkipFrame", Global.Config.RiceSkipFrame);
-				video_settings.Parameters.Add("TexRectOnly", Global.Config.RiceTexRectOnly);
-				video_settings.Parameters.Add("SmallTextureOnly", Global.Config.RiceSmallTextureOnly);
-				video_settings.Parameters.Add("LoadHiResCRCOnly", Global.Config.RiceLoadHiResCRCOnly);
-				video_settings.Parameters.Add("LoadHiResTextures", Global.Config.RiceLoadHiResTextures);
-				video_settings.Parameters.Add("DumpTexturesToFiles", Global.Config.RiceDumpTexturesToFiles);
-				video_settings.Parameters.Add("FrameBufferSetting", Global.Config.RiceFrameBufferSetting);
-				video_settings.Parameters.Add("FrameBufferWriteBackControl", Global.Config.RiceFrameBufferWriteBackControl);
-				video_settings.Parameters.Add("RenderToTexture", Global.Config.RiceRenderToTexture);
-				video_settings.Parameters.Add("ScreenUpdateSetting", Global.Config.RiceScreenUpdateSetting);
-				video_settings.Parameters.Add("Mipmapping", Global.Config.RiceMipmapping);
-				video_settings.Parameters.Add("FogMethod", Global.Config.RiceFogMethod);
-				video_settings.Parameters.Add("ForceTextureFilter", Global.Config.RiceForceTextureFilter);
-				video_settings.Parameters.Add("TextureEnhancement", Global.Config.RiceTextureEnhancement);
-				video_settings.Parameters.Add("TextureEnhancementControl", Global.Config.RiceTextureEnhancementControl);
-				video_settings.Parameters.Add("TextureQuality", Global.Config.RiceTextureQuality);
-				video_settings.Parameters.Add("OpenGLDepthBufferSetting", Global.Config.RiceOpenGLDepthBufferSetting);
-				video_settings.Parameters.Add("MultiSampling", Global.Config.RiceMultiSampling);
-				video_settings.Parameters.Add("ColorQuality", Global.Config.RiceColorQuality);
-				video_settings.Parameters.Add("OpenGLRenderSetting", Global.Config.RiceOpenGLRenderSetting);
-				video_settings.Parameters.Add("AnisotropicFiltering", Global.Config.RiceAnisotropicFiltering);
 
-				if (Global.Config.RiceUseDefaultHacks)
+				//TODO: figure out game dependent values, and then do this:
+				//video_settings.Parameters = Global.Config.RicePlugin.GetPluginSettings();
+
+				video_settings.Parameters.Add("NormalAlphaBlender", Global.Config.RicePlugin.RiceNormalAlphaBlender);
+				video_settings.Parameters.Add("FastTextureLoading", Global.Config.RicePlugin.RiceFastTextureLoading);
+				video_settings.Parameters.Add("AccurateTextureMapping", Global.Config.RicePlugin.RiceAccurateTextureMapping);
+				video_settings.Parameters.Add("InN64Resolution", Global.Config.RicePlugin.RiceInN64Resolution);
+				video_settings.Parameters.Add("SaveVRAM", Global.Config.RicePlugin.RiceSaveVRAM);
+				video_settings.Parameters.Add("DoubleSizeForSmallTxtrBuf", Global.Config.RicePlugin.RiceDoubleSizeForSmallTxtrBuf);
+				video_settings.Parameters.Add("DefaultCombinerDisable", Global.Config.RicePlugin.RiceDefaultCombinerDisable);
+				video_settings.Parameters.Add("EnableHacks", Global.Config.RicePlugin.RiceEnableHacks);
+				video_settings.Parameters.Add("WinFrameMode", Global.Config.RicePlugin.RiceWinFrameMode);
+				video_settings.Parameters.Add("FullTMEMEmulation", Global.Config.RicePlugin.RiceFullTMEMEmulation);
+				video_settings.Parameters.Add("OpenGLVertexClipper", Global.Config.RicePlugin.RiceOpenGLVertexClipper);
+				video_settings.Parameters.Add("EnableSSE", Global.Config.RicePlugin.RiceEnableSSE);
+				video_settings.Parameters.Add("EnableVertexShader", Global.Config.RicePlugin.RiceEnableVertexShader);
+				video_settings.Parameters.Add("SkipFrame", Global.Config.RicePlugin.RiceSkipFrame);
+				video_settings.Parameters.Add("TexRectOnly", Global.Config.RicePlugin.RiceTexRectOnly);
+				video_settings.Parameters.Add("SmallTextureOnly", Global.Config.RicePlugin.RiceSmallTextureOnly);
+				video_settings.Parameters.Add("LoadHiResCRCOnly", Global.Config.RicePlugin.RiceLoadHiResCRCOnly);
+				video_settings.Parameters.Add("LoadHiResTextures", Global.Config.RicePlugin.RiceLoadHiResTextures);
+				video_settings.Parameters.Add("DumpTexturesToFiles", Global.Config.RicePlugin.RiceDumpTexturesToFiles);
+				video_settings.Parameters.Add("FrameBufferSetting", Global.Config.RicePlugin.RiceFrameBufferSetting);
+				video_settings.Parameters.Add("FrameBufferWriteBackControl", Global.Config.RicePlugin.RiceFrameBufferWriteBackControl);
+				video_settings.Parameters.Add("RenderToTexture", Global.Config.RicePlugin.RiceRenderToTexture);
+				video_settings.Parameters.Add("ScreenUpdateSetting", Global.Config.RicePlugin.RiceScreenUpdateSetting);
+				video_settings.Parameters.Add("Mipmapping", Global.Config.RicePlugin.RiceMipmapping);
+				video_settings.Parameters.Add("FogMethod", Global.Config.RicePlugin.RiceFogMethod);
+				video_settings.Parameters.Add("ForceTextureFilter", Global.Config.RicePlugin.RiceForceTextureFilter);
+				video_settings.Parameters.Add("TextureEnhancement", Global.Config.RicePlugin.RiceTextureEnhancement);
+				video_settings.Parameters.Add("TextureEnhancementControl", Global.Config.RicePlugin.RiceTextureEnhancementControl);
+				video_settings.Parameters.Add("TextureQuality", Global.Config.RicePlugin.RiceTextureQuality);
+				video_settings.Parameters.Add("OpenGLDepthBufferSetting", Global.Config.RicePlugin.RiceOpenGLDepthBufferSetting);
+				video_settings.Parameters.Add("MultiSampling", Global.Config.RicePlugin.RiceMultiSampling);
+				video_settings.Parameters.Add("ColorQuality", Global.Config.RicePlugin.RiceColorQuality);
+				video_settings.Parameters.Add("OpenGLRenderSetting", Global.Config.RicePlugin.RiceOpenGLRenderSetting);
+				video_settings.Parameters.Add("AnisotropicFiltering", Global.Config.RicePlugin.RiceAnisotropicFiltering);
+
+				if (Global.Config.RicePlugin.RiceUseDefaultHacks)
 				{
 					video_settings.Parameters.Add("DisableTextureCRC", N64GetBoolFromDB("RiceDisableTextureCRC"));
 					video_settings.Parameters.Add("DisableCulling", N64GetBoolFromDB("RiceDisableCulling"));
@@ -3934,33 +3938,33 @@ namespace BizHawk.MultiClient
 				}
 				else
 				{
-					video_settings.Parameters.Add("DisableTextureCRC", Global.Config.RiceDisableTextureCRC);
-					video_settings.Parameters.Add("DisableCulling", Global.Config.RiceDisableCulling);
-					video_settings.Parameters.Add("IncTexRectEdge", Global.Config.RiceIncTexRectEdge);
-					video_settings.Parameters.Add("ZHack", Global.Config.RiceZHack);
-					video_settings.Parameters.Add("TextureScaleHack", Global.Config.RiceTextureScaleHack);
-					video_settings.Parameters.Add("PrimaryDepthHack", Global.Config.RicePrimaryDepthHack);
-					video_settings.Parameters.Add("Texture1Hack", Global.Config.RiceTexture1Hack);
-					video_settings.Parameters.Add("FastLoadTile", Global.Config.RiceFastLoadTile);
-					video_settings.Parameters.Add("UseSmallerTexture", Global.Config.RiceUseSmallerTexture);
-					video_settings.Parameters.Add("VIWidth", Global.Config.RiceVIWidth);
-					video_settings.Parameters.Add("VIHeight", Global.Config.RiceVIHeight);
-					video_settings.Parameters.Add("UseCIWidthAndRatio", Global.Config.RiceUseCIWidthAndRatio);
-					video_settings.Parameters.Add("FullTMEM", Global.Config.RiceFullTMEM);
-					video_settings.Parameters.Add("TxtSizeMethod2", Global.Config.RiceTxtSizeMethod2);
-					video_settings.Parameters.Add("EnableTxtLOD", Global.Config.RiceEnableTxtLOD);
-					video_settings.Parameters.Add("FastTextureCRC", Global.Config.RiceFastTextureCRC);
-					video_settings.Parameters.Add("EmulateClear", Global.Config.RiceEmulateClear);
-					video_settings.Parameters.Add("ForceScreenClear", Global.Config.RiceForceScreenClear);
-					video_settings.Parameters.Add("AccurateTextureMappingHack", Global.Config.RiceAccurateTextureMappingHack);
-					video_settings.Parameters.Add("NormalBlender", Global.Config.RiceNormalBlender);
-					video_settings.Parameters.Add("DisableBlender", Global.Config.RiceDisableBlender);
-					video_settings.Parameters.Add("ForceDepthBuffer", Global.Config.RiceForceDepthBuffer);
-					video_settings.Parameters.Add("DisableObjBG", Global.Config.RiceDisableObjBG);
-					video_settings.Parameters.Add("FrameBufferOption", Global.Config.RiceFrameBufferOption);
-					video_settings.Parameters.Add("RenderToTextureOption", Global.Config.RiceRenderToTextureOption);
-					video_settings.Parameters.Add("ScreenUpdateSettingHack", Global.Config.RiceScreenUpdateSettingHack);
-					video_settings.Parameters.Add("EnableHacksForGame", Global.Config.RiceEnableHacksForGame);
+					video_settings.Parameters.Add("DisableTextureCRC", Global.Config.RicePlugin.RiceDisableTextureCRC);
+					video_settings.Parameters.Add("DisableCulling", Global.Config.RicePlugin.RiceDisableCulling);
+					video_settings.Parameters.Add("IncTexRectEdge", Global.Config.RicePlugin.RiceIncTexRectEdge);
+					video_settings.Parameters.Add("ZHack", Global.Config.RicePlugin.RiceZHack);
+					video_settings.Parameters.Add("TextureScaleHack", Global.Config.RicePlugin.RiceTextureScaleHack);
+					video_settings.Parameters.Add("PrimaryDepthHack", Global.Config.RicePlugin.RicePrimaryDepthHack);
+					video_settings.Parameters.Add("Texture1Hack", Global.Config.RicePlugin.RiceTexture1Hack);
+					video_settings.Parameters.Add("FastLoadTile", Global.Config.RicePlugin.RiceFastLoadTile);
+					video_settings.Parameters.Add("UseSmallerTexture", Global.Config.RicePlugin.RiceUseSmallerTexture);
+					video_settings.Parameters.Add("VIWidth", Global.Config.RicePlugin.RiceVIWidth);
+					video_settings.Parameters.Add("VIHeight", Global.Config.RicePlugin.RiceVIHeight);
+					video_settings.Parameters.Add("UseCIWidthAndRatio", Global.Config.RicePlugin.RiceUseCIWidthAndRatio);
+					video_settings.Parameters.Add("FullTMEM", Global.Config.RicePlugin.RiceFullTMEM);
+					video_settings.Parameters.Add("TxtSizeMethod2", Global.Config.RicePlugin.RiceTxtSizeMethod2);
+					video_settings.Parameters.Add("EnableTxtLOD", Global.Config.RicePlugin.RiceEnableTxtLOD);
+					video_settings.Parameters.Add("FastTextureCRC", Global.Config.RicePlugin.RiceFastTextureCRC);
+					video_settings.Parameters.Add("EmulateClear", Global.Config.RicePlugin.RiceEmulateClear);
+					video_settings.Parameters.Add("ForceScreenClear", Global.Config.RicePlugin.RiceForceScreenClear);
+					video_settings.Parameters.Add("AccurateTextureMappingHack", Global.Config.RicePlugin.RiceAccurateTextureMappingHack);
+					video_settings.Parameters.Add("NormalBlender", Global.Config.RicePlugin.RiceNormalBlender);
+					video_settings.Parameters.Add("DisableBlender", Global.Config.RicePlugin.RiceDisableBlender);
+					video_settings.Parameters.Add("ForceDepthBuffer", Global.Config.RicePlugin.RiceForceDepthBuffer);
+					video_settings.Parameters.Add("DisableObjBG", Global.Config.RicePlugin.RiceDisableObjBG);
+					video_settings.Parameters.Add("FrameBufferOption", Global.Config.RicePlugin.RiceFrameBufferOption);
+					video_settings.Parameters.Add("RenderToTextureOption", Global.Config.RicePlugin.RiceRenderToTextureOption);
+					video_settings.Parameters.Add("ScreenUpdateSettingHack", Global.Config.RicePlugin.RiceScreenUpdateSettingHack);
+					video_settings.Parameters.Add("EnableHacksForGame", Global.Config.RicePlugin.RiceEnableHacksForGame);
 				}
 			}
 
diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs
index 0681157ec2..41396ca2ca 100644
--- a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs
+++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.cs
@@ -39,87 +39,87 @@ namespace BizHawk.MultiClient
 			Global.MainForm.FlagNeedsReboot(); //TODO: this won't always be necessary, keep that in mind
 			
 			//Rice
-			Global.Config.RiceNormalAlphaBlender = RiceNormalAlphaBlender_CB.Checked;
-			Global.Config.RiceFastTextureLoading = RiceFastTextureLoading_CB.Checked;
-			Global.Config.RiceAccurateTextureMapping = RiceAccurateTextureMapping_CB.Checked;
-			Global.Config.RiceInN64Resolution = RiceInN64Resolution_CB.Checked;
-			Global.Config.RiceSaveVRAM = RiceSaveVRAM_CB.Checked;
-			Global.Config.RiceDoubleSizeForSmallTxtrBuf = RiceDoubleSizeForSmallTxtrBuf_CB.Checked;
-			Global.Config.RiceDefaultCombinerDisable = RiceDefaultCombinerDisable_CB.Checked;
-			Global.Config.RiceEnableHacks = RiceEnableHacks_CB.Checked;
-			Global.Config.RiceWinFrameMode = RiceWinFrameMode_CB.Checked;
-			Global.Config.RiceFullTMEMEmulation = RiceFullTMEMEmulation_CB.Checked;
-			Global.Config.RiceOpenGLVertexClipper = RiceOpenGLVertexClipper_CB.Checked;
-			Global.Config.RiceEnableSSE = RiceEnableSSE_CB.Checked;
-			Global.Config.RiceEnableVertexShader = RiceEnableVertexShader_CB.Checked;
-			Global.Config.RiceSkipFrame = RiceSkipFrame_CB.Checked;
-			Global.Config.RiceTexRectOnly = RiceTexRectOnly_CB.Checked;
-			Global.Config.RiceSmallTextureOnly = RiceSmallTextureOnly_CB.Checked;
-			Global.Config.RiceLoadHiResCRCOnly = RiceLoadHiResCRCOnly_CB.Checked;
-			Global.Config.RiceLoadHiResTextures = RiceLoadHiResTextures_CB.Checked;
-			Global.Config.RiceDumpTexturesToFiles = RiceDumpTexturesToFiles_CB.Checked;
+			Global.Config.RicePlugin.RiceNormalAlphaBlender = RiceNormalAlphaBlender_CB.Checked;
+			Global.Config.RicePlugin.RiceFastTextureLoading = RiceFastTextureLoading_CB.Checked;
+			Global.Config.RicePlugin.RiceAccurateTextureMapping = RiceAccurateTextureMapping_CB.Checked;
+			Global.Config.RicePlugin.RiceInN64Resolution = RiceInN64Resolution_CB.Checked;
+			Global.Config.RicePlugin.RiceSaveVRAM = RiceSaveVRAM_CB.Checked;
+			Global.Config.RicePlugin.RiceDoubleSizeForSmallTxtrBuf = RiceDoubleSizeForSmallTxtrBuf_CB.Checked;
+			Global.Config.RicePlugin.RiceDefaultCombinerDisable = RiceDefaultCombinerDisable_CB.Checked;
+			Global.Config.RicePlugin.RiceEnableHacks = RiceEnableHacks_CB.Checked;
+			Global.Config.RicePlugin.RiceWinFrameMode = RiceWinFrameMode_CB.Checked;
+			Global.Config.RicePlugin.RiceFullTMEMEmulation = RiceFullTMEMEmulation_CB.Checked;
+			Global.Config.RicePlugin.RiceOpenGLVertexClipper = RiceOpenGLVertexClipper_CB.Checked;
+			Global.Config.RicePlugin.RiceEnableSSE = RiceEnableSSE_CB.Checked;
+			Global.Config.RicePlugin.RiceEnableVertexShader = RiceEnableVertexShader_CB.Checked;
+			Global.Config.RicePlugin.RiceSkipFrame = RiceSkipFrame_CB.Checked;
+			Global.Config.RicePlugin.RiceTexRectOnly = RiceTexRectOnly_CB.Checked;
+			Global.Config.RicePlugin.RiceSmallTextureOnly = RiceSmallTextureOnly_CB.Checked;
+			Global.Config.RicePlugin.RiceLoadHiResCRCOnly = RiceLoadHiResCRCOnly_CB.Checked;
+			Global.Config.RicePlugin.RiceLoadHiResTextures = RiceLoadHiResTextures_CB.Checked;
+			Global.Config.RicePlugin.RiceDumpTexturesToFiles = RiceDumpTexturesToFiles_CB.Checked;
 
-			Global.Config.RiceFrameBufferSetting = RiceFrameBufferSetting_Combo.SelectedIndex;
-			Global.Config.RiceFrameBufferWriteBackControl = RiceFrameBufferWriteBackControl_Combo.SelectedIndex;
-			Global.Config.RiceRenderToTexture = RiceRenderToTexture_Combo.SelectedIndex;
-			Global.Config.RiceScreenUpdateSetting = RiceScreenUpdateSetting_Combo.SelectedIndex;
-			Global.Config.RiceMipmapping = RiceMipmapping_Combo.SelectedIndex;
-			Global.Config.RiceFogMethod = RiceFogMethod_Combo.SelectedIndex;
-			Global.Config.RiceForceTextureFilter = RiceForceTextureFilter_Combo.SelectedIndex;
-			Global.Config.RiceTextureEnhancement = RiceTextureEnhancement_Combo.SelectedIndex;
-			Global.Config.RiceTextureEnhancementControl = RiceTextureEnhancementControl_Combo.SelectedIndex;
-			Global.Config.RiceTextureQuality = RiceTextureQuality_Combo.SelectedIndex;
-			Global.Config.RiceOpenGLDepthBufferSetting = (RiceOpenGLDepthBufferSetting_Combo.SelectedIndex + 1) * 16;
+			Global.Config.RicePlugin.RiceFrameBufferSetting = RiceFrameBufferSetting_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceFrameBufferWriteBackControl = RiceFrameBufferWriteBackControl_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceRenderToTexture = RiceRenderToTexture_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceScreenUpdateSetting = RiceScreenUpdateSetting_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceMipmapping = RiceMipmapping_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceFogMethod = RiceFogMethod_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceForceTextureFilter = RiceForceTextureFilter_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceTextureEnhancement = RiceTextureEnhancement_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceTextureEnhancementControl = RiceTextureEnhancementControl_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceTextureQuality = RiceTextureQuality_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceOpenGLDepthBufferSetting = (RiceOpenGLDepthBufferSetting_Combo.SelectedIndex + 1) * 16;
 			switch (RiceMultiSampling_Combo.SelectedIndex)
 			{
-				case 0: Global.Config.RiceMultiSampling = 0; break;
-				case 1: Global.Config.RiceMultiSampling = 2; break;
-				case 2: Global.Config.RiceMultiSampling = 4; break;
-				case 3: Global.Config.RiceMultiSampling = 8; break;
-				case 4: Global.Config.RiceMultiSampling = 16; break;
-				default : Global.Config.RiceMultiSampling = 0; break;
+				case 0: Global.Config.RicePlugin.RiceMultiSampling = 0; break;
+				case 1: Global.Config.RicePlugin.RiceMultiSampling = 2; break;
+				case 2: Global.Config.RicePlugin.RiceMultiSampling = 4; break;
+				case 3: Global.Config.RicePlugin.RiceMultiSampling = 8; break;
+				case 4: Global.Config.RicePlugin.RiceMultiSampling = 16; break;
+				default: Global.Config.RicePlugin.RiceMultiSampling = 0; break;
 			}
-			Global.Config.RiceColorQuality = RiceColorQuality_Combo.SelectedIndex;
-			Global.Config.RiceOpenGLRenderSetting = RiceOpenGLRenderSetting_Combo.SelectedIndex;
-			Global.Config.RiceAnisotropicFiltering = RiceAnisotropicFiltering_TB.Value;
+			Global.Config.RicePlugin.RiceColorQuality = RiceColorQuality_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceOpenGLRenderSetting = RiceOpenGLRenderSetting_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceAnisotropicFiltering = RiceAnisotropicFiltering_TB.Value;
 
-			Global.Config.RiceUseDefaultHacks = RiceUseDefaultHacks_CB.Checked;
-			Global.Config.RiceDisableTextureCRC = RiceDisableTextureCRC_CB.Checked;
-			Global.Config.RiceDisableCulling = RiceDisableCulling_CB.Checked;
-			Global.Config.RiceIncTexRectEdge = RiceIncTexRectEdge_CB.Checked;
-			Global.Config.RiceZHack = RiceZHack_CB.Checked;
-			Global.Config.RiceTextureScaleHack = RiceTextureScaleHack_CB.Checked;
-			Global.Config.RicePrimaryDepthHack = RicePrimaryDepthHack_CB.Checked;
-			Global.Config.RiceTexture1Hack = RiceTexture1Hack_CB.Checked;
-			Global.Config.RiceFastLoadTile = RiceFastLoadTile_CB.Checked;
-			Global.Config.RiceUseSmallerTexture = RiceUseSmallerTexture_CB.Checked;
+			Global.Config.RicePlugin.RiceUseDefaultHacks = RiceUseDefaultHacks_CB.Checked;
+			Global.Config.RicePlugin.RiceDisableTextureCRC = RiceDisableTextureCRC_CB.Checked;
+			Global.Config.RicePlugin.RiceDisableCulling = RiceDisableCulling_CB.Checked;
+			Global.Config.RicePlugin.RiceIncTexRectEdge = RiceIncTexRectEdge_CB.Checked;
+			Global.Config.RicePlugin.RiceZHack = RiceZHack_CB.Checked;
+			Global.Config.RicePlugin.RiceTextureScaleHack = RiceTextureScaleHack_CB.Checked;
+			Global.Config.RicePlugin.RicePrimaryDepthHack = RicePrimaryDepthHack_CB.Checked;
+			Global.Config.RicePlugin.RiceTexture1Hack = RiceTexture1Hack_CB.Checked;
+			Global.Config.RicePlugin.RiceFastLoadTile = RiceFastLoadTile_CB.Checked;
+			Global.Config.RicePlugin.RiceUseSmallerTexture = RiceUseSmallerTexture_CB.Checked;
 
 			if (InputValidate.IsValidSignedNumber(RiceVIWidth_Text.Text))
-				Global.Config.RiceVIWidth = int.Parse(RiceVIWidth_Text.Text);
+				Global.Config.RicePlugin.RiceVIWidth = int.Parse(RiceVIWidth_Text.Text);
 			else
-				Global.Config.RiceVIWidth = -1;
+				Global.Config.RicePlugin.RiceVIWidth = -1;
 
 			if (InputValidate.IsValidSignedNumber(RiceVIHeight_Text.Text))
-				Global.Config.RiceVIHeight = int.Parse(RiceVIHeight_Text.Text);
+				Global.Config.RicePlugin.RiceVIHeight = int.Parse(RiceVIHeight_Text.Text);
 			else
-				Global.Config.RiceVIHeight = -1;
+				Global.Config.RicePlugin.RiceVIHeight = -1;
 
-			Global.Config.RiceUseCIWidthAndRatio = RiceUseCIWidthAndRatio_Combo.SelectedIndex;
-			Global.Config.RiceFullTMEM = RiceFullTMEM_Combo.SelectedIndex;
-			Global.Config.RiceTxtSizeMethod2 = RiceTxtSizeMethod2_CB.Checked;
-			Global.Config.RiceEnableTxtLOD = RiceEnableTxtLOD_CB.Checked;
-			Global.Config.RiceFastTextureCRC = RiceFastTextureCRC_Combo.SelectedIndex;
-			Global.Config.RiceEmulateClear = RiceEmulateClear_CB.Checked;
-			Global.Config.RiceForceScreenClear = RiceForceScreenClear_CB.Checked;
-			Global.Config.RiceAccurateTextureMappingHack = RiceAccurateTextureMappingHack_Combo.SelectedIndex;
-			Global.Config.RiceNormalBlender = RiceNormalBlender_Combo.SelectedIndex;
-			Global.Config.RiceDisableBlender = RiceDisableBlender_CB.Checked;
-			Global.Config.RiceForceDepthBuffer = RiceForceDepthBuffer_CB.Checked;
-			Global.Config.RiceDisableObjBG = RiceDisableObjBG_CB.Checked;
-			Global.Config.RiceFrameBufferOption = RiceFrameBufferOption_Combo.SelectedIndex;
-			Global.Config.RiceRenderToTextureOption = RiceRenderToTextureOption_Combo.SelectedIndex;
-			Global.Config.RiceScreenUpdateSettingHack = RiceScreenUpdateSettingHack_Combo.SelectedIndex;
-			Global.Config.RiceEnableHacksForGame = RiceEnableHacksForGame_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceUseCIWidthAndRatio = RiceUseCIWidthAndRatio_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceFullTMEM = RiceFullTMEM_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceTxtSizeMethod2 = RiceTxtSizeMethod2_CB.Checked;
+			Global.Config.RicePlugin.RiceEnableTxtLOD = RiceEnableTxtLOD_CB.Checked;
+			Global.Config.RicePlugin.RiceFastTextureCRC = RiceFastTextureCRC_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceEmulateClear = RiceEmulateClear_CB.Checked;
+			Global.Config.RicePlugin.RiceForceScreenClear = RiceForceScreenClear_CB.Checked;
+			Global.Config.RicePlugin.RiceAccurateTextureMappingHack = RiceAccurateTextureMappingHack_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceNormalBlender = RiceNormalBlender_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceDisableBlender = RiceDisableBlender_CB.Checked;
+			Global.Config.RicePlugin.RiceForceDepthBuffer = RiceForceDepthBuffer_CB.Checked;
+			Global.Config.RicePlugin.RiceDisableObjBG = RiceDisableObjBG_CB.Checked;
+			Global.Config.RicePlugin.RiceFrameBufferOption = RiceFrameBufferOption_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceRenderToTextureOption = RiceRenderToTextureOption_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceScreenUpdateSettingHack = RiceScreenUpdateSettingHack_Combo.SelectedIndex;
+			Global.Config.RicePlugin.RiceEnableHacksForGame = RiceEnableHacksForGame_Combo.SelectedIndex;
 		}
 
 		private void N64VideoPluginconfig_Load(object sender, EventArgs e)
@@ -139,38 +139,38 @@ namespace BizHawk.MultiClient
 
 			//Rice
 			Global.MainForm.FlagNeedsReboot(); //TODO: this won't always be necessary, keep that in mind
-			RiceNormalAlphaBlender_CB.Checked = Global.Config.RiceNormalAlphaBlender;
-			RiceFastTextureLoading_CB.Checked = Global.Config.RiceFastTextureLoading;
-			RiceAccurateTextureMapping_CB.Checked = Global.Config.RiceAccurateTextureMapping;
-			RiceInN64Resolution_CB.Checked = Global.Config.RiceInN64Resolution;
-			RiceSaveVRAM_CB.Checked = Global.Config.RiceSaveVRAM;
-			RiceDoubleSizeForSmallTxtrBuf_CB.Checked = Global.Config.RiceDoubleSizeForSmallTxtrBuf;
-			RiceDefaultCombinerDisable_CB.Checked = Global.Config.RiceDefaultCombinerDisable;
-			RiceEnableHacks_CB.Checked = Global.Config.RiceEnableHacks;
-			RiceWinFrameMode_CB.Checked = Global.Config.RiceWinFrameMode;
-			RiceFullTMEMEmulation_CB.Checked = Global.Config.RiceFullTMEMEmulation;
-			RiceOpenGLVertexClipper_CB.Checked = Global.Config.RiceOpenGLVertexClipper;
-			RiceEnableSSE_CB.Checked = Global.Config.RiceEnableSSE;
-			RiceEnableVertexShader_CB.Checked = Global.Config.RiceEnableVertexShader;
-			RiceSkipFrame_CB.Checked = Global.Config.RiceSkipFrame;
-			RiceTexRectOnly_CB.Checked = Global.Config.RiceTexRectOnly;
-			RiceSmallTextureOnly_CB.Checked = Global.Config.RiceSmallTextureOnly;
-			RiceLoadHiResCRCOnly_CB.Checked = Global.Config.RiceLoadHiResCRCOnly;
-			RiceLoadHiResTextures_CB.Checked = Global.Config.RiceLoadHiResTextures;
-			RiceDumpTexturesToFiles_CB.Checked = Global.Config.RiceDumpTexturesToFiles;
+			RiceNormalAlphaBlender_CB.Checked = Global.Config.RicePlugin.RiceNormalAlphaBlender;
+			RiceFastTextureLoading_CB.Checked = Global.Config.RicePlugin.RiceFastTextureLoading;
+			RiceAccurateTextureMapping_CB.Checked = Global.Config.RicePlugin.RiceAccurateTextureMapping;
+			RiceInN64Resolution_CB.Checked = Global.Config.RicePlugin.RiceInN64Resolution;
+			RiceSaveVRAM_CB.Checked = Global.Config.RicePlugin.RiceSaveVRAM;
+			RiceDoubleSizeForSmallTxtrBuf_CB.Checked = Global.Config.RicePlugin.RiceDoubleSizeForSmallTxtrBuf;
+			RiceDefaultCombinerDisable_CB.Checked = Global.Config.RicePlugin.RiceDefaultCombinerDisable;
+			RiceEnableHacks_CB.Checked = Global.Config.RicePlugin.RiceEnableHacks;
+			RiceWinFrameMode_CB.Checked = Global.Config.RicePlugin.RiceWinFrameMode;
+			RiceFullTMEMEmulation_CB.Checked = Global.Config.RicePlugin.RiceFullTMEMEmulation;
+			RiceOpenGLVertexClipper_CB.Checked = Global.Config.RicePlugin.RiceOpenGLVertexClipper;
+			RiceEnableSSE_CB.Checked = Global.Config.RicePlugin.RiceEnableSSE;
+			RiceEnableVertexShader_CB.Checked = Global.Config.RicePlugin.RiceEnableVertexShader;
+			RiceSkipFrame_CB.Checked = Global.Config.RicePlugin.RiceSkipFrame;
+			RiceTexRectOnly_CB.Checked = Global.Config.RicePlugin.RiceTexRectOnly;
+			RiceSmallTextureOnly_CB.Checked = Global.Config.RicePlugin.RiceSmallTextureOnly;
+			RiceLoadHiResCRCOnly_CB.Checked = Global.Config.RicePlugin.RiceLoadHiResCRCOnly;
+			RiceLoadHiResTextures_CB.Checked = Global.Config.RicePlugin.RiceLoadHiResTextures;
+			RiceDumpTexturesToFiles_CB.Checked = Global.Config.RicePlugin.RiceDumpTexturesToFiles;
 
-			RiceFrameBufferSetting_Combo.SelectedIndex = Global.Config.RiceFrameBufferSetting;
-			RiceFrameBufferWriteBackControl_Combo.SelectedIndex = Global.Config.RiceFrameBufferWriteBackControl;
-			RiceRenderToTexture_Combo.SelectedIndex = Global.Config.RiceRenderToTexture;
-			RiceScreenUpdateSetting_Combo.SelectedIndex = Global.Config.RiceScreenUpdateSetting;
-			RiceMipmapping_Combo.SelectedIndex = Global.Config.RiceMipmapping;
-			RiceFogMethod_Combo.SelectedIndex = Global.Config.RiceFogMethod;
-			RiceForceTextureFilter_Combo.SelectedIndex = Global.Config.RiceForceTextureFilter;
-			RiceTextureEnhancement_Combo.SelectedIndex = Global.Config.RiceTextureEnhancement;
-			RiceTextureEnhancementControl_Combo.SelectedIndex = Global.Config.RiceTextureEnhancementControl;
-			RiceTextureQuality_Combo.SelectedIndex = Global.Config.RiceTextureQuality;
-			RiceOpenGLDepthBufferSetting_Combo.SelectedIndex = (Global.Config.RiceOpenGLDepthBufferSetting /16) -1;
-			switch (Global.Config.RiceMultiSampling)
+			RiceFrameBufferSetting_Combo.SelectedIndex = Global.Config.RicePlugin.RiceFrameBufferSetting;
+			RiceFrameBufferWriteBackControl_Combo.SelectedIndex = Global.Config.RicePlugin.RiceFrameBufferWriteBackControl;
+			RiceRenderToTexture_Combo.SelectedIndex = Global.Config.RicePlugin.RiceRenderToTexture;
+			RiceScreenUpdateSetting_Combo.SelectedIndex = Global.Config.RicePlugin.RiceScreenUpdateSetting;
+			RiceMipmapping_Combo.SelectedIndex = Global.Config.RicePlugin.RiceMipmapping;
+			RiceFogMethod_Combo.SelectedIndex = Global.Config.RicePlugin.RiceFogMethod;
+			RiceForceTextureFilter_Combo.SelectedIndex = Global.Config.RicePlugin.RiceForceTextureFilter;
+			RiceTextureEnhancement_Combo.SelectedIndex = Global.Config.RicePlugin.RiceTextureEnhancement;
+			RiceTextureEnhancementControl_Combo.SelectedIndex = Global.Config.RicePlugin.RiceTextureEnhancementControl;
+			RiceTextureQuality_Combo.SelectedIndex = Global.Config.RicePlugin.RiceTextureQuality;
+			RiceOpenGLDepthBufferSetting_Combo.SelectedIndex = (Global.Config.RicePlugin.RiceOpenGLDepthBufferSetting /16) -1;
+			switch (Global.Config.RicePlugin.RiceMultiSampling)
 			{
 				case 0: RiceMultiSampling_Combo.SelectedIndex = 0; break;
 				case 2: RiceMultiSampling_Combo.SelectedIndex = 1; break;
@@ -179,45 +179,45 @@ namespace BizHawk.MultiClient
 				case 16: RiceMultiSampling_Combo.SelectedIndex = 4; break;
 				default: RiceMultiSampling_Combo.SelectedIndex = 0; break;
 			}
-			RiceColorQuality_Combo.SelectedIndex = Global.Config.RiceColorQuality;
-			RiceOpenGLRenderSetting_Combo.SelectedIndex = Global.Config.RiceOpenGLRenderSetting;
-			RiceAnisotropicFiltering_TB.Value = Global.Config.RiceAnisotropicFiltering;
+			RiceColorQuality_Combo.SelectedIndex = Global.Config.RicePlugin.RiceColorQuality;
+			RiceOpenGLRenderSetting_Combo.SelectedIndex = Global.Config.RicePlugin.RiceOpenGLRenderSetting;
+			RiceAnisotropicFiltering_TB.Value = Global.Config.RicePlugin.RiceAnisotropicFiltering;
 			AnisotropicFiltering_LB.Text = "Anisotropic Filtering: " + RiceAnisotropicFiltering_TB.Value.ToString();
 
-			RiceUseDefaultHacks_CB.Checked = Global.Config.RiceUseDefaultHacks;
+			RiceUseDefaultHacks_CB.Checked = Global.Config.RicePlugin.RiceUseDefaultHacks;
 
 			UpdateHacksSection();
-			if (!Global.Config.RiceUseDefaultHacks)
+			if (!Global.Config.RicePlugin.RiceUseDefaultHacks)
 			{
-				RiceTexture1Hack_CB.Checked = Global.Config.RiceTexture1Hack;
+				RiceTexture1Hack_CB.Checked = Global.Config.RicePlugin.RiceTexture1Hack;
 
-				RiceDisableTextureCRC_CB.Checked = Global.Config.RiceDisableTextureCRC;
-				RiceDisableCulling_CB.Checked = Global.Config.RiceDisableCulling;
-				RiceIncTexRectEdge_CB.Checked = Global.Config.RiceIncTexRectEdge;
-				RiceZHack_CB.Checked = Global.Config.RiceZHack;
-				RiceTextureScaleHack_CB.Checked = Global.Config.RiceTextureScaleHack;
-				RicePrimaryDepthHack_CB.Checked = Global.Config.RicePrimaryDepthHack;
-				RiceTexture1Hack_CB.Checked = Global.Config.RiceTexture1Hack;
-				RiceFastLoadTile_CB.Checked = Global.Config.RiceFastLoadTile;
-				RiceUseSmallerTexture_CB.Checked = Global.Config.RiceUseSmallerTexture;
-				RiceVIWidth_Text.Text = Global.Config.RiceVIWidth.ToString();
-				RiceVIHeight_Text.Text = Global.Config.RiceVIHeight.ToString();
-				RiceUseCIWidthAndRatio_Combo.SelectedIndex = Global.Config.RiceUseCIWidthAndRatio;
-				RiceFullTMEM_Combo.SelectedIndex = Global.Config.RiceFullTMEM;
-				RiceTxtSizeMethod2_CB.Checked = Global.Config.RiceTxtSizeMethod2;
-				RiceEnableTxtLOD_CB.Checked = Global.Config.RiceEnableTxtLOD;
-				RiceFastTextureCRC_Combo.SelectedIndex = Global.Config.RiceFastTextureCRC;
-				RiceEmulateClear_CB.Checked = Global.Config.RiceEmulateClear;
-				RiceForceScreenClear_CB.Checked = Global.Config.RiceForceScreenClear;
-				RiceAccurateTextureMappingHack_Combo.SelectedIndex = Global.Config.RiceAccurateTextureMappingHack;
-				RiceNormalBlender_Combo.SelectedIndex = Global.Config.RiceNormalBlender;
-				RiceDisableBlender_CB.Checked = Global.Config.RiceDisableBlender;
-				RiceForceDepthBuffer_CB.Checked = Global.Config.RiceForceDepthBuffer;
-				RiceDisableObjBG_CB.Checked = Global.Config.RiceDisableObjBG;
-				RiceFrameBufferOption_Combo.SelectedIndex = Global.Config.RiceFrameBufferOption;
-				RiceRenderToTextureOption_Combo.SelectedIndex = Global.Config.RiceRenderToTextureOption;
-				RiceScreenUpdateSettingHack_Combo.SelectedIndex = Global.Config.RiceScreenUpdateSettingHack;
-				RiceEnableHacksForGame_Combo.SelectedIndex = Global.Config.RiceEnableHacksForGame;
+				RiceDisableTextureCRC_CB.Checked = Global.Config.RicePlugin.RiceDisableTextureCRC;
+				RiceDisableCulling_CB.Checked = Global.Config.RicePlugin.RiceDisableCulling;
+				RiceIncTexRectEdge_CB.Checked = Global.Config.RicePlugin.RiceIncTexRectEdge;
+				RiceZHack_CB.Checked = Global.Config.RicePlugin.RiceZHack;
+				RiceTextureScaleHack_CB.Checked = Global.Config.RicePlugin.RiceTextureScaleHack;
+				RicePrimaryDepthHack_CB.Checked = Global.Config.RicePlugin.RicePrimaryDepthHack;
+				RiceTexture1Hack_CB.Checked = Global.Config.RicePlugin.RiceTexture1Hack;
+				RiceFastLoadTile_CB.Checked = Global.Config.RicePlugin.RiceFastLoadTile;
+				RiceUseSmallerTexture_CB.Checked = Global.Config.RicePlugin.RiceUseSmallerTexture;
+				RiceVIWidth_Text.Text = Global.Config.RicePlugin.RiceVIWidth.ToString();
+				RiceVIHeight_Text.Text = Global.Config.RicePlugin.RiceVIHeight.ToString();
+				RiceUseCIWidthAndRatio_Combo.SelectedIndex = Global.Config.RicePlugin.RiceUseCIWidthAndRatio;
+				RiceFullTMEM_Combo.SelectedIndex = Global.Config.RicePlugin.RiceFullTMEM;
+				RiceTxtSizeMethod2_CB.Checked = Global.Config.RicePlugin.RiceTxtSizeMethod2;
+				RiceEnableTxtLOD_CB.Checked = Global.Config.RicePlugin.RiceEnableTxtLOD;
+				RiceFastTextureCRC_Combo.SelectedIndex = Global.Config.RicePlugin.RiceFastTextureCRC;
+				RiceEmulateClear_CB.Checked = Global.Config.RicePlugin.RiceEmulateClear;
+				RiceForceScreenClear_CB.Checked = Global.Config.RicePlugin.RiceForceScreenClear;
+				RiceAccurateTextureMappingHack_Combo.SelectedIndex = Global.Config.RicePlugin.RiceAccurateTextureMappingHack;
+				RiceNormalBlender_Combo.SelectedIndex = Global.Config.RicePlugin.RiceNormalBlender;
+				RiceDisableBlender_CB.Checked = Global.Config.RicePlugin.RiceDisableBlender;
+				RiceForceDepthBuffer_CB.Checked = Global.Config.RicePlugin.RiceForceDepthBuffer;
+				RiceDisableObjBG_CB.Checked = Global.Config.RicePlugin.RiceDisableObjBG;
+				RiceFrameBufferOption_Combo.SelectedIndex = Global.Config.RicePlugin.RiceFrameBufferOption;
+				RiceRenderToTextureOption_Combo.SelectedIndex = Global.Config.RicePlugin.RiceRenderToTextureOption;
+				RiceScreenUpdateSettingHack_Combo.SelectedIndex = Global.Config.RicePlugin.RiceScreenUpdateSettingHack;
+				RiceEnableHacksForGame_Combo.SelectedIndex = Global.Config.RicePlugin.RiceEnableHacksForGame;
 			}
 		}