--- a/xmms-sid.glade	Fri Nov 09 09:31:25 2012 +0200
+++ b/xmms-sid.glade	Fri Nov 09 09:48:12 2012 +0200
@@ -744,23 +744,7 @@
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_emu_resid_fast</name>
-	      <tooltip>Fastest and also worst sounding sampling method, simply picks nearest neighbouring sample.</tooltip>
-	      <can_focus>True</can_focus>
-	      <label>Fast (nearest neighbour)</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>samplingtype</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>cfg_emu_resid_int</name>
+	      <name>cfg_emu_resid_interpolate</name>
 	      <tooltip>Uses linear interpolation between samples, yielding higher audio quality with less sampling noise.</tooltip>
 	      <can_focus>True</can_focus>
 	      <label>Linear interpolation</label>
@@ -776,22 +760,8 @@
 
 	    <widget>
 	      <class>GtkRadioButton</class>
-	      <name>cfg_emu_resid_res_fast</name>
-	      <can_focus>True</can_focus>
-	      <label>Resampling</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>samplingtype</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>cfg_emu_resid_res_int</name>
+	      <name>cfg_emu_resid_resample_fir</name>
+	      <tooltip>High quality resampling with a FIR filter. CPU intensive.</tooltip>
 	      <can_focus>True</can_focus>
 	      <label>Resampling (FIR)</label>
 	      <active>False</active>
@@ -845,7 +815,7 @@
 
 	    <widget>
 	      <class>GtkEntry</class>
-	      <name>cfg_rom_path</name>
+	      <name>cfg_emu_rom_path</name>
 	      <can_focus>True</can_focus>
 	      <editable>True</editable>
 	      <text_visible>True</text_visible>