Index: layersel.c
===================================================================
--- layersel.c	(revision 30991)
+++ layersel.c	(revision 30992)
@@ -488,52 +488,52 @@
 
 static void layersel_begin_grp_open(layersel_ctx_t *ls, const char *name, ls_group_t *lsg)
 {
-	PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-		lsg->wopen = PCB_DAD_CURRENT(ls->sub.dlg);
+	RND_DAD_BEGIN_HBOX(ls->sub.dlg);
+		lsg->wopen = RND_DAD_CURRENT(ls->sub.dlg);
 
 		/* vertical group name */
-		PCB_DAD_LABEL(ls->sub.dlg, name);
-			PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_TEXT_VERTICAL | RND_HATF_TEXT_TRUNCATED);
-			PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lsg);
-			PCB_DAD_RIGHT_CB(ls->sub.dlg, group_right_cb);
-			PCB_DAD_CHANGE_CB(ls->sub.dlg, group_open_cb);
-			PCB_DAD_HELP(ls->sub.dlg, name);
+		RND_DAD_LABEL(ls->sub.dlg, name);
+			RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_TEXT_VERTICAL | RND_HATF_TEXT_TRUNCATED);
+			RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lsg);
+			RND_DAD_RIGHT_CB(ls->sub.dlg, group_right_cb);
+			RND_DAD_CHANGE_CB(ls->sub.dlg, group_open_cb);
+			RND_DAD_HELP(ls->sub.dlg, name);
 
 		/* vert sep */
-		PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-			PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME);
-		PCB_DAD_END(ls->sub.dlg);
+		RND_DAD_BEGIN_HBOX(ls->sub.dlg);
+			RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME);
+		RND_DAD_END(ls->sub.dlg);
 
 		/* layer list box */
-		PCB_DAD_BEGIN_VBOX(ls->sub.dlg);
-			PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT);
+		RND_DAD_BEGIN_VBOX(ls->sub.dlg);
+			RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT);
 }
 
 static void layersel_end_grp_open(layersel_ctx_t *ls)
 {
-		PCB_DAD_END(ls->sub.dlg);
-	PCB_DAD_END(ls->sub.dlg);
+		RND_DAD_END(ls->sub.dlg);
+	RND_DAD_END(ls->sub.dlg);
 }
 
 static void layersel_begin_grp_closed(layersel_ctx_t *ls, const char *name, ls_group_t *lsg)
 {
-	PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-		lsg->wclosed = PCB_DAD_CURRENT(ls->sub.dlg);
-		PCB_DAD_LABEL(ls->sub.dlg, name);
-			PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lsg);
-			PCB_DAD_RIGHT_CB(ls->sub.dlg, group_right_cb);
-			PCB_DAD_CHANGE_CB(ls->sub.dlg, group_open_cb);
+	RND_DAD_BEGIN_HBOX(ls->sub.dlg);
+		lsg->wclosed = RND_DAD_CURRENT(ls->sub.dlg);
+		RND_DAD_LABEL(ls->sub.dlg, name);
+			RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lsg);
+			RND_DAD_RIGHT_CB(ls->sub.dlg, group_right_cb);
+			RND_DAD_CHANGE_CB(ls->sub.dlg, group_open_cb);
 
 		/* vert sep */
-		PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-			PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME);
-		PCB_DAD_END(ls->sub.dlg);
+		RND_DAD_BEGIN_HBOX(ls->sub.dlg);
+			RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME);
+		RND_DAD_END(ls->sub.dlg);
 
 }
 
 static void layersel_end_grp_closed(layersel_ctx_t *ls)
 {
-	PCB_DAD_END(ls->sub.dlg);
+	RND_DAD_END(ls->sub.dlg);
 }
 
 
@@ -542,23 +542,23 @@
 	layer_vis_box(&lys->on_open, 1, color, brd, hatch, 16, 16, 5);
 	layer_vis_box(&lys->off_open, 0, color, brd, hatch, 16, 16, 5);
 
