Index: trunk/src_plugins/boardflip/boardflip.c
===================================================================
--- trunk/src_plugins/boardflip/boardflip.c	(revision 6142)
+++ trunk/src_plugins/boardflip/boardflip.c	(revision 6143)
@@ -67,7 +67,7 @@
 	if (argc > 0 && pcb_strcasecmp(argv[0], "sides") == 0)
 		sides = 1;
 	printf("argc %d argv %s sides %d\n", argc, argc > 0 ? argv[0] : "", sides);
-	LAYER_LOOP(PCB->Data, pcb_max_copper_layer + 2);
+	LAYER_LOOP(PCB->Data, pcb_max_layer);
 	{
 		PCB_LINE_LOOP(layer);
 		{
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 6142)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 6143)
@@ -363,7 +363,7 @@
 
 static pcb_layergrp_id_t group_for_layer(int l)
 {
-	if (l < pcb_max_copper_layer + 2 && l >= 0)
+	if (l < pcb_max_layer && l >= 0)
 		return pcb_layer_get_group(l);
 	/* else something unique */
 	return pcb_max_group + 3 + l;
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 6142)
+++ trunk/src_plugins/export_png/png.c	(revision 6143)
@@ -394,7 +394,7 @@
 
 static pcb_layergrp_id_t group_for_layer(int l)
 {
-	if (l < pcb_max_copper_layer + 2 && l >= 0)
+	if (l < pcb_max_layer && l >= 0)
 		return pcb_layer_get_group(l);
 	/* else something unique */
 	return pcb_max_group + 3 + l;
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 6142)
+++ trunk/src_plugins/export_ps/eps.c	(revision 6143)
@@ -149,7 +149,7 @@
 
 static pcb_layergrp_id_t group_for_layer(int l)
 {
-	if (l < pcb_max_copper_layer + 2 && l >= 0)
+	if (l < pcb_max_layer && l >= 0)
 		return pcb_layer_get_group(l);
 	/* else something unique */
 	return pcb_max_group + 3 + l;
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 6142)
+++ trunk/src_plugins/export_ps/ps.c	(revision 6143)
@@ -428,7 +428,7 @@
 
 static pcb_layergrp_id_t group_for_layer(int l)
 {
-	if (l < pcb_max_copper_layer + 2 && l >= 0)
+	if (l < pcb_max_layer && l >= 0)
 		return pcb_layer_get_group(l);
 	/* else something unique */
 	return pcb_max_group + 3 + l;
Index: trunk/src_plugins/hid_gtk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-gdk.c	(revision 6142)
+++ trunk/src_plugins/hid_gtk/gtkhid-gdk.c	(revision 6143)
@@ -65,7 +65,7 @@
 		int n = PCB->LayerGroups.grp[group].len;
 		for (idx = 0; idx < n - 1; idx++) {
 			int ni = PCB->LayerGroups.grp[group].lid[idx];
-			if (ni >= 0 && ni < pcb_max_copper_layer + 2 && PCB->Data->Layer[ni].On)
+			if (ni >= 0 && ni < pcb_max_layer && PCB->Data->Layer[ni].On)
 				break;
 		}
 		idx = PCB->LayerGroups.grp[group].lid[idx];
Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-gl.c	(revision 6142)
+++ trunk/src_plugins/hid_gtk/gtkhid-gl.c	(revision 6143)
@@ -111,7 +111,7 @@
 		int n = PCB->LayerGroups.Number[group];
 		for (idx = 0; idx < n - 1; idx++) {
 			int ni = PCB->LayerGroups.Entries[group][idx];
-			if (ni >= 0 && ni < pcb_max_copper_layer + 2 && PCB->Data->Layer[ni].On)
+			if (ni >= 0 && ni < pcb_max_layer && PCB->Data->Layer[ni].On)
 				break;
 		}
 		idx = PCB->LayerGroups.Entries[group][idx];
@@ -120,7 +120,7 @@
 	end_subcomposite();
 	start_subcomposite();
 
-	if (idx >= 0 && idx < pcb_max_copper_layer + 2) {
+	if (idx >= 0 && idx < pcb_max_layer) {
 		priv->trans_lines = pcb_true;
 		return PCB->Data->Layer[idx].On;
 	}
Index: trunk/src_plugins/hid_gtk/gui-config.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-config.c	(revision 6142)
+++ trunk/src_plugins/hid_gtk/gui-config.c	(revision 6143)
@@ -1321,7 +1321,7 @@
 		for (group = 0; group < pcb_max_group; group++)
 			layer_groups.grp[group].len = 0;
 
-		for (i = 0; i < pcb_max_copper_layer + 2; i++) {
+		for (i = 0; i < pcb_max_layer; i++) {
 			group = config_layer_group[i] - 1;
 			layer_groups.grp[group].lid[layer_groups.grp[group].len++] = i;
 
@@ -1426,7 +1426,7 @@
 	/* Create a row of radio toggle buttons for layer.  So each layer
 	   |  can have an active radio button set for the group it needs to be in.
 	 */
-	for (layer = 0; layer < pcb_max_copper_layer + 2; ++layer) {
+	for (layer = 0; layer < pcb_max_layer; ++layer) {
 		if (layer == pcb_component_silk_layer)
 			name = _("component side");
 		else if (layer == pcb_solder_silk_layer)
Index: trunk/src_plugins/hid_gtk/gui-top-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-top-window.c	(revision 6142)
+++ trunk/src_plugins/hid_gtk/gui-top-window.c	(revision 6143)
@@ -1625,7 +1625,7 @@
 		l = LAYER_BUTTON_FARSIDE;
 	else {
 		l = -1;
-		for (i = 0; i < pcb_max_copper_layer + 2; i++) {
+		for (i = 0; i < pcb_max_layer; i++) {
 			if (strcmp(argv[0], PCB->Data->Layer[i].Name) == 0) {
 				l = i;
 				break;
Index: trunk/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dialogs.c	(revision 6142)
+++ trunk/src_plugins/hid_lesstif/dialogs.c	(revision 6143)
@@ -1283,7 +1283,7 @@
 		XDrawLine(display, win, lg_gc, lg_c[i], 0, lg_c[i], lg_height);
 	for (i = 1; i < pcb_max_copper_layer + 2; i++)
 		XDrawLine(display, win, lg_gc, lg_label_width, lg_r[i], lg_width, lg_r[i]);
-	for (i = 0; i < pcb_max_copper_layer + 2; i++) {
+	for (i = 0; i < pcb_max_layer; i++) {
 		int dir;
 		XCharStruct size;
 		int swidth;
@@ -1302,7 +1302,7 @@
 								(lg_r[i] + lg_r[i + 1] + lg_fd + lg_fa) / 2 - 1, name, strlen(name));
 	}
 	XSetForeground(display, lg_gc, lgr.sel);
-	for (i = 0; i < pcb_max_copper_layer + 2; i++) {
+	for (i = 0; i < pcb_max_layer; i++) {
 		int c = lg_setcol[i];
 		int x1 = lg_c[c] + 2;
 		int x2 = lg_c[c + 1] - 2;
@@ -1317,7 +1317,7 @@
 	int layer, group;
 	if (cbs->event->type != ButtonPress)
 		return;
-	layer = cbs->event->xbutton.y * (pcb_max_copper_layer + 2) / lg_height;
+	layer = cbs->event->xbutton.y * (pcb_max_layer) / lg_height;
 	group = (cbs->event->xbutton.x - lg_label_width) * pcb_max_group / (lg_width - lg_label_width);
 	group = pcb_layer_move_to_group(layer, group);
 	lg_setcol[layer] = group;
@@ -1338,8 +1338,8 @@
 
 	for (i = 0; i <= pcb_max_group; i++)
 		lg_c[i] = lg_label_width + (lg_width - lg_label_width) * i / pcb_max_group;
-	for (i = 0; i <= pcb_max_copper_layer + 2; i++)
-		lg_r[i] = lg_height * i / (pcb_max_copper_layer + 2);
+	for (i = 0; i <= pcb_max_layer; i++)
+		lg_r[i] = lg_height * i / (pcb_max_layer);
 	lgbutton_expose(w, 0, 0);
 }
 
@@ -1361,7 +1361,7 @@
 		}
 
 	lg_label_width = 0;
-	for (i = 0; i < pcb_max_copper_layer + 2; i++) {
+	for (i = 0; i < pcb_max_layer; i++) {
 		int dir;
 		XCharStruct size;
 		int swidth;
@@ -1382,12 +1382,12 @@
 
 	stdarg_n = 0;
 	stdarg(XmNwidth, lg_label_width + (lg_fa + lg_fd) * pcb_max_group);
-	stdarg(XmNheight, (lg_fa + lg_fd) * (pcb_max_copper_layer + 2));
+	stdarg(XmNheight, (lg_fa + lg_fd) * (pcb_max_layer));
 	XtSetValues(lg_buttonform, stdarg_args, stdarg_n);
 	lgbutton_expose(lg_buttonform, 0, 0);
 
 #if 0
-	for (i = 0; i < pcb_max_copper_layer + 2; i++) {
+	for (i = 0; i < pcb_max_layer; i++) {
 		char *name = "unknown";
 		stdarg_n = 0;
 		if (i < pcb_max_copper_layer)
@@ -1407,11 +1407,11 @@
 	XtUnmanageChild(lg_buttonform);
 	for (i = 0; i < PCB_MAX_LAYERGRP + 2; i++)
 		for (j = 0; j < PCB_MAX_LAYER; j++) {
-			if (i < pcb_max_copper_layer + 2 && j < pcb_max_group) {
+			if (i < pcb_max_layer && j < pcb_max_group) {
 				XtManageChild(lgbuttons[i][j]);
 				stdarg_n = 0;
-				stdarg(XmNleftPosition, j * (pcb_max_copper_layer + 2));
-				stdarg(XmNrightPosition, (j + 1) * (pcb_max_copper_layer + 2));
+				stdarg(XmNleftPosition, j * (pcb_max_layer));
+				stdarg(XmNrightPosition, (j + 1) * (pcb_max_layer));
 				stdarg(XmNtopPosition, i * pcb_max_group);
 				stdarg(XmNbottomPosition, (i + 1) * pcb_max_group);
 				XtSetValues(lgbuttons[i][j], stdarg_args, stdarg_n);
@@ -1420,10 +1420,10 @@
 				XtUnmanageChild(lgbuttons[i][j]);
 		}
 	stdarg_n = 0;
-	stdarg(XmNfractionBase, pcb_max_copper_layer + 2);
+	stdarg(XmNfractionBase, pcb_max_layer);
 	XtSetValues(layer_groups_form, stdarg_args, stdarg_n);
 	stdarg_n = 0;
-	stdarg(XmNfractionBase, pcb_max_group * (pcb_max_copper_layer + 2));
+	stdarg(XmNfractionBase, pcb_max_group * (pcb_max_layer));
 	XtSetValues(lg_buttonform, stdarg_args, stdarg_n);
 	XtManageChild(lg_buttonform);
 #endif
@@ -1450,7 +1450,7 @@
 	if (!layer_groups_form) {
 
 		stdarg_n = 0;
-		stdarg(XmNfractionBase, pcb_max_copper_layer + 2);
+		stdarg(XmNfractionBase, pcb_max_layer);
 		stdarg(XmNtitle, "Layer Groups");
 		layer_groups_form = XmCreateFormDialog(mainwind, XmStrCast("layers"), stdarg_args, stdarg_n);
 
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 6142)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 6143)
@@ -2723,7 +2723,7 @@
 		int n = PCB->LayerGroups.grp[group].len;
 		for (idx = 0; idx < n - 1; idx++) {
 			int ni = PCB->LayerGroups.grp[group].lid[idx];
-			if (ni >= 0 && ni < pcb_max_copper_layer + 2 && PCB->Data->Layer[ni].On)
+			if (ni >= 0 && ni < pcb_max_layer && PCB->Data->Layer[ni].On)
 				break;
 		}
 		idx = PCB->LayerGroups.grp[group].lid[idx];
Index: trunk/src_plugins/hid_lesstif/menu.c
===================================================================
--- trunk/src_plugins/hid_lesstif/menu.c	(revision 6142)
+++ trunk/src_plugins/hid_lesstif/menu.c	(revision 6143)
@@ -368,7 +368,7 @@
 		layer_button_callback(0, LB_BACK, 0);
 	else {
 		l = -1;
-		for (i = 0; i < pcb_max_copper_layer + 2; i++)
+		for (i = 0; i < pcb_max_layer; i++)
 			if (strcmp(argv[0], PCB->Data->Layer[i].Name) == 0) {
 				l = i;
 				break;
Index: trunk/src_plugins/io_kicad/write.c
===================================================================
--- trunk/src_plugins/io_kicad/write.c	(revision 6142)
+++ trunk/src_plugins/io_kicad/write.c	(revision 6143)
@@ -70,7 +70,7 @@
 	pcb_write_element_data(FP, buff->Data, "kicadl");
 
 	/*
-		for (i = 0; i < pcb_max_copper_layer + 2; i++)
+		for (i = 0; i < pcb_max_layer; i++)
 		WriteLayerData(FP, i, &(buff->Data->Layer[i]));
 	*/
 	return (0);
Index: trunk/src_plugins/io_kicad_legacy/write.c
===================================================================
--- trunk/src_plugins/io_kicad_legacy/write.c	(revision 6142)
+++ trunk/src_plugins/io_kicad_legacy/write.c	(revision 6143)
@@ -67,7 +67,7 @@
 	pcb_write_element_data(FP, buff->Data, "kicadl");
 
 	/*
-		for (i = 0; i < pcb_max_copper_layer + 2; i++)
+		for (i = 0; i < pcb_max_layer; i++)
 		WriteLayerData(FP, i, &(buff->Data->Layer[i]));
 	*/
 	return (0);
Index: trunk/src_plugins/io_pcb/file.c
===================================================================
--- trunk/src_plugins/io_pcb/file.c	(revision 6142)
+++ trunk/src_plugins/io_pcb/file.c	(revision 6143)
@@ -542,7 +542,7 @@
 	pcb_printf_slot[0] = ((io_pcb_ctx_t *)(ctx->plugin_data))->write_coord_fmt;
 	WriteViaData(FP, buff->Data);
 	io_pcb_WriteElementData(ctx, FP, buff->Data);
-	for (i = 0; i < pcb_max_copper_layer + 2; i++)
+	for (i = 0; i < pcb_max_layer; i++)
 		WriteLayerData(FP, i, &(buff->Data->Layer[i]));
 	return (0);
 }
@@ -564,7 +564,7 @@
 	WriteViaData(FP, PCB->Data);
 	io_pcb_WriteElementData(ctx, FP, PCB->Data);
 	WritePCBRatData(FP);
-	for (i = 0; i < pcb_max_copper_layer + 2; i++)
+	for (i = 0; i < pcb_max_layer; i++)
 		WriteLayerData(FP, i, &(PCB->Data->Layer[i]));
 	WritePCBNetlistData(FP);
 	WritePCBNetlistPatchData(FP);