Index: trunk/doc/TODO
===================================================================
--- trunk/doc/TODO	(revision 34420)
+++ trunk/doc/TODO	(revision 34421)
@@ -6,7 +6,6 @@
 - CLEANUP: rewrite ps_calibrate_1 to use DAD dialog and test
 - FEATURE: (TT) route style upgrade to prototypes - requires lihata v8:
 	- BUG: {m t +} or setsame() doesn't turn routing style off
-	- CLEANUP: remove pcb_custom_route_style
 	- ANNOUNCE: setsame works on text
 	- CLEANUP: remove pcb_board_set_via_size and board property for via geometry
 	- CLEANUP: search for TODO pstk #21 for more code removal
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 34420)
+++ trunk/src/gui_act.c	(revision 34421)
@@ -660,19 +660,19 @@
 	known = pcb_route_style_lookup_strict(&PCB->RouteStyle, Thick, textt, texts, fid, Diameter, Hole, Clearance, via_proto, Name);
 	if (known < 0) {
 		/* unknown style, set properties */
-		if (Thick != -1)     { pcb_custom_route_style.Thick     = Thick;     rnd_conf_set_design("design/line_thickness", "%$mS", Thick); }
-		if (Clearance != -1) { pcb_custom_route_style.Clearance = Clearance; rnd_conf_set_design("design/clearance", "%$mS", Clearance); }
-		if (textt != -1)     { pcb_custom_route_style.textt     = textt;     rnd_conf_set_design("design/text_thickness", "%$mS", textt); }
-		if (texts != -1)     { pcb_custom_route_style.texts     = texts;     rnd_conf_set_design("design/text_scale", "%d", texts); }
-		if (fid != -1)       { pcb_custom_route_style.fid       = fid;       rnd_conf_set_design("design/text_font_id", "%ld", (long)fid); }
+		if (Thick != -1)     { rnd_conf_set_design("design/line_thickness", "%$mS", Thick); }
+		if (Clearance != -1) { rnd_conf_set_design("design/clearance", "%$mS", Clearance); }
+		if (textt != -1)     { rnd_conf_set_design("design/text_thickness", "%$mS", textt); }
+		if (texts != -1)     { rnd_conf_set_design("design/text_scale", "%d", texts); }
+		if (fid != -1)       { rnd_conf_set_design("design/text_font_id", "%ld", (long)fid); }
 
 		if (pcb_brave & PCB_BRAVE_LIHATA_V8) {
-			if (via_proto != -1)  { pcb_custom_route_style.via_proto  = via_proto;  rnd_conf_set_design("design/via_proto", "%ld", (long)via_proto); }
+			if (via_proto != -1)  { rnd_conf_set_design("design/via_proto", "%ld", (long)via_proto); }
 		}
 		else {
 			TODO("pstk #21: remove this branch");
-			if (Diameter != -1)  { pcb_custom_route_style.Diameter  = Diameter;  rnd_conf_set_design("design/via_thickness", "%$mS", Diameter); }
-			if (Hole != -1)      { pcb_custom_route_style.Hole      = Hole;      rnd_conf_set_design("design/via_drilling_hole", "%$mS", Hole); }
+			if (Diameter != -1)  { rnd_conf_set_design("design/via_thickness", "%$mS", Diameter); }
+			if (Hole != -1)      { rnd_conf_set_design("design/via_drilling_hole", "%$mS", Hole); }
 		}
 		PCB->pen_attr = NULL;
 	}
Index: trunk/src/route_style.c
===================================================================
--- trunk/src/route_style.c	(revision 34420)
+++ trunk/src/route_style.c	(revision 34421)
@@ -42,8 +42,6 @@
 
 #include "brave.h"
 
-pcb_route_style_t pcb_custom_route_style;
-
 static const char rst_cookie[] = "core route style";
 
 void pcb_use_route_style(pcb_route_style_t * rst)
Index: trunk/src/route_style.h
===================================================================
--- trunk/src/route_style.h	(revision 34420)
+++ trunk/src/route_style.h	(revision 34421)
@@ -48,8 +48,6 @@
    in pcb_route_style_lookup(). */
 int pcb_route_style_match(pcb_route_style_t *rst, rnd_coord_t Thick, rnd_coord_t textt, int texts, pcb_font_id_t fid, rnd_coord_t Diameter, rnd_coord_t Hole, rnd_coord_t Clearance, rnd_cardinal_t via_proto, char *Name);
 
-extern pcb_route_style_t pcb_custom_route_style;
-
 /* helper: get route style size for a function and selected object type.
    size_id: 0=main size; 1=2nd size (drill); 2=clearance */
 int pcb_get_style_size(int funcid, rnd_coord_t * out, int type, int size_id);
Index: trunk/src_plugins/io_pcb/rst_parse.c
===================================================================
--- trunk/src_plugins/io_pcb/rst_parse.c	(revision 34420)
+++ trunk/src_plugins/io_pcb/rst_parse.c	(revision 34421)
@@ -31,8 +31,6 @@
 
 #include "brave.h"
 
-pcb_route_style_t pcb_custom_route_style;
-
 static const char rst_cookie[] = "core route style";
 
 static rnd_coord_t pcb_get_num(char **s, const char *default_unit)