diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 9cf8c50e74..19cfc5e066 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1582,7 +1582,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Emulator is MelonDS ds)
 			{
-				using var form = new NdsSettings(this, ds.GetSyncSettings().Clone());
+				using var form = new NdsSyncSettings(this, ds.GetSyncSettings().Clone());
 				form.ShowDialog();
 			}
 		}
diff --git a/src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.Designer.cs b/src/BizHawk.Client.EmuHawk/config/NDS/NdsSyncSettings.Designer.cs
similarity index 97%
rename from src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.Designer.cs
rename to src/BizHawk.Client.EmuHawk/config/NDS/NdsSyncSettings.Designer.cs
index 48bbb15984..d725d41b43 100644
--- a/src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.Designer.cs
+++ b/src/BizHawk.Client.EmuHawk/config/NDS/NdsSyncSettings.Designer.cs
@@ -1,272 +1,272 @@
-namespace BizHawk.Client.EmuHawk
-{
-	partial class NdsSettings
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.components = new System.ComponentModel.Container();
-            this.chkBootToFirmware = new System.Windows.Forms.CheckBox();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.btnSave = new System.Windows.Forms.Button();
-            this.ttipFirmware = new System.Windows.Forms.ToolTip(this.components);
-            this.txtName = new System.Windows.Forms.TextBox();
-            this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.numBirthDay = new System.Windows.Forms.NumericUpDown();
-            this.numBirthMonth = new System.Windows.Forms.NumericUpDown();
-            this.label3 = new BizHawk.WinForms.Controls.LocLabelEx();
-            this.cbxFavColor = new System.Windows.Forms.ComboBox();
-            this.label2 = new BizHawk.WinForms.Controls.LocLabelEx();
-            this.btnDefault = new System.Windows.Forms.Button();
-            this.dtpStartupTime = new System.Windows.Forms.DateTimePicker();
-            this.label4 = new BizHawk.WinForms.Controls.LocLabelEx();
-            this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numBirthDay)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numBirthMonth)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // chkBootToFirmware
-            // 
-            this.chkBootToFirmware.AutoSize = true;
-            this.chkBootToFirmware.Location = new System.Drawing.Point(12, 12);
-            this.chkBootToFirmware.Name = "chkBootToFirmware";
-            this.chkBootToFirmware.Size = new System.Drawing.Size(102, 17);
-            this.chkBootToFirmware.TabIndex = 0;
-            this.chkBootToFirmware.Text = "Boot to firmware";
-            this.ttipFirmware.SetToolTip(this.chkBootToFirmware, "This option requires that a firmware file be in use, as well as both bios files. " +
-        "See Config -> Firmwares.");
-            this.chkBootToFirmware.UseVisualStyleBackColor = true;
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(163, 179);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(60, 23);
-            this.btnCancel.TabIndex = 1;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.CancelBtn_Click);
-            // 
-            // btnSave
-            // 
-            this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSave.Location = new System.Drawing.Point(97, 179);
-            this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(60, 23);
-            this.btnSave.TabIndex = 1;
-            this.btnSave.Text = "Save";
-            this.btnSave.UseVisualStyleBackColor = true;
-            this.btnSave.Click += new System.EventHandler(this.SaveBtn_Click);
-            // 
-            // txtName
-            // 
-            this.txtName.Location = new System.Drawing.Point(50, 16);
-            this.txtName.MaxLength = 10;
-            this.txtName.Name = "txtName";
-            this.txtName.Size = new System.Drawing.Size(94, 20);
-            this.txtName.TabIndex = 2;
-            // 
-            // label1
-            // 
-            this.label1.Location = new System.Drawing.Point(6, 19);
-            this.label1.Name = "label1";
-            this.label1.Text = "Name:";
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupBox1.Controls.Add(this.numBirthDay);
-            this.groupBox1.Controls.Add(this.numBirthMonth);
-            this.groupBox1.Controls.Add(this.label3);
-            this.groupBox1.Controls.Add(this.cbxFavColor);
-            this.groupBox1.Controls.Add(this.label2);
-            this.groupBox1.Controls.Add(this.txtName);
-            this.groupBox1.Controls.Add(this.label1);
-            this.groupBox1.Location = new System.Drawing.Point(12, 35);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(211, 110);
-            this.groupBox1.TabIndex = 4;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "Firmware settings";
-            // 
-            // numBirthDay
-            // 
-            this.numBirthDay.Location = new System.Drawing.Point(133, 69);
-            this.numBirthDay.Maximum = new decimal(new int[] {
-            31,
-            0,
-            0,
-            0});
-            this.numBirthDay.Name = "numBirthDay";
-            this.numBirthDay.Size = new System.Drawing.Size(36, 20);
-            this.numBirthDay.TabIndex = 7;
-            this.numBirthDay.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            // 
-            // numBirthMonth
-            // 
-            this.numBirthMonth.Location = new System.Drawing.Point(91, 69);
-            this.numBirthMonth.Maximum = new decimal(new int[] {
-            12,
-            0,
-            0,
-            0});
-            this.numBirthMonth.Name = "numBirthMonth";
-            this.numBirthMonth.Size = new System.Drawing.Size(36, 20);
-            this.numBirthMonth.TabIndex = 6;
-            this.numBirthMonth.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numBirthMonth.ValueChanged += new System.EventHandler(this.numBirthMonth_ValueChanged);
-            // 
-            // label3
-            // 
-            this.label3.Location = new System.Drawing.Point(6, 71);
-            this.label3.Name = "label3";
-            this.label3.Text = "Birthday (M/D):";
-            // 
-            // cbxFavColor
-            // 
-            this.cbxFavColor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbxFavColor.FormattingEnabled = true;
-            this.cbxFavColor.Items.AddRange(new object[] {
-            "Gray",
-            "Brown",
-            "Red",
-            "Pink",
-            "Orange",
-            "Yellow",
-            "Lime Green",
-            "Green",
-            "Dark Green",
-            "Sea Green",
-            "Turquoise",
-            "Blue",
-            "Dark Blue",
-            "Dark Purple",
-            "Violet",
-            "Magenta"});
-            this.cbxFavColor.Location = new System.Drawing.Point(50, 42);
-            this.cbxFavColor.Name = "cbxFavColor";
-            this.cbxFavColor.Size = new System.Drawing.Size(94, 21);
-            this.cbxFavColor.TabIndex = 5;
-            // 
-            // label2
-            // 
-            this.label2.Location = new System.Drawing.Point(6, 45);
-            this.label2.Name = "label2";
-            this.label2.Text = "Color:";
-            // 
-            // btnDefault
-            // 
-            this.btnDefault.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnDefault.Location = new System.Drawing.Point(12, 179);
-            this.btnDefault.Name = "btnDefault";
-            this.btnDefault.Size = new System.Drawing.Size(60, 23);
-            this.btnDefault.TabIndex = 1;
-            this.btnDefault.Text = "Default";
-            this.btnDefault.UseVisualStyleBackColor = true;
-            this.btnDefault.Click += new System.EventHandler(this.DefaultBtn_Click);
-            // 
-            // dtpStartupTime
-            // 
-            this.dtpStartupTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dtpStartupTime.CustomFormat = "yyyy-MM-dd HH:mm:ss";
-            this.dtpStartupTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpStartupTime.Location = new System.Drawing.Point(75, 151);
-            this.dtpStartupTime.MaxDate = new System.DateTime(2099, 12, 31, 23, 59, 59, 0);
-            this.dtpStartupTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
-            this.dtpStartupTime.Name = "dtpStartupTime";
-            this.dtpStartupTime.Size = new System.Drawing.Size(148, 20);
-            this.dtpStartupTime.TabIndex = 5;
-            this.dtpStartupTime.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
-            // 
-            // label4
-            // 
-            this.label4.Location = new System.Drawing.Point(12, 154);
-            this.label4.Name = "label4";
-            this.label4.Text = "Date/time:";
-            // 
-            // NdsSettings
-            // 
-            this.AcceptButton = this.btnDefault;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(243, 222);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.dtpStartupTime);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.btnDefault);
-            this.Controls.Add(this.btnSave);
-            this.Controls.Add(this.btnCancel);
-            this.Controls.Add(this.chkBootToFirmware);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(251, 249);
-            this.Name = "NdsSettings";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "NDS Settings";
-            this.Load += new System.EventHandler(this.NDSSettings_Load);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numBirthDay)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numBirthMonth)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.CheckBox chkBootToFirmware;
-		private System.Windows.Forms.Button btnCancel;
-		private System.Windows.Forms.Button btnSave;
-		private System.Windows.Forms.ToolTip ttipFirmware;
-		private System.Windows.Forms.TextBox txtName;
-		private BizHawk.WinForms.Controls.LocLabelEx label1;
-		private System.Windows.Forms.GroupBox groupBox1;
-		private BizHawk.WinForms.Controls.LocLabelEx label3;
-		private System.Windows.Forms.ComboBox cbxFavColor;
-		private BizHawk.WinForms.Controls.LocLabelEx label2;
-		private System.Windows.Forms.NumericUpDown numBirthDay;
-		private System.Windows.Forms.NumericUpDown numBirthMonth;
-		private System.Windows.Forms.Button btnDefault;
-		private System.Windows.Forms.DateTimePicker dtpStartupTime;
-		private BizHawk.WinForms.Controls.LocLabelEx label4;
-	}
+namespace BizHawk.Client.EmuHawk
+{
+	partial class NdsSyncSettings
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+            this.components = new System.ComponentModel.Container();
+            this.chkBootToFirmware = new System.Windows.Forms.CheckBox();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnSave = new System.Windows.Forms.Button();
+            this.ttipFirmware = new System.Windows.Forms.ToolTip(this.components);
+            this.txtName = new System.Windows.Forms.TextBox();
+            this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.numBirthDay = new System.Windows.Forms.NumericUpDown();
+            this.numBirthMonth = new System.Windows.Forms.NumericUpDown();
+            this.label3 = new BizHawk.WinForms.Controls.LocLabelEx();
+            this.cbxFavColor = new System.Windows.Forms.ComboBox();
+            this.label2 = new BizHawk.WinForms.Controls.LocLabelEx();
+            this.btnDefault = new System.Windows.Forms.Button();
+            this.dtpStartupTime = new System.Windows.Forms.DateTimePicker();
+            this.label4 = new BizHawk.WinForms.Controls.LocLabelEx();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numBirthDay)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numBirthMonth)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // chkBootToFirmware
+            // 
+            this.chkBootToFirmware.AutoSize = true;
+            this.chkBootToFirmware.Location = new System.Drawing.Point(12, 12);
+            this.chkBootToFirmware.Name = "chkBootToFirmware";
+            this.chkBootToFirmware.Size = new System.Drawing.Size(102, 17);
+            this.chkBootToFirmware.TabIndex = 0;
+            this.chkBootToFirmware.Text = "Boot to firmware";
+            this.ttipFirmware.SetToolTip(this.chkBootToFirmware, "This option requires that a firmware file be in use, as well as both bios files. " +
+        "See Config -> Firmwares.");
+            this.chkBootToFirmware.UseVisualStyleBackColor = true;
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(163, 179);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(60, 23);
+            this.btnCancel.TabIndex = 1;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.CancelBtn_Click);
+            // 
+            // btnSave
+            // 
+            this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSave.Location = new System.Drawing.Point(97, 179);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(60, 23);
+            this.btnSave.TabIndex = 1;
+            this.btnSave.Text = "Save";
+            this.btnSave.UseVisualStyleBackColor = true;
+            this.btnSave.Click += new System.EventHandler(this.SaveBtn_Click);
+            // 
+            // txtName
+            // 
+            this.txtName.Location = new System.Drawing.Point(50, 16);
+            this.txtName.MaxLength = 10;
+            this.txtName.Name = "txtName";
+            this.txtName.Size = new System.Drawing.Size(94, 20);
+            this.txtName.TabIndex = 2;
+            // 
+            // label1
+            // 
+            this.label1.Location = new System.Drawing.Point(6, 19);
+            this.label1.Name = "label1";
+            this.label1.Text = "Name:";
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Controls.Add(this.numBirthDay);
+            this.groupBox1.Controls.Add(this.numBirthMonth);
+            this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.cbxFavColor);
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.Controls.Add(this.txtName);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Location = new System.Drawing.Point(12, 35);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(211, 110);
+            this.groupBox1.TabIndex = 4;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Firmware settings";
+            // 
+            // numBirthDay
+            // 
+            this.numBirthDay.Location = new System.Drawing.Point(133, 69);
+            this.numBirthDay.Maximum = new decimal(new int[] {
+            31,
+            0,
+            0,
+            0});
+            this.numBirthDay.Name = "numBirthDay";
+            this.numBirthDay.Size = new System.Drawing.Size(36, 20);
+            this.numBirthDay.TabIndex = 7;
+            this.numBirthDay.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            // 
+            // numBirthMonth
+            // 
+            this.numBirthMonth.Location = new System.Drawing.Point(91, 69);
+            this.numBirthMonth.Maximum = new decimal(new int[] {
+            12,
+            0,
+            0,
+            0});
+            this.numBirthMonth.Name = "numBirthMonth";
+            this.numBirthMonth.Size = new System.Drawing.Size(36, 20);
+            this.numBirthMonth.TabIndex = 6;
+            this.numBirthMonth.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.numBirthMonth.ValueChanged += new System.EventHandler(this.numBirthMonth_ValueChanged);
+            // 
+            // label3
+            // 
+            this.label3.Location = new System.Drawing.Point(6, 71);
+            this.label3.Name = "label3";
+            this.label3.Text = "Birthday (M/D):";
+            // 
+            // cbxFavColor
+            // 
+            this.cbxFavColor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbxFavColor.FormattingEnabled = true;
+            this.cbxFavColor.Items.AddRange(new object[] {
+            "Gray",
+            "Brown",
+            "Red",
+            "Pink",
+            "Orange",
+            "Yellow",
+            "Lime Green",
+            "Green",
+            "Dark Green",
+            "Sea Green",
+            "Turquoise",
+            "Blue",
+            "Dark Blue",
+            "Dark Purple",
+            "Violet",
+            "Magenta"});
+            this.cbxFavColor.Location = new System.Drawing.Point(50, 42);
+            this.cbxFavColor.Name = "cbxFavColor";
+            this.cbxFavColor.Size = new System.Drawing.Size(94, 21);
+            this.cbxFavColor.TabIndex = 5;
+            // 
+            // label2
+            // 
+            this.label2.Location = new System.Drawing.Point(6, 45);
+            this.label2.Name = "label2";
+            this.label2.Text = "Color:";
+            // 
+            // btnDefault
+            // 
+            this.btnDefault.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.btnDefault.Location = new System.Drawing.Point(12, 179);
+            this.btnDefault.Name = "btnDefault";
+            this.btnDefault.Size = new System.Drawing.Size(60, 23);
+            this.btnDefault.TabIndex = 1;
+            this.btnDefault.Text = "Default";
+            this.btnDefault.UseVisualStyleBackColor = true;
+            this.btnDefault.Click += new System.EventHandler(this.DefaultBtn_Click);
+            // 
+            // dtpStartupTime
+            // 
+            this.dtpStartupTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtpStartupTime.CustomFormat = "yyyy-MM-dd HH:mm:ss";
+            this.dtpStartupTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpStartupTime.Location = new System.Drawing.Point(75, 151);
+            this.dtpStartupTime.MaxDate = new System.DateTime(2099, 12, 31, 23, 59, 59, 0);
+            this.dtpStartupTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
+            this.dtpStartupTime.Name = "dtpStartupTime";
+            this.dtpStartupTime.Size = new System.Drawing.Size(148, 20);
+            this.dtpStartupTime.TabIndex = 5;
+            this.dtpStartupTime.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
+            // 
+            // label4
+            // 
+            this.label4.Location = new System.Drawing.Point(12, 154);
+            this.label4.Name = "label4";
+            this.label4.Text = "Date/time:";
+            // 
+            // NdsSettings
+            // 
+            this.AcceptButton = this.btnDefault;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(243, 222);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.dtpStartupTime);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.btnDefault);
+            this.Controls.Add(this.btnSave);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.chkBootToFirmware);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(251, 249);
+            this.Name = "NdsSettings";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "NDS Sync Settings";
+            this.Load += new System.EventHandler(this.NDSSettings_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numBirthDay)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numBirthMonth)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.CheckBox chkBootToFirmware;
+		private System.Windows.Forms.Button btnCancel;
+		private System.Windows.Forms.Button btnSave;
+		private System.Windows.Forms.ToolTip ttipFirmware;
+		private System.Windows.Forms.TextBox txtName;
+		private BizHawk.WinForms.Controls.LocLabelEx label1;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private BizHawk.WinForms.Controls.LocLabelEx label3;
+		private System.Windows.Forms.ComboBox cbxFavColor;
+		private BizHawk.WinForms.Controls.LocLabelEx label2;
+		private System.Windows.Forms.NumericUpDown numBirthDay;
+		private System.Windows.Forms.NumericUpDown numBirthMonth;
+		private System.Windows.Forms.Button btnDefault;
+		private System.Windows.Forms.DateTimePicker dtpStartupTime;
+		private BizHawk.WinForms.Controls.LocLabelEx label4;
+	}
 }