-	PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-		PCB_DAD_PICTURE(ls->sub.dlg, lys->on_open.xpm);
-			lys->wvis_on_open = PCB_DAD_CURRENT(ls->sub.dlg);
-			PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
-			PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb);
-		PCB_DAD_PICTURE(ls->sub.dlg, lys->off_open.xpm);
-			lys->wvis_off_open = PCB_DAD_CURRENT(ls->sub.dlg);
-			PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
-			PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb);
-		PCB_DAD_LABEL(ls->sub.dlg, name);
-			lys->wlab = PCB_DAD_CURRENT(ls->sub.dlg);
-			PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
+	RND_DAD_BEGIN_HBOX(ls->sub.dlg);
+		RND_DAD_PICTURE(ls->sub.dlg, lys->on_open.xpm);
+			lys->wvis_on_open = RND_DAD_CURRENT(ls->sub.dlg);
+			RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
+			RND_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb);
+		RND_DAD_PICTURE(ls->sub.dlg, lys->off_open.xpm);
+			lys->wvis_off_open = RND_DAD_CURRENT(ls->sub.dlg);
+			RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
+			RND_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb);
+		RND_DAD_LABEL(ls->sub.dlg, name);
+			lys->wlab = RND_DAD_CURRENT(ls->sub.dlg);
+			RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
 			if (selectable) {
-				PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_sel_cb);
-				PCB_DAD_RIGHT_CB(ls->sub.dlg, layer_right_cb);
+				RND_DAD_CHANGE_CB(ls->sub.dlg, layer_sel_cb);
+				RND_DAD_RIGHT_CB(ls->sub.dlg, layer_right_cb);
 			}
-	PCB_DAD_END(ls->sub.dlg);
+	RND_DAD_END(ls->sub.dlg);
 }
 
 static void layersel_create_layer_closed(layersel_ctx_t *ls, ls_layer_t *lys, const char *name, const rnd_color_t *color, int brd, int hatch, int selected, int selectable)
@@ -566,39 +566,39 @@
 	layer_vis_box(&lys->on_closed, 1, color, brd, hatch, 10, 10, 0);
 	layer_vis_box(&lys->off_closed, 0, color, brd, hatch, 10, 10, 0);
 
-	PCB_DAD_BEGIN_VBOX(ls->sub.dlg);
-		PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT);
-		PCB_DAD_PICTURE(ls->sub.dlg, lys->on_closed.xpm);
-			lys->wvis_on_closed = PCB_DAD_CURRENT(ls->sub.dlg);
-			PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
-			PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb);
-			PCB_DAD_HELP(ls->sub.dlg, name);
-		PCB_DAD_PICTURE(ls->sub.dlg, lys->off_closed.xpm);
-			lys->wvis_off_closed = PCB_DAD_CURRENT(ls->sub.dlg);
-			PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
-			PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb);
-			PCB_DAD_HELP(ls->sub.dlg, name);
+	RND_DAD_BEGIN_VBOX(ls->sub.dlg);
+		RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT);
+		RND_DAD_PICTURE(ls->sub.dlg, lys->on_closed.xpm);
+			lys->wvis_on_closed = RND_DAD_CURRENT(ls->sub.dlg);
+			RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
+			RND_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb);
+			RND_DAD_HELP(ls->sub.dlg, name);
+		RND_DAD_PICTURE(ls->sub.dlg, lys->off_closed.xpm);
+			lys->wvis_off_closed = RND_DAD_CURRENT(ls->sub.dlg);
+			RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
+			RND_DAD_CHANGE_CB(ls->sub.dlg, layer_vis_cb);
+			RND_DAD_HELP(ls->sub.dlg, name);
 		if (selectable) {
-			PCB_DAD_PICTURE(ls->sub.dlg, closed_grp_layer_unsel);
+			RND_DAD_PICTURE(ls->sub.dlg, closed_grp_layer_unsel);
 				if (selected)
-					PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_HIDE);
-				lys->wunsel_closed = PCB_DAD_CURRENT(ls->sub.dlg);
-				PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
-				PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_sel_cb);
-				PCB_DAD_HELP(ls->sub.dlg, name);
-			PCB_DAD_PICTURE(ls->sub.dlg, closed_grp_layer_sel);
+					RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_HIDE);
+				lys->wunsel_closed = RND_DAD_CURRENT(ls->sub.dlg);
+				RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
+				RND_DAD_CHANGE_CB(ls->sub.dlg, layer_sel_cb);
+				RND_DAD_HELP(ls->sub.dlg, name);
+			RND_DAD_PICTURE(ls->sub.dlg, closed_grp_layer_sel);
 				if (!selected)
-					PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_HIDE);
-				lys->wsel_closed = PCB_DAD_CURRENT(ls->sub.dlg);
-				PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
-				PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_sel_cb);
-				PCB_DAD_HELP(ls->sub.dlg, name);
+					RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_HIDE);
+				lys->wsel_closed = RND_DAD_CURRENT(ls->sub.dlg);
+				RND_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
+				RND_DAD_CHANGE_CB(ls->sub.dlg, layer_sel_cb);
+				RND_DAD_HELP(ls->sub.dlg, name);
 		}
 		else {
-			PCB_DAD_PICTURE(ls->sub.dlg, closed_grp_layer_nosel);
-				lys->wunsel_closed = lys->wsel_closed = PCB_DAD_CURRENT(ls->sub.dlg);
+			RND_DAD_PICTURE(ls->sub.dlg, closed_grp_layer_nosel);
+				lys->wunsel_closed = lys->wsel_closed = RND_DAD_CURRENT(ls->sub.dlg);
 		}
