Index: asm/asm.c
===================================================================
--- asm/asm.c	(revision 37093)
+++ asm/asm.c	(revision 37094)
@@ -42,6 +42,8 @@
 #include <librnd/hid/hid_dad.h>
 #include <librnd/hid/hid_dad_tree.h>
 #include <librnd/hid/hid_menu.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include "search.h"
 #include "draw.h"
 #include "select.h"
@@ -698,14 +700,14 @@
 {
 	rnd_hid_menu_unload(rnd_gui, asm_cookie);
 	rnd_remove_actions_by_cookie(asm_cookie);
-	rnd_conf_unreg_intern(asm_conf_internal);
-	rnd_conf_unreg_fields("plugins/asm1/");
+	rnd_conf_plug_unreg("plugins/asm1/", asm_conf_internal, asm_cookie);
 }
 
 int pplg_init_asm(void)
 {
 	RND_API_CHK_VER;
-	rnd_conf_reg_intern(asm_conf_internal);
+
+	rnd_conf_plug_reg(conf_asm, asm_conf_internal, asm_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_asm, field,isarray,type_name,cpath,cname,desc,flags);
 #include "asm_conf_fields.h"
Index: dialogs/dialogs.c
===================================================================
--- dialogs/dialogs.c	(revision 37093)
+++ dialogs/dialogs.c	(revision 37094)
@@ -31,6 +31,8 @@
 #include <librnd/hid/hid.h>
 #include <librnd/hid/hid_attrib.h>
 #include <librnd/core/actions.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include <librnd/hid/hid_dad.h>
 #include <librnd/core/plugins.h>
 #include "funchash_core.h"
@@ -111,8 +113,7 @@
 	pcb_view_dlg_uninit();
 	pcb_dlg_fontsel_uninit();
 
-	rnd_conf_unreg_intern(adialogs_conf_internal);
-	rnd_conf_unreg_fields("plugins/dialogs/");
+	rnd_conf_plug_unreg("plugins/dialogs/", adialogs_conf_internal, dialogs_cookie);
 }
 
 extern int pcb_dlg_pref_tab;
@@ -122,12 +123,11 @@
 {
 	RND_API_CHK_VER;
 
+rnd_conf_plug_reg(dialogs_conf, adialogs_conf_internal, dialogs_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(adialogs_conf, field,isarray,type_name,cpath,cname,desc,flags);
 #include "adialogs_conf_fields.h"
 
-	rnd_conf_reg_intern(adialogs_conf_internal);
-
 	RND_REGISTER_ACTIONS(dialogs_action_list, dialogs_cookie)
 	rnd_dlg_pref_init(pcb_dlg_pref_tab, pcb_dlg_pref_first_init);
 	pcb_dlg_pstklib_init();
Index: fp_fs/fp_fs.c
===================================================================
--- fp_fs/fp_fs.c	(revision 37093)
+++ fp_fs/fp_fs.c	(revision 37094)
@@ -50,6 +50,8 @@
 #include <librnd/core/error.h>
 #include <librnd/core/conf.h>
 #include <librnd/core/conf_hid.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include "conf_core.h"
 #include <librnd/hid/hid_init.h>
 #include <librnd/core/safe_fs.h>
@@ -592,10 +594,8 @@
 
 	rnd_conf_hid_unreg(fp_fs_cookie);
 
-	rnd_conf_unreg_intern(fp_fs_conf_internal);
-
 	fp_fs_cache_uninit(&fp_fs_cache);
-	rnd_conf_unreg_fields("plugins/fp_fs/");
+	rnd_conf_plug_unreg("plugins/fp_fs/", fp_fs_conf_internal, fp_fs_cookie);
 	fp_fs_free_remove_regex();
 }
 
@@ -611,7 +611,7 @@
 	RND_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_fs);
 	htsp_init(&fp_fs_cache, strhash, strkeyeq);
 
-	rnd_conf_reg_intern(fp_fs_conf_internal);
+	rnd_conf_plug_reg(conf_fp_fs, fp_fs_conf_internal, fp_fs_cookie);
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_fp_fs, field,isarray,type_name,cpath,cname,desc,flags);
Index: import_gnetlist/import_gnetlist.c
===================================================================
--- import_gnetlist/import_gnetlist.c	(revision 37093)
+++ import_gnetlist/import_gnetlist.c	(revision 37094)
@@ -34,6 +34,8 @@
 #include <librnd/core/conf.h>
 #include <librnd/core/paths.h>
 #include <librnd/core/actions.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 
 /* for win32 paths: */
 #include <librnd/hid/hid_init.h>
@@ -48,8 +50,8 @@
 conf_import_gnetlist_t conf_import_gnetlist;
 
 static pcb_plug_import_t import_gnetlist, import_lepton;
+static const char import_gnetlist_cookie[] = "import_gnetlist";
 
-
 int gnetlist_support_prio(pcb_plug_import_t *ctx, unsigned int aspects, const char **args, int numargs)
 {
 	FILE *f;
@@ -168,8 +170,7 @@
 {
 	RND_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist);
 	RND_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_lepton);
-	rnd_conf_unreg_intern(import_gnetlist_conf_internal);
-	rnd_conf_unreg_fields("plugins/import_gnetlist/");
+	rnd_conf_plug_unreg("plugins/import_gnetlist/", import_gnetlist_conf_internal, import_gnetlist_cookie);
 }
 
 int pplg_init_import_gnetlist(void)
