Index: psu.lht
===================================================================
--- psu.lht	(revision 1338)
+++ psu.lht	(revision 1339)
@@ -4,13 +4,13 @@
 		li:objects {
 			ha:group.10 {
 				li:objects {
-					ha:line.11 { x1=2000; y1=1000; x2=8000; y2=1000; pen=8; }
+					ha:line.11 { x1=2000; y1=1000; x2=8000; y2=1000; pen=sym-decor; }
 					ha:line.12 { x1=2000; y1=1000; x2=2000; y2=3000; pen=8; }
-					ha:line.13 { x1=2000; y1=3000; x2=8000; y2=3000; pen=8; }
+					ha:line.13 { x1=2000; y1=3000; x2=8000; y2=3000; pen=sym-decor; }
 					ha:line.14 { x1=8000; y1=1000; x2=8000; y2=3000; pen=8; }
 					ha:group.20 {
 						li:objects {
-							ha:line.1 { x1=0000; y1=2000; x2=2000; y2=2000; pen=5; }
+							ha:line.1 { x1=0000; y1=2000; x2=2000; y2=2000; pen=terminal; }
 						}
 						ha:attrib {
 							name=1
@@ -38,11 +38,11 @@
 	# (visible) objects directly under the sheet
 	ha:obj_direct.2 {
 		li:objects {
-			ha:pen.1 { shape=circle; size=250; color=#777777; } # sheet deco
-			ha:pen.3 { shape=circle; size=250; color=#2222BB; } # wire-nets
-			ha:pen.5 { shape=circle; size=250; color=#991111; } # terminal
-			ha:pen.8 { shape=circle; size=250; color=#119911; } # symbol decoration
-			ha:pen.13 { shape=circle; size=800; color=#2222BB; } # wire-net junctions
+			ha:pen.1 { shape=circle; size=250; color=#777777; name="sheet-decor"; }
+			ha:pen.3 { shape=circle; size=250; color=#2222BB; name="wire"; }
+			ha:pen.5 { shape=circle; size=250; color=#991111; name="terminal"; }
+			ha:pen.8 { shape=circle; size=250; color=#119911; name="sym-decor"; }
+			ha:pen.13 { shape=circle; size=800; color=#2222BB; name="junction"; }
 
 			ha:group_ref.20 {
 				x=10000; y=10000; rot=0; mirror=x;
@@ -72,8 +72,8 @@
 
 			ha:group.30 {
 				li:objects {
-					ha:line.31 { x1=20000; y1=12000; x2=22000; y2=12000; pen=3; }
-					ha:line.32 { x1=22000; y1=16000; x2=22000; y2=12000; pen=3; }
+					ha:line.31 { x1=20000; y1=12000; x2=22000; y2=12000; pen=wire; }
+					ha:line.32 { x1=22000; y1=16000; x2=22000; y2=12000; pen=wire; }
 				}
 				ha:attrib {
 					uid=xxxxx3
@@ -84,7 +84,7 @@
 
 			ha:group.50 {
 				li:objects {
-					ha:line.51 { x1=21000; y1=16000; x2=21000; y2=13000; pen=3; }
+					ha:line.51 { x1=21000; y1=16000; x2=21000; y2=13000; pen=wire; }
 				}
 				ha:attrib {
 					uid=xxxxx3