--- a/src/xs_interface.c	Fri Nov 09 09:31:25 2012 +0200
+++ b/src/xs_interface.c	Fri Nov 09 09:48:12 2012 +0200
@@ -83,14 +83,12 @@
   GtkWidget *cfg_resid_frame;
   GtkWidget *w_vbox37;
   GSList *samplingtype_group = NULL;
-  GtkWidget *cfg_emu_resid_fast;
-  GtkWidget *cfg_emu_resid_int;
-  GtkWidget *cfg_emu_resid_res_fast;
-  GtkWidget *cfg_emu_resid_res_int;
+  GtkWidget *cfg_emu_resid_interpolate;
+  GtkWidget *cfg_emu_resid_resample_fir;
   GtkWidget *cfg_rom_frame;
   GtkWidget *w_rom_hbox;
   GtkWidget *cfg_rom_label1;
-  GtkWidget *cfg_rom_path;
+  GtkWidget *cfg_emu_rom_path;
   GtkWidget *cfg_rom_browse;
   GtkWidget *w_label48;
   GtkWidget *w_vbox25;
@@ -679,43 +677,25 @@
   gtk_container_add (GTK_CONTAINER (cfg_resid_frame), w_vbox37);
   gtk_container_set_border_width (GTK_CONTAINER (w_vbox37), 2);
 