\ No newline at end of file
diff --git a/src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.cs b/src/BizHawk.Client.EmuHawk/config/NDS/NdsSyncSettings.cs
similarity index 97%
rename from src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.cs
rename to src/BizHawk.Client.EmuHawk/config/NDS/NdsSyncSettings.cs
index 9d5b4a5863..c57c1d04ca 100644
--- a/src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.cs
+++ b/src/BizHawk.Client.EmuHawk/config/NDS/NdsSyncSettings.cs
@@ -4,12 +4,12 @@ using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public partial class NdsSettings : Form
+	public partial class NdsSyncSettings : Form
 	{
 		private readonly IMainFormForConfig _mainForm;
 		private readonly MelonDS.MelonSyncSettings _syncSettings;
 
-		public NdsSettings(
+		public NdsSyncSettings(
 			IMainFormForConfig mainForm,
 			MelonDS.MelonSyncSettings syncSettings)
 		{
diff --git a/src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.resx b/src/BizHawk.Client.EmuHawk/config/NDS/NdsSyncSettings.resx
similarity index 96%
rename from src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.resx
rename to src/BizHawk.Client.EmuHawk/config/NDS/NdsSyncSettings.resx
index 484fcb5027..b66c37c9ef 100644
--- a/src/BizHawk.Client.EmuHawk/config/NDS/NDSSettings.resx
+++ b/src/BizHawk.Client.EmuHawk/config/NDS/NdsSyncSettings.resx
@@ -1,123 +1,126 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ttipFirmware.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ttipFirmware.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="ttipFirmware.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
\ No newline at end of file