-	PCB_DAD_END(ls->sub.dlg);
+	RND_DAD_END(ls->sub.dlg);
 }
 
 static void layersel_create_grp(layersel_ctx_t *ls, pcb_board_t *pcb, pcb_layergrp_t *g, ls_group_t *lgs, int is_open)
@@ -635,10 +635,10 @@
 
 static void layersel_add_grpsep(layersel_ctx_t *ls)
 {
-	PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-		PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL);
-		PCB_DAD_PICTURE(ls->sub.dlg, grpsep);
-	PCB_DAD_END(ls->sub.dlg);
+	RND_DAD_BEGIN_HBOX(ls->sub.dlg);
+		RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL);
+		RND_DAD_PICTURE(ls->sub.dlg, grpsep);
+	RND_DAD_END(ls->sub.dlg);
 
 }
 
@@ -716,7 +716,7 @@
 
 	layersel_begin_grp_open(ls, "UI", lgs);
 	if (vtp0_len(&pcb_uilayers) == 0)
-		PCB_DAD_LABEL(ls->sub.dlg, "(no layers)");
+		RND_DAD_LABEL(ls->sub.dlg, "(no layers)");
 	for(n = 0; n < vtp0_len(&pcb_uilayers); n++) {
 		pcb_layer_t *ly = pcb_uilayers.array[n];
 		if ((ly != NULL) && (ly->name != NULL)) {
@@ -741,16 +741,16 @@
 
 static void hsep(layersel_ctx_t *ls)
 {
-	PCB_DAD_BEGIN_VBOX(ls->sub.dlg);
-		PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME);
-	PCB_DAD_END(ls->sub.dlg);
+	RND_DAD_BEGIN_VBOX(ls->sub.dlg);
+		RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME);
+	RND_DAD_END(ls->sub.dlg);
 }
 
 static void layersel_docked_create(layersel_ctx_t *ls, pcb_board_t *pcb)
 {
 	lgs_reset(ls);
-	PCB_DAD_BEGIN_VBOX(ls->sub.dlg);
-		PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT | RND_HATF_SCROLL);
+	RND_DAD_BEGIN_VBOX(ls->sub.dlg);
+		RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT | RND_HATF_SCROLL);
 		layersel_create_stack(&layersel, pcb);
 		hsep(&layersel);
 		layersel_create_global(&layersel, pcb);
@@ -759,20 +759,20 @@
 		layersel_add_grpsep(ls);
 		layersel_create_ui(&layersel, pcb);
 		layersel_add_grpsep(ls);
-		PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-			PCB_DAD_PICBUTTON(ls->sub.dlg, all_open_xpm);
-				PCB_DAD_HELP(ls->sub.dlg, "expand/open all layer groups\nso that layer names are\ndisplayed, one layer per row");
-				PCB_DAD_CHANGE_CB(ls->sub.dlg, all_open_cb);
-			PCB_DAD_PICBUTTON(ls->sub.dlg, all_closed_xpm);
-				PCB_DAD_HELP(ls->sub.dlg, "collapse/close all layer groups\nso that layer names are\nnot displayed,\neach row is a layer group");
-				PCB_DAD_CHANGE_CB(ls->sub.dlg, all_close_cb);
-			PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-				PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL);
-			PCB_DAD_END(ls->sub.dlg);
-		PCB_DAD_END(ls->sub.dlg);
-	PCB_DAD_END(ls->sub.dlg);
-	PCB_DAD_DEFSIZE(ls->sub.dlg, 180, 200);
-	PCB_DAD_MINSIZE(ls->sub.dlg, 100, 100);
+		RND_DAD_BEGIN_HBOX(ls->sub.dlg);
+			RND_DAD_PICBUTTON(ls->sub.dlg, all_open_xpm);
+				RND_DAD_HELP(ls->sub.dlg, "expand/open all layer groups\nso that layer names are\ndisplayed, one layer per row");
+				RND_DAD_CHANGE_CB(ls->sub.dlg, all_open_cb);
+			RND_DAD_PICBUTTON(ls->sub.dlg, all_closed_xpm);
+				RND_DAD_HELP(ls->sub.dlg, "collapse/close all layer groups\nso that layer names are\nnot displayed,\neach row is a layer group");
+				RND_DAD_CHANGE_CB(ls->sub.dlg, all_close_cb);
+			RND_DAD_BEGIN_HBOX(ls->sub.dlg);
+				RND_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL);
+			RND_DAD_END(ls->sub.dlg);
+		RND_DAD_END(ls->sub.dlg);
+	RND_DAD_END(ls->sub.dlg);
+	RND_DAD_DEFSIZE(ls->sub.dlg, 180, 200);
+	RND_DAD_MINSIZE(ls->sub.dlg, 100, 100);
 	ls->w_last_sel = 0;
 }
 