-  cfg_emu_resid_fast = gtk_radio_button_new_with_label (samplingtype_group, _("Fast (nearest neighbour)"));
-  samplingtype_group = gtk_radio_button_group (GTK_RADIO_BUTTON (cfg_emu_resid_fast));
-  gtk_widget_set_name (cfg_emu_resid_fast, "cfg_emu_resid_fast");
-  gtk_widget_ref (cfg_emu_resid_fast);
-  gtk_object_set_data_full (GTK_OBJECT (xs_configwin), "cfg_emu_resid_fast", cfg_emu_resid_fast,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (cfg_emu_resid_fast);
-  gtk_box_pack_start (GTK_BOX (w_vbox37), cfg_emu_resid_fast, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip (tooltips, cfg_emu_resid_fast, _("Fastest and also worst sounding sampling method, simply picks nearest neighbouring sample."), NULL);
-
-  cfg_emu_resid_int = gtk_radio_button_new_with_label (samplingtype_group, _("Linear interpolation"));
-  samplingtype_group = gtk_radio_button_group (GTK_RADIO_BUTTON (cfg_emu_resid_int));
-  gtk_widget_set_name (cfg_emu_resid_int, "cfg_emu_resid_int");
-  gtk_widget_ref (cfg_emu_resid_int);
-  gtk_object_set_data_full (GTK_OBJECT (xs_configwin), "cfg_emu_resid_int", cfg_emu_resid_int,
+  cfg_emu_resid_interpolate = gtk_radio_button_new_with_label (samplingtype_group, _("Linear interpolation"));
+  samplingtype_group = gtk_radio_button_group (GTK_RADIO_BUTTON (cfg_emu_resid_interpolate));
+  gtk_widget_set_name (cfg_emu_resid_interpolate, "cfg_emu_resid_interpolate");
+  gtk_widget_ref (cfg_emu_resid_interpolate);
+  gtk_object_set_data_full (GTK_OBJECT (xs_configwin), "cfg_emu_resid_interpolate", cfg_emu_resid_interpolate,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (cfg_emu_resid_int);
-  gtk_box_pack_start (GTK_BOX (w_vbox37), cfg_emu_resid_int, FALSE, FALSE, 0);
-  gtk_tooltips_set_tip (tooltips, cfg_emu_resid_int, _("Uses linear interpolation between samples, yielding higher audio quality with less sampling noise."), NULL);
+  gtk_widget_show (cfg_emu_resid_interpolate);
+  gtk_box_pack_start (GTK_BOX (w_vbox37), cfg_emu_resid_interpolate, FALSE, FALSE, 0);
+  gtk_tooltips_set_tip (tooltips, cfg_emu_resid_interpolate, _("Uses linear interpolation between samples, yielding higher audio quality with less sampling noise."), NULL);
 
-  cfg_emu_resid_res_fast = gtk_radio_button_new_with_label (samplingtype_group, _("Resampling"));
-  samplingtype_group = gtk_radio_button_group (GTK_RADIO_BUTTON (cfg_emu_resid_res_fast));
-  gtk_widget_set_name (cfg_emu_resid_res_fast, "cfg_emu_resid_res_fast");
-  gtk_widget_ref (cfg_emu_resid_res_fast);
-  gtk_object_set_data_full (GTK_OBJECT (xs_configwin), "cfg_emu_resid_res_fast", cfg_emu_resid_res_fast,
+  cfg_emu_resid_resample_fir = gtk_radio_button_new_with_label (samplingtype_group, _("Resampling (FIR)"));
+  samplingtype_group = gtk_radio_button_group (GTK_RADIO_BUTTON (cfg_emu_resid_resample_fir));
+  gtk_widget_set_name (cfg_emu_resid_resample_fir, "cfg_emu_resid_resample_fir");
+  gtk_widget_ref (cfg_emu_resid_resample_fir);
+  gtk_object_set_data_full (GTK_OBJECT (xs_configwin), "cfg_emu_resid_resample_fir", cfg_emu_resid_resample_fir,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (cfg_emu_resid_res_fast);
-  gtk_box_pack_start (GTK_BOX (w_vbox37), cfg_emu_resid_res_fast, FALSE, FALSE, 0);
-
-  cfg_emu_resid_res_int = gtk_radio_button_new_with_label (samplingtype_group, _("Resampling (FIR)"));
-  samplingtype_group = gtk_radio_button_group (GTK_RADIO_BUTTON (cfg_emu_resid_res_int));
-  gtk_widget_set_name (cfg_emu_resid_res_int, "cfg_emu_resid_res_int");
-  gtk_widget_ref (cfg_emu_resid_res_int);
-  gtk_object_set_data_full (GTK_OBJECT (xs_configwin), "cfg_emu_resid_res_int", cfg_emu_resid_res_int,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (cfg_emu_resid_res_int);
-  gtk_box_pack_start (GTK_BOX (w_vbox37), cfg_emu_resid_res_int, FALSE, FALSE, 0);
+  gtk_widget_show (cfg_emu_resid_resample_fir);
+  gtk_box_pack_start (GTK_BOX (w_vbox37), cfg_emu_resid_resample_fir, FALSE, FALSE, 0);
+  gtk_tooltips_set_tip (tooltips, cfg_emu_resid_resample_fir, _("High quality resampling with a FIR filter. CPU intensive."), NULL);
 
   cfg_rom_frame = gtk_frame_new (_("C64 Kernal/Basic/Chargen ROMs:"));
   gtk_widget_set_name (cfg_rom_frame, "cfg_rom_frame");
@@ -743,13 +723,13 @@
   gtk_widget_show (cfg_rom_label1);
   gtk_box_pack_start (GTK_BOX (w_rom_hbox), cfg_rom_label1, FALSE, FALSE, 0);
 
-  cfg_rom_path = gtk_entry_new ();
-  gtk_widget_set_name (cfg_rom_path, "cfg_rom_path");
-  gtk_widget_ref (cfg_rom_path);
-  gtk_object_set_data_full (GTK_OBJECT (xs_configwin), "cfg_rom_path", cfg_rom_path,
+  cfg_emu_rom_path = gtk_entry_new ();
+  gtk_widget_set_name (cfg_emu_rom_path, "cfg_emu_rom_path");
+  gtk_widget_ref (cfg_emu_rom_path);
+  gtk_object_set_data_full (GTK_OBJECT (xs_configwin), "cfg_emu_rom_path", cfg_emu_rom_path,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (cfg_rom_path);
-  gtk_box_pack_start (GTK_BOX (w_rom_hbox), cfg_rom_path, TRUE, TRUE, 0);
+  gtk_widget_show (cfg_emu_rom_path);
+  gtk_box_pack_start (GTK_BOX (w_rom_hbox), cfg_emu_rom_path, TRUE, TRUE, 0);
 
   cfg_rom_browse = gtk_button_new_with_label (_("Browse"));
   gtk_widget_set_name (cfg_rom_browse, "cfg_rom_browse");