@@ -200,8 +201,7 @@
 
 	RND_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_lepton);
 
-	rnd_conf_reg_intern(import_gnetlist_conf_internal);
-
+	rnd_conf_plug_reg(conf_import_gnetlist, import_gnetlist_conf_internal, import_gnetlist_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_import_gnetlist, field,isarray,type_name,cpath,cname,desc,flags);
 #include "import_gnetlist_conf_fields.h"
Index: import_sch_rnd/import_sch_rnd.c
===================================================================
--- import_sch_rnd/import_sch_rnd.c	(revision 37093)
+++ import_sch_rnd/import_sch_rnd.c	(revision 37094)
@@ -33,6 +33,8 @@
 #include <librnd/core/conf.h>
 #include <librnd/core/paths.h>
 #include <librnd/core/actions.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 
 /* for win32 paths: */
 #include <librnd/hid/hid_init.h>
@@ -48,6 +50,7 @@
 conf_import_sch_rnd_t conf_import_sch_rnd;
 
 static pcb_plug_import_t import_sch_rnd;
+static char import_sch_rnd_cookie[] = "import_sch_rnd";
 
 int sch_rnd_support_prio(pcb_plug_import_t *ctx, unsigned int aspects, const char **args, int numargs)
 {
@@ -119,8 +122,7 @@
 void pplg_uninit_import_sch_rnd(void)
 {
 	RND_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_sch_rnd);
-	rnd_conf_unreg_intern(import_sch_rnd_conf_internal);
-	rnd_conf_unreg_fields("plugins/import_sch_rnd/");
+	rnd_conf_plug_unreg("plugins/import_sch_rnd/", import_sch_rnd_conf_internal, import_sch_rnd_cookie);
 }
 
 int pplg_init_import_sch_rnd(void)
@@ -139,8 +141,7 @@
 	import_sch_rnd.ext_exec         = 0;
 	RND_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_sch_rnd);
 
-	rnd_conf_reg_intern(import_sch_rnd_conf_internal);
-
+	rnd_conf_plug_reg(conf_import_sch_rnd, import_sch_rnd_conf_internal, import_sch_rnd_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_import_sch_rnd, field,isarray,type_name,cpath,cname,desc,flags);
 #include "import_sch_rnd_conf_fields.h"
Index: order/order.c
===================================================================
--- order/order.c	(revision 37093)
+++ order/order.c	(revision 37094)
@@ -36,6 +36,8 @@
 #include <librnd/core/plugins.h>
 #include <librnd/hid/hid_dad.h>
 #include <librnd/core/hid_cfg.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include <librnd/hid/hid_menu.h>
 #include "layer.h"
 #include <librnd/core/event.h>
@@ -199,8 +201,7 @@
 void pplg_uninit_order(void)
 {
 	rnd_remove_actions_by_cookie(order_cookie);
-	rnd_conf_unreg_intern(order_conf_internal);
-	rnd_conf_unreg_fields("plugins/order/");
+	rnd_conf_plug_unreg("plugins/order/", order_conf_internal, order_cookie);
 	rnd_hid_menu_unload(rnd_gui, order_cookie);
 }
 
@@ -208,7 +209,7 @@
 {
 	RND_API_CHK_VER;
 
-	rnd_conf_reg_intern(order_conf_internal);
+rnd_conf_plug_reg(conf_order, order_conf_internal, order_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_order, field,isarray,type_name,cpath,cname,desc,flags);
 #include "order_conf_fields.h"
Index: order_pcbway/pcbway.c
===================================================================
--- order_pcbway/pcbway.c	(revision 37093)
+++ order_pcbway/pcbway.c	(revision 37094)
@@ -40,6 +40,8 @@
 #include <librnd/core/safe_fs_dir.h>
 #include <librnd/core/paths.h>
 #include <librnd/core/compat_fs.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include <librnd/plugins/lib_wget/lib_wget.h>
 #include "../src_plugins/order/order.h"
 #include "../src_plugins/order/constraint.h"
@@ -48,6 +50,7 @@
 #include "conf_core.h"
 
 conf_order_pcbway_t conf_order_pcbway;
+static const char order_pcbway_cookie[] = "order_pcbway";
 
 #define CFG conf_order_pcbway.plugins.order_pcbway
 #define SERVER "http://api-partner.pcbway.com"
@@ -883,8 +886,7 @@
 
 void pplg_uninit_order_pcbway(void)
 {
-	rnd_conf_unreg_intern(order_pcbway_conf_internal);
-	rnd_conf_unreg_fields("plugins/order_pcbway/");
+	rnd_conf_plug_unreg("plugins/order_pcbway/", order_pcbway_conf_internal, order_pcbway_cookie);
 }
 
 int pplg_init_order_pcbway(void)
@@ -891,7 +893,7 @@
 {
 	RND_API_CHK_VER;
 
-	rnd_conf_reg_intern(order_pcbway_conf_internal);
+	rnd_conf_plug_reg(conf_order_pcbway, order_pcbway_conf_internal, order_pcbway_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_order_pcbway, field,isarray,type_name,cpath,cname,desc,flags);
 #include "order_pcbway_conf_fields.h"