Index: routest.c
===================================================================
--- routest.c	(revision 30991)
+++ routest.c	(revision 30992)
@@ -175,29 +175,29 @@
 static void rst_docked_create()
 {
 	int n;
-	PCB_DAD_BEGIN_VBOX(rst.sub.dlg);
+	RND_DAD_BEGIN_VBOX(rst.sub.dlg);
 		for(n = 0; n < MAX_STYLES; n++) {
-			PCB_DAD_BEGIN_HBOX(rst.sub.dlg);
-				PCB_DAD_COMPFLAG(rst.sub.dlg, RND_HATF_HIDE);
-					rst.whbox[n] = PCB_DAD_CURRENT(rst.sub.dlg);
-				PCB_DAD_BOOL(rst.sub.dlg, "");
-					rst.wchk[n] = PCB_DAD_CURRENT(rst.sub.dlg);
-					PCB_DAD_CHANGE_CB(rst.sub.dlg, rst_select_cb);
-				PCB_DAD_LABEL(rst.sub.dlg, "unused");
-					rst.wlab[n] = PCB_DAD_CURRENT(rst.sub.dlg);
-					PCB_DAD_CHANGE_CB(rst.sub.dlg, rst_select_cb);
-			PCB_DAD_END(rst.sub.dlg);
+			RND_DAD_BEGIN_HBOX(rst.sub.dlg);
+				RND_DAD_COMPFLAG(rst.sub.dlg, RND_HATF_HIDE);
+					rst.whbox[n] = RND_DAD_CURRENT(rst.sub.dlg);
+				RND_DAD_BOOL(rst.sub.dlg, "");
+					rst.wchk[n] = RND_DAD_CURRENT(rst.sub.dlg);
+					RND_DAD_CHANGE_CB(rst.sub.dlg, rst_select_cb);
+				RND_DAD_LABEL(rst.sub.dlg, "unused");
+					rst.wlab[n] = RND_DAD_CURRENT(rst.sub.dlg);
+					RND_DAD_CHANGE_CB(rst.sub.dlg, rst_select_cb);
+			RND_DAD_END(rst.sub.dlg);
 		}
 
-		PCB_DAD_BEGIN_HBOX(rst.sub.dlg);
-			PCB_DAD_BUTTON(rst.sub.dlg, "New");
-				PCB_DAD_CHANGE_CB(rst.sub.dlg, rst_new_cb);
-			PCB_DAD_BUTTON(rst.sub.dlg, "Edit");
-				PCB_DAD_CHANGE_CB(rst.sub.dlg, rst_edit_cb);
-			PCB_DAD_BUTTON(rst.sub.dlg, "Del");
-				PCB_DAD_CHANGE_CB(rst.sub.dlg, rst_del_cb);
-		PCB_DAD_END(rst.sub.dlg);
-	PCB_DAD_END(rst.sub.dlg);
+		RND_DAD_BEGIN_HBOX(rst.sub.dlg);
+			RND_DAD_BUTTON(rst.sub.dlg, "New");
+				RND_DAD_CHANGE_CB(rst.sub.dlg, rst_new_cb);
+			RND_DAD_BUTTON(rst.sub.dlg, "Edit");
+				RND_DAD_CHANGE_CB(rst.sub.dlg, rst_edit_cb);
+			RND_DAD_BUTTON(rst.sub.dlg, "Del");
+				RND_DAD_CHANGE_CB(rst.sub.dlg, rst_del_cb);
+		RND_DAD_END(rst.sub.dlg);
+	RND_DAD_END(rst.sub.dlg);
 }
 
 
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 30991)
+++ routest_dlg.c	(revision 30992)
@@ -29,7 +29,7 @@
 #include <librnd/core/hid_dad_tree.h>
 
 typedef struct{
-	PCB_DAD_DECL_NOINIT(dlg)
+	RND_DAD_DECL_NOINIT(dlg)
 	int active; /* already open - allow only one instance */
 	int curr;
 	int wname, wlineth, wclr, wtxtscale, wtxtth, wviahole, wviaring, wattr;
@@ -49,7 +49,7 @@
 		}
 	}
 
