Index: brave.c
===================================================================
--- brave.c	(revision 30991)
+++ brave.c	(revision 30992)
@@ -143,9 +143,9 @@
 
 	for(d = desc, len=0; d->name != NULL; d++,len++) {
 		if (pcb_brave & d->bit)
-			PCB_DAD_SET_VALUE(hid_ctx, d->widget, lng, 1);
+			RND_DAD_SET_VALUE(hid_ctx, d->widget, lng, 1);
 		else
-			PCB_DAD_SET_VALUE(hid_ctx, d->widget, lng, 0);
+			RND_DAD_SET_VALUE(hid_ctx, d->widget, lng, 0);
 	}
 }
 
@@ -194,53 +194,53 @@
 {
 	desc_t *d;
 	int len;
-	pcb_hid_dad_buttons_t btn[] = {{"Close", 0}, {NULL, 0}};
-	PCB_DAD_DECL(dlg);
+	rnd_hid_dad_buttons_t btn[] = {{"Close", 0}, {NULL, 0}};
+	RND_DAD_DECL(dlg);
 
-	PCB_DAD_BEGIN_VBOX(dlg);
-		PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL);
-		PCB_DAD_LABEL(dlg, "Experimental features for the brave");
+	RND_DAD_BEGIN_VBOX(dlg);
+		RND_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL);
+		RND_DAD_LABEL(dlg, "Experimental features for the brave");
 
-		PCB_DAD_BEGIN_TABLE(dlg, 3);
+		RND_DAD_BEGIN_TABLE(dlg, 3);
 			for(d = desc, len=0; d->name != NULL; d++,len++) {
-				PCB_DAD_LABEL(dlg, d->name);
-					PCB_DAD_HELP(dlg, d->lng);
-				PCB_DAD_BOOL(dlg, "");
-					d->widget = PCB_DAD_CURRENT(dlg);
-					PCB_DAD_CHANGE_CB(dlg, brave_dialog_chg);
-					PCB_DAD_HELP(dlg, d->lng);
-				PCB_DAD_LABEL(dlg, d->shrt);
-					PCB_DAD_HELP(dlg, d->lng);
+				RND_DAD_LABEL(dlg, d->name);
+					RND_DAD_HELP(dlg, d->lng);
+				RND_DAD_BOOL(dlg, "");
+					d->widget = RND_DAD_CURRENT(dlg);
+					RND_DAD_CHANGE_CB(dlg, brave_dialog_chg);
+					RND_DAD_HELP(dlg, d->lng);
+				RND_DAD_LABEL(dlg, d->shrt);
+					RND_DAD_HELP(dlg, d->lng);
 			}
-		PCB_DAD_END(dlg);
-		PCB_DAD_BEGIN_VBOX(dlg);
-			PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL);
-		PCB_DAD_END(dlg);
-		PCB_DAD_BEGIN_HBOX(dlg);
+		RND_DAD_END(dlg);
+		RND_DAD_BEGIN_VBOX(dlg);
+			RND_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL);
+		RND_DAD_END(dlg);
+		RND_DAD_BEGIN_HBOX(dlg);
 			if (len != 0) {
-				PCB_DAD_BUTTON(dlg, "all ON");
-					PCB_DAD_HELP(dlg, "Tick in all boxes\nenabling all experimental features\n(Super Brave Mode)");
-					PCB_DAD_CHANGE_CB(dlg, brave_dialog_allon);
-				PCB_DAD_BUTTON(dlg, "all OFF");
-					PCB_DAD_HELP(dlg, "Tick off all boxes\ndisabling all experimental features\n(Safe Mode)");
-					PCB_DAD_CHANGE_CB(dlg, brave_dialog_alloff);
-				PCB_DAD_BUTTON(dlg, "save in user cfg");
-					PCB_DAD_HELP(dlg, "Save current brave state in the \nuser configuration file");
-					PCB_DAD_CHANGE_CB(dlg, brave_dialog_save);
+				RND_DAD_BUTTON(dlg, "all ON");
+					RND_DAD_HELP(dlg, "Tick in all boxes\nenabling all experimental features\n(Super Brave Mode)");
+					RND_DAD_CHANGE_CB(dlg, brave_dialog_allon);
+				RND_DAD_BUTTON(dlg, "all OFF");
+					RND_DAD_HELP(dlg, "Tick off all boxes\ndisabling all experimental features\n(Safe Mode)");
+					RND_DAD_CHANGE_CB(dlg, brave_dialog_alloff);
+				RND_DAD_BUTTON(dlg, "save in user cfg");
+					RND_DAD_HELP(dlg, "Save current brave state in the \nuser configuration file");
+					RND_DAD_CHANGE_CB(dlg, brave_dialog_save);
 			}
-		PCB_DAD_END(dlg);
+		RND_DAD_END(dlg);
 
 		if (len == 0)
-			PCB_DAD_LABEL(dlg, "(There are no brave features at the moment)");
+			RND_DAD_LABEL(dlg, "(There are no brave features at the moment)");
 
-		PCB_DAD_BUTTON_CLOSES(dlg, btn);
-	PCB_DAD_END(dlg);
+		RND_DAD_BUTTON_CLOSES(dlg, btn);
+	RND_DAD_END(dlg);
 
 
-	PCB_DAD_NEW("brave", dlg, "Brave features", dlg, pcb_true, NULL);
+	RND_DAD_NEW("brave", dlg, "Brave features", dlg, pcb_true, NULL);
 	brave2dlg(dlg_hid_ctx);
-	PCB_DAD_RUN(dlg);
-	PCB_DAD_FREE(dlg);
+	RND_DAD_RUN(dlg);
+	RND_DAD_FREE(dlg);
 	return 0;
 }