Index: trunk/src_plugins/ar_extern/ar_extern.c
===================================================================
--- trunk/src_plugins/ar_extern/ar_extern.c	(revision 37094)
+++ trunk/src_plugins/ar_extern/ar_extern.c	(revision 37095)
@@ -39,6 +39,8 @@
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/hid/hid_menu.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include "conf_core.h"
 #include "obj_pstk_inlines.h"
 #include "src_plugins/lib_netmap/netmap.h"
@@ -241,8 +243,7 @@
 void pplg_uninit_ar_extern(void)
 {
 	extroute_free_conf();
-	rnd_conf_unreg_intern(ar_extern_conf_internal);
-	rnd_conf_unreg_fields("plugins/ar_extern/");
+	rnd_conf_plug_unreg("plugins/ar_extern/", ar_extern_conf_internal, extern_cookie);
 	rnd_remove_actions_by_cookie(extern_cookie);
 	rnd_hid_menu_unload(rnd_gui, extern_cookie);
 }
@@ -254,8 +255,7 @@
 
 	RND_REGISTER_ACTIONS(extern_action_list, extern_cookie)
 
-	rnd_conf_reg_intern(ar_extern_conf_internal);
-
+	rnd_conf_plug_reg(conf_ar_extern, ar_extern_conf_internal, extern_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_ar_extern, field,isarray,type_name,cpath,cname,desc,flags);
 #include "ar_extern_conf_fields.h"
Index: trunk/src_plugins/ch_editpoint/ch_editpoint.c
===================================================================
--- trunk/src_plugins/ch_editpoint/ch_editpoint.c	(revision 37094)
+++ trunk/src_plugins/ch_editpoint/ch_editpoint.c	(revision 37095)
@@ -39,6 +39,8 @@
 #include <librnd/poly/rtree2_compat.h>
 #include <librnd/hid/hid_menu.h>
 #include <librnd/core/rnd_conf.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include "board.h"
 #include "conf_core.h"
 #include "crosshair.h"
@@ -175,9 +177,8 @@
 	vtp0_uninit(editpoint_objs);
 	vtp0_uninit(old_editpoint_objs);
 
-	rnd_conf_unreg_intern(ch_editpoint_conf_internal);
+	rnd_conf_plug_unreg("plugins/ch_editpoint/", ch_editpoint_conf_internal, pcb_ch_editpoint_cookie);
 	rnd_hid_menu_unload(rnd_gui, pcb_ch_editpoint_cookie);
-	rnd_conf_unreg_fields("plugins/ch_editpoint/");
 }
 
 int pplg_init_ch_editpoint(void)