-	PCB_DAD_FREE(ctx->dlg);
+	RND_DAD_FREE(ctx->dlg);
 	memset(ctx, 0, sizeof(rstdlg_ctx_t)); /* reset all states to the initial - includes ctx->active = 0; */
 }
 
@@ -100,7 +100,7 @@
 		char *cell[3]= {NULL};
 		cell[0] = rnd_strdup(a->name);
 		cell[1] = rnd_strdup(a->value);
-		pcb_dad_tree_append(attr, NULL, cell);
+		rnd_dad_tree_append(attr, NULL, cell);
 	}
 
 	rstdlg_ctx.curr = rst_idx;
@@ -168,32 +168,32 @@
 static int rst_edit_attr(char **key, char **val)
 {
 	int wkey, wval, res;
-	pcb_hid_dad_buttons_t clbtn[] = {{"Cancel", -1}, {"ok", 0}, {NULL, 0}};
-	PCB_DAD_DECL(dlg);
+	rnd_hid_dad_buttons_t clbtn[] = {{"Cancel", -1}, {"ok", 0}, {NULL, 0}};
+	RND_DAD_DECL(dlg);
 
-	PCB_DAD_BEGIN_VBOX(dlg);
-		PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL);
-		PCB_DAD_BEGIN_TABLE(dlg, 2);
-			PCB_DAD_LABEL(dlg, "key");
-			PCB_DAD_STRING(dlg);
-				wkey = PCB_DAD_CURRENT(dlg);
+	RND_DAD_BEGIN_VBOX(dlg);
+		RND_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL);
+		RND_DAD_BEGIN_TABLE(dlg, 2);
+			RND_DAD_LABEL(dlg, "key");
+			RND_DAD_STRING(dlg);
+				wkey = RND_DAD_CURRENT(dlg);
 				if (*key != NULL)
-					PCB_DAD_DEFAULT_PTR(dlg, rnd_strdup(*key));
-			PCB_DAD_LABEL(dlg, "value");
-			PCB_DAD_STRING(dlg);
-				wval = PCB_DAD_CURRENT(dlg);
+					RND_DAD_DEFAULT_PTR(dlg, rnd_strdup(*key));
+			RND_DAD_LABEL(dlg, "value");
+			RND_DAD_STRING(dlg);
+				wval = RND_DAD_CURRENT(dlg);
 				if (*val != NULL)
-					PCB_DAD_DEFAULT_PTR(dlg, rnd_strdup(*val));
-		PCB_DAD_BUTTON_CLOSES(dlg, clbtn);
-	PCB_DAD_END(dlg);
+					RND_DAD_DEFAULT_PTR(dlg, rnd_strdup(*val));
+		RND_DAD_BUTTON_CLOSES(dlg, clbtn);
+	RND_DAD_END(dlg);
 
-	PCB_DAD_NEW("route_style_attr", dlg, "Edit route style attribute", NULL, pcb_true, NULL);
-	res = PCB_DAD_RUN(dlg);
+	RND_DAD_NEW("route_style_attr", dlg, "Edit route style attribute", NULL, pcb_true, NULL);
+	res = RND_DAD_RUN(dlg);
 	if (res == 0) {
 		*key = rnd_strdup(dlg[wkey].val.str);
 		*val = rnd_strdup(dlg[wval].val.str);
 	}
-	PCB_DAD_FREE(dlg);
+	RND_DAD_FREE(dlg);
 	return res;
 }
 
