--- a/src/xs_config.c	Fri Nov 09 09:31:25 2012 +0200
+++ b/src/xs_config.c	Fri Nov 09 09:48:12 2012 +0200
@@ -109,6 +109,8 @@
 { CTYPE_INT,    &xs_cfg.sid2OptLevel,           "sid2OptLevel" },
 { CTYPE_INT,    &xs_cfg.sid2NFilterPresets,     "sid2NFilterPresets" },
 
+{ CTYPE_INT,    &xs_cfg.residSampling,          "residSampling" },
+
 { CTYPE_BOOL,   &xs_cfg.playMaxTimeEnable,      "playMaxTimeEnable" },
 { CTYPE_BOOL,   &xs_cfg.playMaxTimeUnknown,     "playMaxTimeUnknown" },
 { CTYPE_INT,    &xs_cfg.playMaxTime,            "playMaxTime" },
@@ -166,7 +168,10 @@
 { WTYPE_BGROUP, CTYPE_INT,      "cfg_emu_sp2_resid",    &xs_cfg.sid2Builder,            XS_BLD_RESID },
 { WTYPE_BGROUP, CTYPE_INT,      "cfg_emu_sp2_hardsid",  &xs_cfg.sid2Builder,            XS_BLD_HARDSID },
 
-{ WTYPE_TEXT,   CTYPE_STR,      "cfg_rom_path",         &xs_cfg.romPath,                0 },
+{ WTYPE_BGROUP, CTYPE_INT,      "cfg_emu_resid_interpolate", &xs_cfg.residSampling,     XS_RESID_INTERPOLATE },
+{ WTYPE_BGROUP, CTYPE_INT,      "cfg_emu_resid_resample_fir", &xs_cfg.residSampling,    XS_RESID_RESAMPLE_FIR },
+
+{ WTYPE_TEXT,   CTYPE_STR,      "cfg_emu_rom_path",     &xs_cfg.romPath,                0 },
 
 { WTYPE_BUTTON, CTYPE_BOOL,     "cfg_emu_filters",      &xs_cfg.emulateFilters,         0 },
 { WTYPE_SCALE,  CTYPE_FLOAT,    "cfg_sp1_filter_fs",    &xs_cfg.sid1Filter.fs,          0 },
@@ -185,6 +190,7 @@
 { WTYPE_TEXT,   CTYPE_STR,      "cfg_stil_dbpath",      &xs_cfg.stilDBPath,             0 },
 { WTYPE_TEXT,   CTYPE_STR,      "cfg_hvsc_path",        &xs_cfg.hvscPath,               0 },
 
+
 #ifndef AUDACIOUS_PLUGIN
 { WTYPE_BGROUP, CTYPE_INT,      "cfg_subctrl_none",     &xs_cfg.subsongControl,         XS_SSC_NONE },
 { WTYPE_BGROUP, CTYPE_INT,      "cfg_subctrl_seek",     &xs_cfg.subsongControl,         XS_SSC_SEEK },
@@ -1151,7 +1157,7 @@
     xs_rom_selector = create_xs_rom_fs();
     XS_MUTEX_LOCK(xs_cfg);
     gtk_file_selection_set_filename(GTK_FILE_SELECTION(xs_rom_selector),
-        gtk_entry_get_text(GTK_ENTRY(LUW("cfg_rom_path"))));
+        gtk_entry_get_text(GTK_ENTRY(LUW("cfg_emu_rom_path"))));
     XS_MUTEX_UNLOCK(xs_cfg);
     gtk_widget_show(xs_rom_selector);
 }
@@ -1172,7 +1178,7 @@
     else
         path = result;
 
-    gtk_entry_set_text(GTK_ENTRY(LUW("cfg_rom_path")), path);
+    gtk_entry_set_text(GTK_ENTRY(LUW("cfg_emu_rom_path")), path);
 
     /* Close file selector window */
     gtk_widget_destroy(xs_rom_selector);
@@ -1453,8 +1459,10 @@
 
 #ifdef HAVE_RESID_BUILDER
     gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), isEither);
+    gtk_widget_set_sensitive(LUW("cfg_resid_frame"), isFPActive);
 #else
     gtk_widget_set_sensitive(LUW("cfg_emu_sp2_resid"), FALSE);
+    gtk_widget_set_sensitive(LUW("cfg_resid_frame"), FALSE);
 #endif
 
 #ifdef HAVE_HARDSID_BUILDER
@@ -1462,6 +1470,7 @@
 #else
     gtk_widget_set_sensitive(LUW("cfg_emu_sp2_hardsid"), FALSE);
 #endif
+
 }
 
 
@@ -1626,7 +1635,6 @@
     gtk_widget_set_sensitive(LUW("cfg_box_filter_sidplay2"), FALSE);
 #endif
 
-    gtk_widget_set_sensitive(LUW("cfg_resid_frame"), FALSE);
 
 #if !defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN)
     gtk_widget_set_sensitive(LUW("cfg_subctrl_patch"), FALSE);