Index: autoplace/action.c
===================================================================
--- autoplace/action.c	(revision 36989)
+++ autoplace/action.c	(revision 36990)
@@ -46,7 +46,7 @@
 static fgw_error_t pcb_act_AutoPlaceSelected(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	rnd_hid_busy(PCB, 1);
-	if (rnd_hid_message_box(RND_ACT_HIDLIB, "question", "Autoplace start", "Auto-placement can NOT be undone.\nDo you want to continue anyway?", "no", 0, "yes", 1, NULL) == 1) {
+	if (rnd_hid_message_box(RND_ACT_DESIGN, "question", "Autoplace start", "Auto-placement can NOT be undone.\nDo you want to continue anyway?", "no", 0, "yes", 1, NULL) == 1) {
 		if (AutoPlaceSelected())
 			pcb_board_set_changed_flag(PCB_ACT_BOARD, rnd_true);
 	}
Index: cam/cam.c
===================================================================
--- cam/cam.c	(revision 36989)
+++ cam/cam.c	(revision 36990)
@@ -176,7 +176,7 @@
 	}
 
 	if (rnd_strcasecmp(cmd, "gui") == 0) {
-		rs = cam_gui(RND_ACT_HIDLIB, arg);
+		rs = cam_gui(RND_ACT_DESIGN, arg);
 	}
 	else {
 		if (arg == NULL) {
Index: dialogs/dlg_loadsave.c
===================================================================
--- dialogs/dlg_loadsave.c	(revision 36989)
+++ dialogs/dlg_loadsave.c	(revision 36990)
@@ -66,7 +66,7 @@
 
 	/* Called with both function and file name -> no gui */
 	if (argc > 2)
-		return RND_ACT_CALL_C(RND_ACT_HIDLIB, pcb_act_LoadFrom, res, argc, argv);
+		return RND_ACT_CALL_C(RND_ACT_DESIGN, pcb_act_LoadFrom, res, argc, argv);
 
 	RND_ACT_MAY_CONVARG(1, FGW_STR, Load, function = argv[1].val.str);
 
@@ -87,7 +87,7 @@
 	if (name != NULL) {
 		if (rnd_conf.rc.verbose)
 			fprintf(stderr, "Load:  Calling LoadFrom(%s, %s)\n", function, name);
-		rnd_actionva(RND_ACT_HIDLIB, "LoadFrom", function, name, NULL);
+		rnd_actionva(RND_ACT_DESIGN, "LoadFrom", function, name, NULL);
 		free(name);
 	}
 
@@ -416,13 +416,13 @@
 	is_dialog = (function != NULL) && (rnd_strncasecmp(function, "Dialog", 6) == 0);
 
 	if ((!is_dialog) && (argc > 2))
-		return RND_ACT_CALL_C(RND_ACT_HIDLIB, pcb_act_SaveTo, res, argc, argv);
+		return RND_ACT_CALL_C(RND_ACT_DESIGN, pcb_act_SaveTo, res, argc, argv);
 
 	memset(&save, 0, sizeof(save));
 
 	if (rnd_strcasecmp(function, "Layout") == 0)
 		if (PCB->hidlib.filename != NULL)
-			return rnd_actionva(RND_ACT_HIDLIB, "SaveTo", "Layout", NULL);
+			return rnd_actionva(RND_ACT_DESIGN, "SaveTo", "Layout", NULL);
 
 	if (is_dialog) {
 		const char *siot, *sext;
@@ -605,7 +605,7 @@
 		const char *sfmt = avail.plug[fmt]->description;
 		if (fmt_param != NULL)
 			sfmt = avail.plug[save.pick]->description;
-		rnd_actionva(RND_ACT_HIDLIB, "PasteBuffer", "Save", final_name, sfmt, NULL);
+		rnd_actionva(RND_ACT_DESIGN, "PasteBuffer", "Save", final_name, sfmt, NULL);
 	}
 	else {
 		const char *sfmt = NULL;
@@ -618,9 +618,9 @@
 		 * just obtained.
 		 */
 		if (rnd_strcasecmp(function, "Layout") == 0)
-			rnd_actionva(RND_ACT_HIDLIB, "SaveTo", "LayoutAs", final_name, sfmt, NULL);
+			rnd_actionva(RND_ACT_DESIGN, "SaveTo", "LayoutAs", final_name, sfmt, NULL);
 		else
-			rnd_actionva(RND_ACT_HIDLIB, "SaveTo", function, final_name, sfmt, NULL);
+			rnd_actionva(RND_ACT_DESIGN, "SaveTo", function, final_name, sfmt, NULL);
 	}
 
 	free(final_name);
Index: drc_query/drc_query.c
===================================================================
--- drc_query/drc_query.c	(revision 36989)
+++ drc_query/drc_query.c	(revision 36990)
@@ -711,7 +711,7 @@
 static fgw_error_t pcb_act_DrcQueryRuleMod(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	const char *cmd, *target, *key = NULL, *val=NULL;
-	rnd_design_t *hl = RND_ACT_HIDLIB;
+	rnd_design_t *hl = RND_ACT_DESIGN;
 	int resi = -1;
 
 	RND_ACT_CONVARG(1, FGW_STR, DrcQueryRuleMod, cmd = argv[1].val.str);
@@ -745,7 +745,7 @@
 static fgw_error_t pcb_act_DrcQueryDefMod(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	const char *cmd, *target, *key = NULL, *val=NULL;
-	rnd_design_t *hl = RND_ACT_HIDLIB;
+	rnd_design_t *hl = RND_ACT_DESIGN;
 	int resi = -1;
 
 	RND_ACT_CONVARG(1, FGW_STR, DrcQueryDefMod, cmd = argv[1].val.str);
@@ -787,7 +787,7 @@
 	int ires = 0;
 	const char *id, *fn = NULL, *fmt;
 	char *autofree = NULL;
-	rnd_design_t *hl = RND_ACT_HIDLIB;
+	rnd_design_t *hl = RND_ACT_DESIGN;
 	const rnd_hid_fsd_filter_t *flt = init_flt(&fmt);
 
 	RND_ACT_CONVARG(1, FGW_STR, DrcQueryExport, id = argv[1].val.str);
@@ -832,7 +832,7 @@
 	int ires = 0;
 	const char *fn = NULL, *fmt;
 	char *autofree = NULL;
-	rnd_design_t *hl = RND_ACT_HIDLIB;
+	rnd_design_t *hl = RND_ACT_DESIGN;
 	FILE *f;
 	fgw_arg_t args[2], tpres;
 	const rnd_hid_fsd_filter_t *flt = init_flt(&fmt);
Index: fontmode/fontmode.c
===================================================================
--- fontmode/fontmode.c	(revision 36989)
+++ fontmode/fontmode.c	(revision 36990)
@@ -302,7 +302,7 @@
 	if (strcmp(opt, "inplace") == 0)
 		inplace = 1;
 
-	if (pcb->Changed && (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Switching to fontedit", "OK to lose unsaved edits on this board?", "cancel", 0, "yes", 1, NULL) != 1)) {
+	if (pcb->Changed && (rnd_hid_message_box(RND_ACT_DESIGN, "warning", "Switching to fontedit", "OK to lose unsaved edits on this board?", "cancel", 0, "yes", 1, NULL) != 1)) {
 		RND_ACT_IRES(-1);
 		return 0;
 	}
@@ -317,7 +317,7 @@
 		/* don't ask for losing changes twice */
 		pcb->Changed = 0;
 
-		if (rnd_actionva(RND_ACT_HIDLIB, "New", "Font", 0))
+		if (rnd_actionva(RND_ACT_DESIGN, "New", "Font", 0))
 			return 1;
 
 		pcb = PCB; /* our new board created above */
@@ -381,7 +381,7 @@
 	RND_ACT_MAY_CONVARG(1, FGW_STR, FontSave, fn = argv[1].val.str);
 
 	editor2font(pcb, font);
-	rnd_actionva(RND_ACT_HIDLIB, "SaveFontTo", fn, NULL);
+	rnd_actionva(RND_ACT_DESIGN, "SaveFontTo", fn, NULL);
 
 	RND_ACT_IRES(0);
 	return 0;
Index: import_ipcd356/ipcd356.c
===================================================================
--- import_ipcd356/ipcd356.c	(revision 36989)
+++ import_ipcd356/ipcd356.c	(revision 36990)
@@ -411,15 +411,15 @@
 	pcb_undo_freeze_serial();
 
 	if (want_net) {
-		rnd_actionva(RND_ACT_HIDLIB, "Netlist", "Freeze", NULL);
-		rnd_actionva(RND_ACT_HIDLIB, "Netlist", "Clear", NULL);
+		rnd_actionva(RND_ACT_DESIGN, "Netlist", "Freeze", NULL);
+		rnd_actionva(RND_ACT_DESIGN, "Netlist", "Clear", NULL);
 	}
 
 	rs = ipc356_parse(PCB, f, fname, scs, want_net, want_pads);
 
 	if (want_net) {
-		rnd_actionva(RND_ACT_HIDLIB, "Netlist", "Sort", NULL);
-		rnd_actionva(RND_ACT_HIDLIB, "Netlist", "Thaw", NULL);
+		rnd_actionva(RND_ACT_DESIGN, "Netlist", "Sort", NULL);
+		rnd_actionva(RND_ACT_DESIGN, "Netlist", "Thaw", NULL);
 	}
 
 	fclose(f);
Index: io_tedax/io_tedax.c
===================================================================
--- io_tedax/io_tedax.c	(revision 36989)
+++ io_tedax/io_tedax.c	(revision 36990)
@@ -227,7 +227,7 @@
 	if (argc < 2)
 		return -1;
 	if ((argv[1].type & FGW_STR) == FGW_STR) {
-		FILE *f = rnd_fopen(RND_ACT_HIDLIB, argv[1].val.str, "r");
+		FILE *f = rnd_fopen(RND_ACT_DESIGN, argv[1].val.str, "r");
 		if (f == NULL) {
 			RND_ACT_IRES(0);
 			return 0;
Index: lib_hid_pcbui/act.c
===================================================================
--- lib_hid_pcbui/act.c	(revision 36989)
+++ lib_hid_pcbui/act.c	(revision 36990)
@@ -300,7 +300,7 @@
 	args[1].type = FGW_STR; args[1].val.cstr = msg;
 	args[2].type = FGW_STR; args[2].val.cstr = val;
 	args[3].type = FGW_STR; args[3].val.cstr = title;
-	er = rnd_actionv_bin(RND_ACT_HIDLIB, "promptfor", &r, 4, args);
+	er = rnd_actionv_bin(RND_ACT_DESIGN, "promptfor", &r, 4, args);
 
 	if ((er != 0) || ((r.type & FGW_STR) != FGW_STR)) {
 		fgw_arg_free(&rnd_fgw, &r);
Index: millpath/millpath.c
===================================================================
--- millpath/millpath.c	(revision 36989)
+++ millpath/millpath.c	(revision 36990)
@@ -47,7 +47,7 @@
 fgw_error_t pcb_act_mill(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	const char *script = NULL;
-	pcb_board_t *pcb = (pcb_board_t *)RND_ACT_HIDLIB;
+	pcb_board_t *pcb = (pcb_board_t *)RND_ACT_DESIGN;
 	ctx.edge_clearance = RND_MM_TO_COORD(0.05);
 	ctx.tools = &tools;
 
Index: oldactions/oldactions.c
===================================================================
--- oldactions/oldactions.c	(revision 36989)
+++ oldactions/oldactions.c	(revision 36990)
@@ -293,7 +293,7 @@
 static fgw_error_t pcb_act_ImportGUI(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	rnd_message(RND_MSG_ERROR, "The ImportGUI() action is deprecated. Using ImportSch() instead.\nFor details see: http://repo.hu/projects/pcb-rnd/help/err0002.html\n");
-	RND_ACT_IRES(rnd_actionva(RND_ACT_HIDLIB, "ImportSch", NULL));
+	RND_ACT_IRES(rnd_actionva(RND_ACT_DESIGN, "ImportSch", NULL));
 	return 0;
 }
 
Index: query/query_act.c
===================================================================
--- query/query_act.c	(revision 36989)
+++ query/query_act.c	(revision 36990)
@@ -431,7 +431,7 @@
 			args[1].type = FGW_STR; args[1].val.str = "advanced search results";
 			args[2].type = FGW_STR; args[2].val.str = "search_res";
 			fgw_ptr_reg(&rnd_fgw, &args[3], PCB_PTR_DOMAIN_VIEWLIST, FGW_PTR | FGW_STRUCT, view);
-			rnd_actionv_bin(RND_ACT_HIDLIB, "viewlist", &ares, 4, args);
+			rnd_actionv_bin(RND_ACT_DESIGN, "viewlist", &ares, 4, args);
 			RND_ACT_IRES(0);
 		}
 		else {
Index: shand_cmd/command.c
===================================================================
--- shand_cmd/command.c	(revision 36989)
+++ shand_cmd/command.c	(revision 36990)
@@ -77,7 +77,7 @@
 	RND_ACT_CONVARG(1, FGW_STR, LoadLayout, filename = argv[1].val.str);
 	RND_ACT_MAY_CONVARG(2, FGW_STR, LoadLayout, format = argv[2].val.str);
 
-	if (!PCB->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Load data lose", "OK to override layout data?", "cancel", 0, "ok", 1, NULL) == 1))
+	if (!PCB->Changed || (rnd_hid_message_box(RND_ACT_DESIGN, "warning", "Load data lose", "OK to override layout data?", "cancel", 0, "ok", 1, NULL) == 1))
 		pcb_load_pcb(filename, format, rnd_true, 0);
 
 	RND_ACT_IRES(0);
@@ -122,7 +122,7 @@
 /* DOC: q.html */
 static fgw_error_t pcb_act_Quit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	if (!PCB->Changed || (rnd_hid_message_box(RND_ACT_HIDLIB, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1))
+	if (!PCB->Changed || (rnd_hid_message_box(RND_ACT_DESIGN, "warning", "Close: lose data", "OK to lose data?", "cancel", 0, "ok", 1, NULL) == 1))
 		pcb_quit_app();
 	RND_ACT_IRES(0);
 	return 0;
@@ -190,7 +190,7 @@
 /* DOC: wq.html */
 static fgw_error_t pcb_act_SaveLayoutAndQuit(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	if (RND_ACT_CALL_C(RND_ACT_HIDLIB, pcb_act_SaveLayout, res, argc, argv) == 0)
+	if (RND_ACT_CALL_C(RND_ACT_DESIGN, pcb_act_SaveLayout, res, argc, argv) == 0)
 		return pcb_act_Quit(res, argc, argv);
 
 	RND_ACT_IRES(1);