@@ -244,7 +244,7 @@
 
 static int pcb_dlg_rstdlg(int rst_idx)
 {
-	pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
+	rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
 	static const char *attr_hdr[] = {"attribute key", "attribute value", NULL};
 
 	if (rstdlg_ctx.active) { /* do not open another, just refresh data to target */
@@ -252,77 +252,77 @@
 		return 0;
 	}
 
-	PCB_DAD_BEGIN_VBOX(rstdlg_ctx.dlg);
-		PCB_DAD_COMPFLAG(rstdlg_ctx.dlg, RND_HATF_EXPFILL);
-		PCB_DAD_BEGIN_TABLE(rstdlg_ctx.dlg, 2);
+	RND_DAD_BEGIN_VBOX(rstdlg_ctx.dlg);
+		RND_DAD_COMPFLAG(rstdlg_ctx.dlg, RND_HATF_EXPFILL);
+		RND_DAD_BEGIN_TABLE(rstdlg_ctx.dlg, 2);
 
-			PCB_DAD_LABEL(rstdlg_ctx.dlg, "Name:");
-			PCB_DAD_STRING(rstdlg_ctx.dlg);
-				rstdlg_ctx.wname = PCB_DAD_CURRENT(rstdlg_ctx.dlg);
-				PCB_DAD_HELP(rstdlg_ctx.dlg, "Name of the routing style");
-				PCB_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
+			RND_DAD_LABEL(rstdlg_ctx.dlg, "Name:");
+			RND_DAD_STRING(rstdlg_ctx.dlg);
+				rstdlg_ctx.wname = RND_DAD_CURRENT(rstdlg_ctx.dlg);
+				RND_DAD_HELP(rstdlg_ctx.dlg, "Name of the routing style");
+				RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
 
-			PCB_DAD_LABEL(rstdlg_ctx.dlg, "Line thick.:");
-			PCB_DAD_COORD(rstdlg_ctx.dlg, "");
-				rstdlg_ctx.wlineth = PCB_DAD_CURRENT(rstdlg_ctx.dlg);
-				PCB_DAD_HELP(rstdlg_ctx.dlg, "Thickness of line/arc objects");
-				PCB_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
-				PCB_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
+			RND_DAD_LABEL(rstdlg_ctx.dlg, "Line thick.:");
+			RND_DAD_COORD(rstdlg_ctx.dlg, "");
+				rstdlg_ctx.wlineth = RND_DAD_CURRENT(rstdlg_ctx.dlg);
+				RND_DAD_HELP(rstdlg_ctx.dlg, "Thickness of line/arc objects");
+				RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
+				RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
 
-			PCB_DAD_LABEL(rstdlg_ctx.dlg, "Text scale:");
-			PCB_DAD_COORD(rstdlg_ctx.dlg, "");
-				rstdlg_ctx.wtxtscale = PCB_DAD_CURRENT(rstdlg_ctx.dlg);
-				PCB_DAD_HELP(rstdlg_ctx.dlg, "Text size scale in %; 100 means normal size");
-				PCB_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
-				PCB_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
+			RND_DAD_LABEL(rstdlg_ctx.dlg, "Text scale:");
+			RND_DAD_COORD(rstdlg_ctx.dlg, "");
+				rstdlg_ctx.wtxtscale = RND_DAD_CURRENT(rstdlg_ctx.dlg);
+				RND_DAD_HELP(rstdlg_ctx.dlg, "Text size scale in %; 100 means normal size");
+				RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
+				RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
 
-			PCB_DAD_LABEL(rstdlg_ctx.dlg, "Clearance:");
-			PCB_DAD_COORD(rstdlg_ctx.dlg, "");
-				rstdlg_ctx.wclr = PCB_DAD_CURRENT(rstdlg_ctx.dlg);
-				PCB_DAD_HELP(rstdlg_ctx.dlg, "Object clearance: any object placed with this style\nwill clear this much from sorrunding clearing-enabled polygons\n(unless the object is joined to the polygon)");
-				PCB_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
-				PCB_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
+			RND_DAD_LABEL(rstdlg_ctx.dlg, "Clearance:");
+			RND_DAD_COORD(rstdlg_ctx.dlg, "");
+				rstdlg_ctx.wclr = RND_DAD_CURRENT(rstdlg_ctx.dlg);
+				RND_DAD_HELP(rstdlg_ctx.dlg, "Object clearance: any object placed with this style\nwill clear this much from sorrunding clearing-enabled polygons\n(unless the object is joined to the polygon)");
+				RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
+				RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
 
-			PCB_DAD_LABEL(rstdlg_ctx.dlg, "Text thick.:");
-			PCB_DAD_COORD(rstdlg_ctx.dlg, "");
-				rstdlg_ctx.wtxtth = PCB_DAD_CURRENT(rstdlg_ctx.dlg);
-				PCB_DAD_HELP(rstdlg_ctx.dlg, "Text stroke thickness;\nif 0 use the default heuristics that\ncalculates it from text scale");
-				PCB_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
-				PCB_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
+			RND_DAD_LABEL(rstdlg_ctx.dlg, "Text thick.:");
+			RND_DAD_COORD(rstdlg_ctx.dlg, "");
+				rstdlg_ctx.wtxtth = RND_DAD_CURRENT(rstdlg_ctx.dlg);
+				RND_DAD_HELP(rstdlg_ctx.dlg, "Text stroke thickness;\nif 0 use the default heuristics that\ncalculates it from text scale");
+				RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
+				RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
 
-			PCB_DAD_LABEL(rstdlg_ctx.dlg, "*Via hole:");
-			PCB_DAD_COORD(rstdlg_ctx.dlg, "");
-				rstdlg_ctx.wviahole = PCB_DAD_CURRENT(rstdlg_ctx.dlg);
-				PCB_DAD_HELP(rstdlg_ctx.dlg, "Via hole diameter\nwarning: will be replaced with the padstack selector");
-				PCB_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
-				PCB_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
+			RND_DAD_LABEL(rstdlg_ctx.dlg, "*Via hole:");
+			RND_DAD_COORD(rstdlg_ctx.dlg, "");
+				rstdlg_ctx.wviahole = RND_DAD_CURRENT(rstdlg_ctx.dlg);
+				RND_DAD_HELP(rstdlg_ctx.dlg, "Via hole diameter\nwarning: will be replaced with the padstack selector");
+				RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
+				RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
 
-			PCB_DAD_LABEL(rstdlg_ctx.dlg, "*Via ring:");
-			PCB_DAD_COORD(rstdlg_ctx.dlg, "");
-				rstdlg_ctx.wviaring = PCB_DAD_CURRENT(rstdlg_ctx.dlg);
-				PCB_DAD_HELP(rstdlg_ctx.dlg, "Via ring diameter\nwarning: will be replaced with the padstack selector");
-				PCB_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
-				PCB_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
+			RND_DAD_LABEL(rstdlg_ctx.dlg, "*Via ring:");
+			RND_DAD_COORD(rstdlg_ctx.dlg, "");
+				rstdlg_ctx.wviaring = RND_DAD_CURRENT(rstdlg_ctx.dlg);
+				RND_DAD_HELP(rstdlg_ctx.dlg, "Via ring diameter\nwarning: will be replaced with the padstack selector");
+				RND_DAD_MINMAX(rstdlg_ctx.dlg, 1, RND_MAX_COORD);
+				RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_change_cb);
 