@@ -184,7 +185,7 @@
 {
 	RND_API_CHK_VER;
 
-	rnd_conf_reg_intern(ch_editpoint_conf_internal);
+	rnd_conf_plug_reg(conf_ch_editpoint, ch_editpoint_conf_internal, pcb_ch_editpoint_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_ch_editpoint, field,isarray,type_name,cpath,cname,desc,flags);
 #include "ch_editpoint_conf_fields.h"
Index: trunk/src_plugins/drc_query/drc_query.c
===================================================================
--- trunk/src_plugins/drc_query/drc_query.c	(revision 37094)
+++ trunk/src_plugins/drc_query/drc_query.c	(revision 37095)
@@ -44,6 +44,8 @@
 #include <librnd/core/list_conf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 
 #include "board.h"
 #include "drc.h"
@@ -914,8 +916,8 @@
 	rnd_anyload_unreg_by_cookie(drc_query_cookie);
 	pcb_drc_impl_unreg(&drc_query_impl);
 	rnd_event_unbind_allcookie(drc_query_cookie);
-	rnd_conf_unreg_intern(drc_query_conf_internal);
-	rnd_conf_unreg_fields(DRC_CONF_PATH_PLUGIN);
+	rnd_conf_plug_unreg(DRC_CONF_PATH_PLUGIN, drc_query_conf_internal, drc_query_cookie);
+
 	rnd_conf_hid_unreg(drc_query_cookie);
 
 	for(n = 0; n < free_drc_conf_nodes.used; n++)
@@ -943,7 +945,7 @@
 	cbs.new_hlist_item_post = drc_query_newconf;
 	cfgid = rnd_conf_hid_reg(drc_query_cookie, &cbs);
 
-	rnd_conf_reg_intern(drc_query_conf_internal);
+	rnd_conf_plug_reg(conf_drc_query, drc_query_conf_internal, drc_query_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_drc_query, field,isarray,type_name,cpath,cname,desc,flags);
 #include "drc_query_conf_fields.h"
Index: trunk/src_plugins/fp_wget/fp_wget.c
===================================================================
--- trunk/src_plugins/fp_wget/fp_wget.c	(revision 37094)
+++ trunk/src_plugins/fp_wget/fp_wget.c	(revision 37095)
@@ -2,20 +2,22 @@
 #include "gedasymbols.h"
 #include "edakrill.h"
 #include <librnd/core/plugins.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include "fp_wget_conf.h"
 #include "../src_plugins/fp_wget/conf_internal.c"
 
 
 conf_fp_wget_t conf_fp_wget;
+static const char fp_wget_cookie[] = "fp_wget";
 
 int pplg_check_ver_fp_wget(int ver_needed) { return 0; }
 
 void pplg_uninit_fp_wget(void)
 {
-	rnd_conf_unreg_intern(fp_wget_conf_internal);
 	fp_gedasymbols_uninit();
 	fp_edakrill_uninit();
-	rnd_conf_unreg_fields("plugins/fp_wget/");
+	rnd_conf_plug_unreg("plugins/fp_wget/", fp_wget_conf_internal, fp_wget_cookie);
 }
 
 int pplg_init_fp_wget(void)
@@ -22,12 +24,11 @@
 {
 	RND_API_CHK_VER;
 
+	rnd_conf_plug_reg(conf_fp_wget, fp_wget_conf_internal, fp_wget_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_fp_wget, field,isarray,type_name,cpath,cname,desc,flags);
 #include "fp_wget_conf_fields.h"
 
-	rnd_conf_reg_intern(fp_wget_conf_internal);
-
 	fp_gedasymbols_init();
 	fp_edakrill_init();
 	return 0;
Index: trunk/src_plugins/show_netnames/show_netnames.c
===================================================================
--- trunk/src_plugins/show_netnames/show_netnames.c	(revision 37094)
+++ trunk/src_plugins/show_netnames/show_netnames.c	(revision 37095)
@@ -29,6 +29,8 @@
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
 #include <librnd/hid/hid_menu.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include <genht/htpp.h>
 #include <genht/hash.h>
 
@@ -278,11 +280,10 @@
 {
 	show_netnames_invalidate();
 
-	rnd_conf_unreg_intern(show_netnames_conf_internal);
 	rnd_hid_menu_unload(rnd_gui, pcb_show_netnames_cookie);
 	rnd_event_unbind_allcookie(pcb_show_netnames_cookie);
 	rnd_remove_actions_by_cookie(pcb_show_netnames_cookie);
-	rnd_conf_unreg_fields("plugins/show_netnames/");
+	rnd_conf_plug_unreg("plugins/show_netnames/", show_netnames_conf_internal, pcb_show_netnames_cookie);
 
 	if (shn_cache_inited)
 		htshn_uninit(&shn_cache);
@@ -292,8 +293,7 @@
 {
 	RND_API_CHK_VER;
 
-	rnd_conf_reg_intern(show_netnames_conf_internal);
-
+	rnd_conf_plug_reg(conf_show_netnames, show_netnames_conf_internal, pcb_show_netnames_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_show_netnames, field,isarray,type_name,cpath,cname,desc,flags);
 #include "show_netnames_conf_fields.h"