-		PCB_DAD_END(rstdlg_ctx.dlg);
-		PCB_DAD_TREE(rstdlg_ctx.dlg, 2, 0, attr_hdr);
-			PCB_DAD_HELP(rstdlg_ctx.dlg, "These attributes are automatically added to\nany object drawn with this routing style");
-			rstdlg_ctx.wattr = PCB_DAD_CURRENT(rstdlg_ctx.dlg);
-		PCB_DAD_BEGIN_HBOX(rstdlg_ctx.dlg);
-			PCB_DAD_BUTTON(rstdlg_ctx.dlg, "add");
-				PCB_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_add_attr_cb);
-			PCB_DAD_BUTTON(rstdlg_ctx.dlg, "edit");
-				PCB_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_edit_attr_cb);
-			PCB_DAD_BUTTON(rstdlg_ctx.dlg, "del");
-				PCB_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_del_attr_cb);
-		PCB_DAD_END(rstdlg_ctx.dlg);
-		PCB_DAD_BUTTON_CLOSES(rstdlg_ctx.dlg, clbtn);
-	PCB_DAD_END(rstdlg_ctx.dlg);
+		RND_DAD_END(rstdlg_ctx.dlg);
+		RND_DAD_TREE(rstdlg_ctx.dlg, 2, 0, attr_hdr);
+			RND_DAD_HELP(rstdlg_ctx.dlg, "These attributes are automatically added to\nany object drawn with this routing style");
+			rstdlg_ctx.wattr = RND_DAD_CURRENT(rstdlg_ctx.dlg);
+		RND_DAD_BEGIN_HBOX(rstdlg_ctx.dlg);
+			RND_DAD_BUTTON(rstdlg_ctx.dlg, "add");
+				RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_add_attr_cb);
+			RND_DAD_BUTTON(rstdlg_ctx.dlg, "edit");
+				RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_edit_attr_cb);
+			RND_DAD_BUTTON(rstdlg_ctx.dlg, "del");
+				RND_DAD_CHANGE_CB(rstdlg_ctx.dlg, rst_del_attr_cb);
+		RND_DAD_END(rstdlg_ctx.dlg);
+		RND_DAD_BUTTON_CLOSES(rstdlg_ctx.dlg, clbtn);
+	RND_DAD_END(rstdlg_ctx.dlg);
 
 	/* set up the context */
 	rstdlg_ctx.active = 1;
 
-	PCB_DAD_NEW("route_style", rstdlg_ctx.dlg, "Edit route style", &rstdlg_ctx, pcb_false, rstdlg_close_cb);
+	RND_DAD_NEW("route_style", rstdlg_ctx.dlg, "Edit route style", &rstdlg_ctx, pcb_false, rstdlg_close_cb);
 
 	rstdlg_pcb2dlg(rst_idx);
 	return 0;
Index: status.c
===================================================================
--- status.c	(revision 30991)
+++ status.c	(revision 30992)
@@ -251,54 +251,54 @@
 
 static void status_docked_create_st()
 {
-	PCB_DAD_BEGIN_VBOX(status.stsub.dlg);
-		PCB_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT);
-		PCB_DAD_LABEL(status.stsub.dlg, "");
-			PCB_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_HIDE);
-			status.wsttxt = PCB_DAD_CURRENT(status.stsub.dlg);
-		PCB_DAD_LABEL(status.stsub.dlg, "<pending update>");
-			status.wst1 = PCB_DAD_CURRENT(status.stsub.dlg);
-		PCB_DAD_LABEL(status.stsub.dlg, "<pending update>");
-			PCB_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_HIDE);
-			status.wst2 = PCB_DAD_CURRENT(status.stsub.dlg);
-	PCB_DAD_END(status.stsub.dlg);
+	RND_DAD_BEGIN_VBOX(status.stsub.dlg);
+		RND_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT);
+		RND_DAD_LABEL(status.stsub.dlg, "");
+			RND_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_HIDE);
+			status.wsttxt = RND_DAD_CURRENT(status.stsub.dlg);
+		RND_DAD_LABEL(status.stsub.dlg, "<pending update>");
+			status.wst1 = RND_DAD_CURRENT(status.stsub.dlg);
+		RND_DAD_LABEL(status.stsub.dlg, "<pending update>");
+			RND_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_HIDE);
+			status.wst2 = RND_DAD_CURRENT(status.stsub.dlg);
+	RND_DAD_END(status.stsub.dlg);
 }
 
 /* append an expand-vbox to eat up excess space for center-align */
 static void vpad(rnd_hid_dad_subdialog_t *sub)
 {
-	PCB_DAD_BEGIN_VBOX(sub->dlg);
-		PCB_DAD_COMPFLAG(sub->dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT);
-	PCB_DAD_END(sub->dlg);
+	RND_DAD_BEGIN_VBOX(sub->dlg);
+		RND_DAD_COMPFLAG(sub->dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT);
+	RND_DAD_END(sub->dlg);
 }
 
 static void status_docked_create_rd()
 {
 	int n;
-	PCB_DAD_BEGIN_HBOX(status.rdsub.dlg);
-		PCB_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_TIGHT);
-		PCB_DAD_BEGIN_VBOX(status.rdsub.dlg);
-			PCB_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME | RND_HATF_TIGHT);
+	RND_DAD_BEGIN_HBOX(status.rdsub.dlg);
+		RND_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_TIGHT);
+		RND_DAD_BEGIN_VBOX(status.rdsub.dlg);
+			RND_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME | RND_HATF_TIGHT);
 			vpad(&status.rdsub);
 			for(n = 0; n < 3; n++) {
-				PCB_DAD_LABEL(status.rdsub.dlg, "<pending>");
-					status.wrd1[n] = PCB_DAD_CURRENT(status.rdsub.dlg);
+				RND_DAD_LABEL(status.rdsub.dlg, "<pending>");
+					status.wrd1[n] = RND_DAD_CURRENT(status.rdsub.dlg);
 			}
 			vpad(&status.rdsub);
-		PCB_DAD_END(status.rdsub.dlg);
-		PCB_DAD_BEGIN_VBOX(status.rdsub.dlg);
-			PCB_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME);
+		RND_DAD_END(status.rdsub.dlg);
+		RND_DAD_BEGIN_VBOX(status.rdsub.dlg);
+			RND_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME);
 			vpad(&status.rdsub);
 			for(n = 0; n < 2; n++) {
-					PCB_DAD_LABEL(status.rdsub.dlg, "<pending>");
-							status.wrd2[n] = PCB_DAD_CURRENT(status.rdsub.dlg);
+					RND_DAD_LABEL(status.rdsub.dlg, "<pending>");
+							status.wrd2[n] = RND_DAD_CURRENT(status.rdsub.dlg);
 			}
 			vpad(&status.rdsub);
-		PCB_DAD_END(status.rdsub.dlg);
-		PCB_DAD_BUTTON(status.rdsub.dlg, "<un>");
-			status.wrdunit = PCB_DAD_CURRENT(status.rdsub.dlg);
-			PCB_DAD_CHANGE_CB(status.rdsub.dlg, unit_change_cb);
-	PCB_DAD_END(status.rdsub.dlg);
+		RND_DAD_END(status.rdsub.dlg);
+		RND_DAD_BUTTON(status.rdsub.dlg, "<un>");
+			status.wrdunit = RND_DAD_CURRENT(status.rdsub.dlg);
+			RND_DAD_CHANGE_CB(status.rdsub.dlg, unit_change_cb);
+	RND_DAD_END(status.rdsub.dlg);
 }