diff --git a/library/XyceDigital/A2DBRIDGE.sym b/library/XyceDigital/A2DBRIDGE.sym
index 09855615..8315dbf0 100644
--- a/library/XyceDigital/A2DBRIDGE.sym
+++ b/library/XyceDigital/A2DBRIDGE.sym
@@ -1,14 +1,14 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -60 -60 20 0 #000080 2 1>
-  <Line -40 -50 0 -20 #005500 3 1>
-  <.PortSym -60 -60 1 0>
-  <Text -34 -74 12 #005500 0 "A -> D">
-  <Line -40 -50 60 0 #005500 3 1>
-  <Line -40 -70 60 0 #005500 3 1>
-  <Line 20 -50 20 -10 #005500 3 1>
-  <Line 20 -70 20 10 #005500 3 1>
-  <Line 40 -60 20 0 #000080 2 1>
-  <.PortSym 60 -60 2 180>
-  <.ID -40 -44 X >
+  <Line -50 0 20 0 #000080 2 1>
+  <Line -30 10 0 -20 #005500 3 1>
+  <.PortSym -50 0 1 0 >
+  <Line -30 10 60 0 #005500 3 1>
+  <Line -30 -10 60 0 #005500 3 1>
+  <Line 30 10 20 -10 #005500 3 1>
+  <Line 30 -10 20 10 #005500 3 1>
+  <Line 50 0 20 0 #000080 2 1>
+  <.PortSym 70 0 2 180 >
+  <.ID -30 16 X>
+  <Text -23 -11 12 #005500 0 "A -> D">
 </Symbol>
-
diff --git a/library/XyceDigital/A2DBRIDGEX2.sym b/library/XyceDigital/A2DBRIDGEX2.sym
index 01cfe0f9..74752879 100644
--- a/library/XyceDigital/A2DBRIDGEX2.sym
+++ b/library/XyceDigital/A2DBRIDGEX2.sym
@@ -1,22 +1,23 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -40 0 60 0 #005500 3 1>
-  <Line -60 -10 20 0 #000080 2 1>
-  <Line -40 0 0 -20 #005500 3 1>
-  <.PortSym -60 -10 1 0>
-  <Text -34 -23 12 #005500 0 "A -> D">
-  <Line -40 -20 60 0 #005500 3 1>
-  <Line 20 0 20 -10 #005500 3 1>
-  <Line 20 -20 20 10 #005500 3 1>
-  <Line 40 -10 20 0 #000080 2 1>
-  <.PortSym 60 -10 2 180>
-  <Line -40 20 0 -20 #005500 3 1>
-  <Text -34 -3 12 #005500 0 "A -> D">
-  <Line 20 20 20 -10 #005500 3 1>
-  <Line 20 0 20 10 #005500 3 1>
-  <Line -60 10 20 0 #000080 2 1>
-  <Line 40 10 20 0 #000080 2 1>
-  <.PortSym -60 10 3 0>
-  <.PortSym 60 10 4 180>
-  <Line -40 20 60 0 #005500 3 1>
-  <.ID -40 16 X >
+  <Line -30 0 60 0 #005500 3 1>
+  <Line -50 -10 20 0 #000080 2 1>
+  <Line -30 0 0 -20 #005500 3 1>
+  <.PortSym -50 -10 1 0 >
+  <Line -30 -20 60 0 #005500 3 1>
+  <Line 30 0 20 -10 #005500 3 1>
+  <Line 30 -20 20 10 #005500 3 1>
+  <Line 50 -10 20 0 #000080 2 1>
+  <.PortSym 70 -10 2 180 >
+  <Line -30 20 0 -20 #005500 3 1>
+  <Line 30 20 20 -10 #005500 3 1>
+  <Line 30 0 20 10 #005500 3 1>
+  <Line -50 10 20 0 #000080 2 1>
+  <Line 50 10 20 0 #000080 2 1>
+  <.PortSym -50 10 3 0 >
+  <.PortSym 70 10 4 180 >
+  <Line -30 20 60 0 #005500 3 1>
+  <.ID -30 26 X>
+  <Text -24 -1 12 #005500 0 "A -> D">
+  <Text -25 -21 12 #005500 0 "A -> D">
 </Symbol>
diff --git a/library/XyceDigital/A2DBRIDGEX4.sym b/library/XyceDigital/A2DBRIDGEX4.sym
index 3cb6db5e..4c57e35a 100644
--- a/library/XyceDigital/A2DBRIDGEX4.sym
+++ b/library/XyceDigital/A2DBRIDGEX4.sym
@@ -1,41 +1,41 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -40 0 60 0 #005500 3 1>
-  <Line -60 -10 20 0 #000080 2 1>
-  <Line -40 0 0 -20 #005500 3 1>
-  <.PortSym -60 -10 1 0>
-  <Text -34 -23 12 #005500 0 "A -> D">
-  <Line -40 -20 60 0 #005500 3 1>
-  <Line 20 0 20 -10 #005500 3 1>
-  <Line 20 -20 20 10 #005500 3 1>
-  <Line 40 -10 20 0 #000080 2 1>
-  <.PortSym 60 -10 2 180>
-  <Line -40 20 0 -20 #005500 3 1>
-  <Text -34 -3 12 #005500 0 "A -> D">
-  <Line 20 20 20 -10 #005500 3 1>
-  <Line 20 0 20 10 #005500 3 1>
-  <Line -60 10 20 0 #000080 2 1>
-  <Line 40 10 20 0 #000080 2 1>
-  <.PortSym -60 10 3 0>
-  <.PortSym 60 10 4 180>
-  <Line -40 20 60 0 #005500 3 1>
-  <Line -40 40 60 0 #005500 3 1>
-  <Line -40 40 0 -20 #005500 3 1>
-  <Text -34 17 12 #005500 0 "A -> D">
-  <Line -40 20 60 0 #005500 3 1>
-  <Line 20 40 20 -10 #005500 3 1>
-  <Line 20 20 20 10 #005500 3 1>
-  <Line -40 60 0 -20 #005500 3 1>
-  <Text -34 37 12 #005500 0 "A -> D">
-  <Line 20 60 20 -10 #005500 3 1>
-  <Line 20 40 20 10 #005500 3 1>
-  <Line -40 60 60 0 #005500 3 1>
-  <Line -60 30 20 0 #000080 2 1>
-  <Line -60 50 20 0 #000080 2 1>
-  <Line 40 30 20 0 #000080 2 1>
-  <Line 40 50 20 0 #000080 2 1>
-  <.PortSym -60 30 5 0>
-  <.PortSym -60 50 7 0>
-  <.PortSym 60 30 6 180>
-  <.PortSym 60 50 8 180>
-  <.ID -40 66 X >
+  <Line -50 -30 20 0 #000080 2 1>
+  <Line -30 -20 0 -20 #005500 3 1>
+  <.PortSym -50 -30 1 0 >
+  <Line -30 -40 60 0 #005500 3 1>
+  <Line 30 -20 20 -10 #005500 3 1>
+  <Line 30 -40 20 10 #005500 3 1>
+  <Line 50 -30 20 0 #000080 2 1>
+  <.PortSym 70 -30 2 180 >
+  <Line -30 0 0 -20 #005500 3 1>
+  <Line 30 0 20 -10 #005500 3 1>
+  <Line 30 -20 20 10 #005500 3 1>
+  <Line -50 -10 20 0 #000080 2 1>
+  <Line 50 -10 20 0 #000080 2 1>
+  <.PortSym -50 -10 3 0 >
+  <.PortSym 70 -10 4 180 >
+  <Line -30 20 0 -20 #005500 3 1>
+  <Line 30 20 20 -10 #005500 3 1>
+  <Line 30 0 20 10 #005500 3 1>
+  <Line -30 40 0 -20 #005500 3 1>
+  <Line 30 40 20 -10 #005500 3 1>
+  <Line 30 20 20 10 #005500 3 1>
+  <Line -30 40 60 0 #005500 3 1>
+  <Line -50 10 20 0 #000080 2 1>
+  <Line -50 30 20 0 #000080 2 1>
+  <Line 50 10 20 0 #000080 2 1>
+  <Line 50 30 20 0 #000080 2 1>
+  <.PortSym -50 10 5 0 >
+  <.PortSym -50 30 7 0 >
+  <.PortSym 70 10 6 180 >
+  <.PortSym 70 30 8 180 >
+  <.ID -30 46 X>
+  <Text -24 20 12 #005500 0 "A -> D">
+  <Text -24 -1 12 #005500 0 "A -> D">
+  <Text -24 -21 12 #005500 0 "A -> D">
+  <Text -24 -40 12 #005500 0 "A -> D">
+  <Line -30 20 60 0 #005500 3 1>
+  <Line -30 0 60 0 #005500 3 1>
+  <Line -30 -20 60 0 #005500 3 1>
 </Symbol>
diff --git a/library/XyceDigital/A2DBRIDGEX8.sym b/library/XyceDigital/A2DBRIDGEX8.sym
index 5b133892..261f462c 100644
--- a/library/XyceDigital/A2DBRIDGEX8.sym
+++ b/library/XyceDigital/A2DBRIDGEX8.sym
@@ -1,80 +1,80 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -40 0 60 0 #005500 3 1>
-  <Line -60 -10 20 0 #000080 2 1>
-  <Line -40 0 0 -20 #005500 3 1>
-  <.PortSym -60 -10 1 0>
-  <Text -34 -23 12 #005500 0 "A -> D">
-  <Line -40 -20 60 0 #005500 3 1>
-  <Line 20 0 20 -10 #005500 3 1>
-  <Line 20 -20 20 10 #005500 3 1>
-  <Line 40 -10 20 0 #000080 2 1>
-  <.PortSym 60 -10 2 180>
-  <Line -40 20 0 -20 #005500 3 1>
-  <Text -34 -3 12 #005500 0 "A -> D">
-  <Line 20 20 20 -10 #005500 3 1>
-  <Line 20 0 20 10 #005500 3 1>
-  <Line -60 10 20 0 #000080 2 1>
-  <Line 40 10 20 0 #000080 2 1>
-  <.PortSym -60 10 3 0>
-  <.PortSym 60 10 4 180>
-  <Line -40 20 60 0 #005500 3 1>
-  <Line -40 40 60 0 #005500 3 1>
-  <Line -40 40 0 -20 #005500 3 1>
-  <Text -34 17 12 #005500 0 "A -> D">
-  <Line -40 20 60 0 #005500 3 1>
-  <Line 20 40 20 -10 #005500 3 1>
-  <Line 20 20 20 10 #005500 3 1>
-  <Line -40 60 0 -20 #005500 3 1>
-  <Text -34 37 12 #005500 0 "A -> D">
-  <Line 20 60 20 -10 #005500 3 1>
-  <Line 20 40 20 10 #005500 3 1>
-  <Line -40 60 60 0 #005500 3 1>
-  <Line -60 30 20 0 #000080 2 1>
-  <Line 40 30 20 0 #000080 2 1>
-  <Line 40 50 20 0 #000080 2 1>
-  <.PortSym -60 30 5 0>
-  <.PortSym -60 50 7 0>
-  <.PortSym 60 30 6 180>
-  <.PortSym 60 50 8 180>
-  <Line -40 80 60 0 #005500 3 1>
-  <Line -40 80 0 -20 #005500 3 1>
-  <Text -34 57 12 #005500 0 "A -> D">
-  <Line -40 60 60 0 #005500 3 1>
-  <Line 20 80 20 -10 #005500 3 1>
-  <Line 20 60 20 10 #005500 3 1>
-  <Line -40 100 0 -20 #005500 3 1>
-  <Text -34 77 12 #005500 0 "A -> D">
-  <Line 20 100 20 -10 #005500 3 1>
-  <Line 20 80 20 10 #005500 3 1>
-  <Line -40 100 60 0 #005500 3 1>
-  <Line -40 120 60 0 #005500 3 1>
-  <Line -40 120 0 -20 #005500 3 1>
-  <Text -34 97 12 #005500 0 "A -> D">
-  <Line -40 100 60 0 #005500 3 1>
-  <Line 20 120 20 -10 #005500 3 1>
-  <Line 20 100 20 10 #005500 3 1>
-  <Line -40 140 0 -20 #005500 3 1>
-  <Text -34 117 12 #005500 0 "A -> D">
-  <Line 20 140 20 -10 #005500 3 1>
-  <Line 20 120 20 10 #005500 3 1>
-  <Line -40 140 60 0 #005500 3 1>
-  <Line -60 50 20 0 #000080 2 1>
-  <Line -60 70 20 0 #000080 2 1>
-  <Line -60 90 20 0 #000080 2 1>
-  <Line -60 110 20 0 #000080 2 1>
-  <Line -60 130 20 0 #000080 2 1>
-  <Line 40 70 20 0 #000080 2 1>
-  <Line 40 90 20 0 #000080 2 1>
-  <Line 40 110 20 0 #000080 2 1>
-  <Line 40 130 20 0 #000080 2 1>
-  <.PortSym -60 70 9 0>
-  <.PortSym 60 70 10 180>
-  <.PortSym -60 90 11 0>
-  <.PortSym 60 90 12 180>
-  <.PortSym -60 110 13 0>
-  <.PortSym 60 110 14 180>
-  <.PortSym -60 130 15 0>
-  <.PortSym 60 130 16 180>
-  <.ID -50 166 X >
+  <Line -30 -60 60 0 #005500 3 1>
+  <Line -50 -70 20 0 #000080 2 1>
+  <Line -30 -60 0 -20 #005500 3 1>
+  <.PortSym -50 -70 1 0 >
+  <Line -30 -80 60 0 #005500 3 1>
+  <Line 30 -60 20 -10 #005500 3 1>
+  <Line 30 -80 20 10 #005500 3 1>
+  <Line 50 -70 20 0 #000080 2 1>
+  <.PortSym 70 -70 2 180 >
+  <Line -30 -40 0 -20 #005500 3 1>
+  <Line 30 -40 20 -10 #005500 3 1>
+  <Line 30 -60 20 10 #005500 3 1>
+  <Line -50 -50 20 0 #000080 2 1>
+  <Line 50 -50 20 0 #000080 2 1>
+  <.PortSym -50 -50 3 0 >
+  <.PortSym 70 -50 4 180 >
+  <Line -30 -40 60 0 #005500 3 1>
+  <Line -30 -20 60 0 #005500 3 1>
+  <Line -30 -20 0 -20 #005500 3 1>
+  <Line -30 -40 60 0 #005500 3 1>
+  <Line 30 -20 20 -10 #005500 3 1>
+  <Line 30 -40 20 10 #005500 3 1>
+  <Line -30 0 0 -20 #005500 3 1>
+  <Line 30 0 20 -10 #005500 3 1>
+  <Line 30 -20 20 10 #005500 3 1>
+  <Line -30 0 60 0 #005500 3 1>
+  <Line -50 -30 20 0 #000080 2 1>
+  <Line 50 -30 20 0 #000080 2 1>
+  <Line 50 -10 20 0 #000080 2 1>
+  <.PortSym -50 -30 5 0 >
+  <.PortSym -50 -10 7 0 >
+  <.PortSym 70 -30 6 180 >
+  <.PortSym 70 -10 8 180 >
+  <Line -30 20 60 0 #005500 3 1>
+  <Line -30 20 0 -20 #005500 3 1>
+  <Line -30 0 60 0 #005500 3 1>
+  <Line 30 20 20 -10 #005500 3 1>
+  <Line 30 0 20 10 #005500 3 1>
+  <Line -30 40 0 -20 #005500 3 1>
+  <Line 30 40 20 -10 #005500 3 1>
+  <Line 30 20 20 10 #005500 3 1>
+  <Line -30 40 60 0 #005500 3 1>
+  <Line -30 60 60 0 #005500 3 1>
+  <Line -30 60 0 -20 #005500 3 1>
+  <Line -30 40 60 0 #005500 3 1>
+  <Line 30 60 20 -10 #005500 3 1>
+  <Line 30 40 20 10 #005500 3 1>
+  <Line -30 80 0 -20 #005500 3 1>
+  <Line 30 80 20 -10 #005500 3 1>
+  <Line 30 60 20 10 #005500 3 1>
+  <Line -30 80 60 0 #005500 3 1>
+  <Line -50 -10 20 0 #000080 2 1>
+  <Line -50 10 20 0 #000080 2 1>
+  <Line -50 30 20 0 #000080 2 1>
+  <Line -50 50 20 0 #000080 2 1>
+  <Line -50 70 20 0 #000080 2 1>
+  <Line 50 10 20 0 #000080 2 1>
+  <Line 50 30 20 0 #000080 2 1>
+  <Line 50 50 20 0 #000080 2 1>
+  <Line 50 70 20 0 #000080 2 1>
+  <.PortSym -50 10 9 0 >
+  <.PortSym 70 10 10 180 >
+  <.PortSym -50 30 11 0 >
+  <.PortSym 70 30 12 180 >
+  <.PortSym -50 50 13 0 >
+  <.PortSym 70 50 14 180 >
+  <.PortSym -50 70 15 0 >
+  <.PortSym 70 70 16 180 >
+  <.ID -30 86 X>
+  <Text -24 -80 12 #005500 0 "A -> D">
+  <Text -24 -61 12 #005500 0 "A -> D">
+  <Text -24 -40 12 #005500 0 "A -> D">
+  <Text -24 -21 12 #005500 0 "A -> D">
+  <Text -24 -1 12 #005500 0 "A -> D">
+  <Text -24 20 12 #005500 0 "A -> D">
+  <Text -24 39 12 #005500 0 "A -> D">
+  <Text -24 59 12 #005500 0 "A -> D">
 </Symbol>
-
diff --git a/library/XyceDigital/AND2.sym b/library/XyceDigital/AND2.sym
index 928e2321..c54e29a6 100644
--- a/library/XyceDigital/AND2.sym
+++ b/library/XyceDigital/AND2.sym
@@ -1,14 +1,12 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -40 -40 20 0 #000080 2 1>
-  <.PortSym -40 -40 1 0>
-  <Line -40 -20 20 0 #000080 2 1>
-  <.PortSym -40 -20 2 0>
-  <Line 40 -30 -20 0 #000080 2 1>
-  <.PortSym 40 -30 3 180>
-  <Rectangle -20 -60 40 60 #005500 3 1 #c0c0c0 1 0>
-  <.ID -30 14 X>
-  <Text -5 -58 12 #005500 0 "&">
+  <Rectangle -20 -30 40 60 #005500 3 1 #c0c0c0 1 0>
+  <Line -40 -10 20 0 #000080 2 1>
+  <.PortSym -40 -10 1 0 >
+  <Line -40 10 20 0 #000080 2 1>
+  <.PortSym -40 10 2 0 >
+  <Line 40 0 -20 0 #000080 2 1>
+  <.PortSym 40 0 3 180 >
+  <Text -5 -28 12 #005500 0 "&">
+  <.ID -30 34 X>
 </Symbol>
-
-
-
diff --git a/library/XyceDigital/AND4.sym b/library/XyceDigital/AND4.sym
index 98c77a61..091c6ac7 100644
--- a/library/XyceDigital/AND4.sym
+++ b/library/XyceDigital/AND4.sym
@@ -1,15 +1,16 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -60 -40 20 0 #000080 2 1>
-  <.PortSym -60 -40 1 0>
-  <Line -60 -20 20 0 #000080 2 1>
-  <.PortSym -60 -20 2 0>
-  <Line -60 0 20 0 #000080 2 1>
-  <Line -60 20 20 0 #000080 2 1>
-  <.PortSym -60 0 3 0>
-  <.PortSym -60 20 4 0>
-  <Rectangle -40 -70 70 120 #005500 3 1 #c0c0c0 1 0>
-  <.ID -40 54 X>
-  <Text -11 -71 12 #005500 0 "&">
-  <Line 30 -10 30 0 #000080 2 1>
-  <.PortSym 60 -10 5 180>
+  <Line -50 -30 20 0 #000080 2 1>
+  <.PortSym -50 -30 1 0 >
+  <Line -50 -10 20 0 #000080 2 1>
+  <.PortSym -50 -10 2 0 >
+  <Line -50 10 20 0 #000080 2 1>
+  <Line -50 30 20 0 #000080 2 1>
+  <.PortSym -50 10 3 0 >
+  <.PortSym -50 30 4 0 >
+  <Rectangle -30 -60 60 120 #005500 3 1 #c0c0c0 1 0>
+  <.ID -30 64 X>
+  <Line 30 0 20 0 #000080 2 1>
+  <.PortSym 50 0 5 180 >
+  <Text -6 -56 12 #005500 0 "&">
 </Symbol>
diff --git a/library/XyceDigital/ANDOR4X2.sym b/library/XyceDigital/ANDOR4X2.sym
index fc813110..7692ef69 100644
--- a/library/XyceDigital/ANDOR4X2.sym
+++ b/library/XyceDigital/ANDOR4X2.sym
@@ -1,33 +1,32 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
   <Line -60 -100 20 0 #000080 2 1>
-  <.PortSym -60 -100 1 0>
+  <.PortSym -60 -100 1 0 >
   <Line -60 -80 20 0 #000080 2 1>
-  <.PortSym -61 -79 2 0>
+  <.PortSym -61 -79 2 0 >
   <Line -40 -60 40 0 #005500 3 1>
   <Line -60 -40 20 0 #000080 2 1>
   <Line -60 -20 20 0 #000080 2 1>
-  <.PortSym -60 -40 3 0>
-  <.PortSym -60 -20 4 0>
+  <.PortSym -60 -40 3 0 >
+  <.PortSym -60 -20 4 0 >
   <Line -40 0 40 0 #005500 3 1>
   <Line -60 20 20 0 #000080 2 1>
-  <.PortSym -60 20 5 0>
+  <.PortSym -60 20 5 0 >
   <Line -60 40 20 0 #000080 2 1>
-  <.PortSym -60 40 6 0>
+  <.PortSym -60 40 6 0 >
   <Line -40 60 40 0 #005500 3 1>
   <Line -60 80 20 0 #000080 2 1>
-  <.PortSym -60 80 7 0>
+  <.PortSym -60 80 7 0 >
   <Line -60 100 20 0 #000080 2 1>
-  <.PortSym -60 100 8 0>
-  <Rectangle -40 -120 40 260 #005500 3 1 #c0c0c0 1 0>
-  <Rectangle 0 -120 50 260 #005500 3 1 #c0c0c0 1 0>
-  <Line 50 0 30 0 #000080 2 1>
-  <.PortSym 80 0 9 180>
-  <.ID -30 144 X>
-  <Text -27 -125 18 #005500 0 "&">
-  <Text -26 -65 18 #005500 0 "&">
-  <Text -26 -5 18 #005500 0 "&">
-  <Text -26 55 18 #005500 0 "&">
-  <Text 18 -127 18 #005500 0 "≥">
+  <.PortSym -60 100 8 0 >
+  <Rectangle -40 -120 40 240 #005500 3 1 #c0c0c0 1 0>
+  <Rectangle 0 -120 50 240 #005500 3 1 #c0c0c0 1 0>
+  <Line 50 0 20 0 #000080 2 1>
+  <Text -27 -115 18 #005500 0 "&">
+  <.PortSym 70 0 9 180 >
+  <.ID -30 124 X>
+  <Text -26 -55 18 #005500 0 "&">
+  <Text -26 5 18 #005500 0 "&">
+  <Text 18 -17 18 #005500 0 "=">
+  <Text -26 65 18 #005500 0 "&">
 </Symbol>
-
-
diff --git a/library/XyceDigital/BUF.sym b/library/XyceDigital/BUF.sym
index 30f8b912..1cd26919 100644
--- a/library/XyceDigital/BUF.sym
+++ b/library/XyceDigital/BUF.sym
@@ -1,3 +1,4 @@
+<Qucs Schematic 1.0.0>
 <Symbol>
   <Line 40 -30 -20 0 #000080 2 1>
   <Rectangle -20 -60 40 60 #005500 3 1 #c0c0c0 1 0>
diff --git a/library/XyceDigital/D2ABRIDGE.sym b/library/XyceDigital/D2ABRIDGE.sym
index aa6b8cf0..bce7cf93 100644
--- a/library/XyceDigital/D2ABRIDGE.sym
+++ b/library/XyceDigital/D2ABRIDGE.sym
@@ -1,15 +1,14 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -60 -60 20 0 #000080 2 1>
-  <Line -40 -50 0 -20 #005500 3 1>
-  <.PortSym -60 -60 1 0>
-  <Text -34 -73 12 #005500 0 "D -> A">
-  <Line 40 -60 20 0 #000080 2 1>
-  <.PortSym 60 -60 2 180>
-  <Line -40 -50 60 0 #005500 3 1>
-  <Line -40 -70 60 0 #005500 3 1>
-  <Line 20 -50 20 -10 #005500 3 1>
-  <Line 20 -70 20 10 #005500 3 1>
-  <.ID -40 -44 X >
+  <Line -50 0 20 0 #000080 2 1>
+  <Line -30 10 0 -20 #005500 3 1>
+  <.PortSym -50 0 1 0 >
+  <Line 50 0 20 0 #000080 2 1>
+  <.PortSym 70 0 2 180 >
+  <Line -30 10 60 0 #005500 3 1>
+  <Line -30 -10 60 0 #005500 3 1>
+  <Line 30 10 20 -10 #005500 3 1>
+  <Line 30 -10 20 10 #005500 3 1>
+  <Text -24 -11 12 #005500 0 "D -> A">
+  <.ID -30 17 X>
 </Symbol>
-
-
diff --git a/library/XyceDigital/D2ABRIDGEX2.sym b/library/XyceDigital/D2ABRIDGEX2.sym
index 466fb498..1108a345 100644
--- a/library/XyceDigital/D2ABRIDGEX2.sym
+++ b/library/XyceDigital/D2ABRIDGEX2.sym
@@ -1,25 +1,23 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -60 -60 20 0 #000080 2 1>
-  <Line -40 -50 0 -20 #005500 3 1>
-  <.PortSym -60 -60 1 0>
-  <Text -34 -73 12 #005500 0 "D -> A">
-  <Line 40 -60 20 0 #000080 2 1>
-  <.PortSym 60 -60 2 180>
-  <Line -40 -50 60 0 #005500 3 1>
-  <Line -40 -70 60 0 #005500 3 1>
-  <Line 20 -50 20 -10 #005500 3 1>
-  <Line 20 -70 20 10 #005500 3 1>
-  <Line -40 -30 0 -20 #005500 3 1>
-  <Text -34 -53 12 #005500 0 "D -> A">
-  <Line -40 -30 60 0 #005500 3 1>
-  <Line -40 -50 60 0 #005500 3 1>
-  <Line 20 -30 20 -10 #005500 3 1>
-  <Line 20 -50 20 10 #005500 3 1>
-  <Line -60 -40 20 0 #000080 2 1>
-  <Line 40 -40 20 0 #000080 2 1>
-  <.PortSym -60 -40 3 0>
-  <.PortSym 60 -40 4 180>
-  <.ID -40 -14 X >
+  <Line -50 -10 20 0 #000080 2 1>
+  <Line -30 0 0 -20 #005500 3 1>
+  <.PortSym -50 -10 1 0 >
+  <Line 50 -10 20 0 #000080 2 1>
+  <.PortSym 70 -10 2 180 >
+  <Line -30 0 60 0 #005500 3 1>
+  <Line -30 -20 60 0 #005500 3 1>
+  <Line 30 0 20 -10 #005500 3 1>
+  <Line 30 -20 20 10 #005500 3 1>
+  <Line -30 20 0 -20 #005500 3 1>
+  <Line -30 20 60 0 #005500 3 1>
+  <Line 30 20 20 -10 #005500 3 1>
+  <Line 30 0 20 10 #005500 3 1>
+  <Line -50 10 20 0 #000080 2 1>
+  <Line 50 10 20 0 #000080 2 1>
+  <.PortSym -50 10 3 0 >
+  <.PortSym 70 10 4 180 >
+  <.ID -30 26 X>
+  <Text -24 -21 12 #005500 0 "D -> A">
+  <Text -23 -1 12 #005500 0 "D -> A">
 </Symbol>
-
-
diff --git a/library/XyceDigital/D2ABRIDGEX4.sym b/library/XyceDigital/D2ABRIDGEX4.sym
index e0e61a8b..8b467b72 100644
--- a/library/XyceDigital/D2ABRIDGEX4.sym
+++ b/library/XyceDigital/D2ABRIDGEX4.sym
@@ -1,44 +1,43 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -60 -60 20 0 #000080 2 1>
-  <Line -40 -50 0 -20 #005500 3 1>
-  <.PortSym -60 -60 1 0>
-  <Text -34 -73 12 #005500 0 "D -> A">
-  <Line 40 -60 20 0 #000080 2 1>
-  <.PortSym 60 -60 2 180>
-  <Line -40 -50 60 0 #005500 3 1>
-  <Line -40 -70 60 0 #005500 3 1>
-  <Line 20 -50 20 -10 #005500 3 1>
-  <Line 20 -70 20 10 #005500 3 1>
-  <Line -40 -30 0 -20 #005500 3 1>
-  <Text -34 -53 12 #005500 0 "D -> A">
-  <Line -40 -30 60 0 #005500 3 1>
-  <Line -40 -50 60 0 #005500 3 1>
-  <Line 20 -30 20 -10 #005500 3 1>
-  <Line 20 -50 20 10 #005500 3 1>
-  <Line -60 -40 20 0 #000080 2 1>
-  <Line 40 -40 20 0 #000080 2 1>
-  <.PortSym 60 -40 4 180>
-  <Line -40 -10 0 -20 #005500 3 1>
-  <Text -34 -33 12 #005500 0 "D -> A">
-  <Line -40 -10 60 0 #005500 3 1>
-  <Line -40 -30 60 0 #005500 3 1>
-  <Line 20 -10 20 -10 #005500 3 1>
-  <Line 20 -30 20 10 #005500 3 1>
-  <Line -40 10 0 -20 #005500 3 1>
-  <Text -34 -13 12 #005500 0 "D -> A">
-  <Line -40 10 60 0 #005500 3 1>
-  <Line -40 -10 60 0 #005500 3 1>
-  <Line 20 10 20 -10 #005500 3 1>
-  <Line 20 -10 20 10 #005500 3 1>
-  <Line -60 0 20 0 #000080 2 1>
-  <Line 40 -20 20 0 #000080 2 1>
-  <Line 40 0 20 0 #000080 2 1>
-  <Line -60 -20 20 0 #000080 2 1>
-  <.PortSym -60 -40 3 0>
-  <.PortSym -60 -20 5 0>
-  <.PortSym 60 -20 6 180>
-  <.PortSym -60 0 7 0>
-  <.PortSym 60 0 8 180>
-  <.ID -40 16 X >
+  <Line -50 -30 20 0 #000080 2 1>
+  <Line -30 -20 0 -20 #005500 3 1>
+  <.PortSym -50 -30 1 0 >
+  <Line 50 -30 20 0 #000080 2 1>
+  <.PortSym 70 -30 2 180 >
+  <Line -30 -20 60 0 #005500 3 1>
+  <Line -30 -40 60 0 #005500 3 1>
+  <Line 30 -20 20 -10 #005500 3 1>
+  <Line 30 -40 20 10 #005500 3 1>
+  <Line -30 0 0 -20 #005500 3 1>
+  <Line -30 0 60 0 #005500 3 1>
+  <Line -30 -20 60 0 #005500 3 1>
+  <Line 30 0 20 -10 #005500 3 1>
+  <Line 30 -20 20 10 #005500 3 1>
+  <Line -50 -10 20 0 #000080 2 1>
+  <Line 50 -10 20 0 #000080 2 1>
+  <.PortSym 70 -10 4 180 >
+  <Line -30 20 0 -20 #005500 3 1>
+  <Line -30 20 60 0 #005500 3 1>
+  <Line 30 20 20 -10 #005500 3 1>
+  <Line 30 0 20 10 #005500 3 1>
+  <Line -30 40 0 -20 #005500 3 1>
+  <Line -30 40 60 0 #005500 3 1>
+  <Line -30 20 60 0 #005500 3 1>
+  <Line 30 40 20 -10 #005500 3 1>
+  <Line 30 20 20 10 #005500 3 1>
+  <Line -50 30 20 0 #000080 2 1>
+  <Line 50 10 20 0 #000080 2 1>
+  <Line 50 30 20 0 #000080 2 1>
+  <Line -50 10 20 0 #000080 2 1>
+  <.PortSym -50 -10 3 0 >
+  <.PortSym -50 10 5 0 >
+  <.PortSym 70 10 6 180 >
+  <.PortSym -50 30 7 0 >
+  <.PortSym 70 30 8 180 >
+  <.ID -30 46 X>
+  <Text -24 -41 12 #005500 0 "D -> A">
+  <Text -24 -21 12 #005500 0 "D -> A">
+  <Text -24 0 12 #005500 0 "D -> A">
+  <Text -24 19 12 #005500 0 "D -> A">
 </Symbol>
-
diff --git a/library/XyceDigital/D2ABRIDGEX8.sym b/library/XyceDigital/D2ABRIDGEX8.sym
index e226daad..0f54b620 100644
--- a/library/XyceDigital/D2ABRIDGEX8.sym
+++ b/library/XyceDigital/D2ABRIDGEX8.sym
@@ -1,84 +1,84 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -60 -60 20 0 #000080 2 1>
-  <Line -40 -50 0 -20 #005500 3 1>
-  <.PortSym -60 -60 1 0>
-  <Text -34 -73 12 #005500 0 "D -> A">
-  <Line 40 -60 20 0 #000080 2 1>
-  <.PortSym 60 -60 2 180>
-  <Line -40 -50 60 0 #005500 3 1>
-  <Line -40 -70 60 0 #005500 3 1>
-  <Line 20 -50 20 -10 #005500 3 1>
-  <Line 20 -70 20 10 #005500 3 1>
-  <Line -40 -30 0 -20 #005500 3 1>
-  <Text -34 -53 12 #005500 0 "D -> A">
-  <Line -40 -30 60 0 #005500 3 1>
-  <Line -40 -50 60 0 #005500 3 1>
-  <Line 20 -30 20 -10 #005500 3 1>
-  <Line 20 -50 20 10 #005500 3 1>
-  <Line -60 -40 20 0 #000080 2 1>
-  <Line 40 -40 20 0 #000080 2 1>
-  <.PortSym 60 -40 4 180>
-  <Line -40 -10 0 -20 #005500 3 1>
-  <Text -34 -33 12 #005500 0 "D -> A">
-  <Line -40 -10 60 0 #005500 3 1>
-  <Line -40 -30 60 0 #005500 3 1>
-  <Line 20 -10 20 -10 #005500 3 1>
-  <Line 20 -30 20 10 #005500 3 1>
-  <Line -40 10 0 -20 #005500 3 1>
-  <Text -34 -13 12 #005500 0 "D -> A">
-  <Line -40 10 60 0 #005500 3 1>
-  <Line -40 -10 60 0 #005500 3 1>
-  <Line 20 10 20 -10 #005500 3 1>
-  <Line 20 -10 20 10 #005500 3 1>
-  <Line -60 0 20 0 #000080 2 1>
-  <Line 40 -20 20 0 #000080 2 1>
-  <Line 40 0 20 0 #000080 2 1>
-  <Line -60 -20 20 0 #000080 2 1>
-  <.PortSym -60 -40 3 0>
-  <.PortSym -60 -20 5 0>
-  <.PortSym 60 -20 6 180>
-  <.PortSym -60 0 7 0>
-  <.PortSym 60 0 8 180>
-  <Line -40 30 0 -20 #005500 3 1>
-  <Text -34 7 12 #005500 0 "D -> A">
-  <Line -40 30 60 0 #005500 3 1>
-  <Line -40 10 60 0 #005500 3 1>
-  <Line 20 30 20 -10 #005500 3 1>
-  <Line 20 10 20 10 #005500 3 1>
-  <Line -40 50 0 -20 #005500 3 1>
-  <Text -34 27 12 #005500 0 "D -> A">
-  <Line -40 50 60 0 #005500 3 1>
-  <Line -40 30 60 0 #005500 3 1>
-  <Line 20 50 20 -10 #005500 3 1>
-  <Line 20 30 20 10 #005500 3 1>
-  <Line -40 70 0 -20 #005500 3 1>
-  <Text -34 47 12 #005500 0 "D -> A">
-  <Line -40 70 60 0 #005500 3 1>
-  <Line -40 50 60 0 #005500 3 1>
-  <Line 20 70 20 -10 #005500 3 1>
-  <Line 20 50 20 10 #005500 3 1>
-  <Line -40 90 0 -20 #005500 3 1>
-  <Text -34 67 12 #005500 0 "D -> A">
-  <Line -40 90 60 0 #005500 3 1>
-  <Line -40 70 60 0 #005500 3 1>
-  <Line 20 90 20 -10 #005500 3 1>
-  <Line 20 70 20 10 #005500 3 1>
-  <Line -60 20 20 0 #000080 2 1>
-  <Line -60 40 20 0 #000080 2 1>
-  <Line -60 60 20 0 #000080 2 1>
-  <Line -60 80 20 0 #000080 2 1>
-  <Line 40 20 20 0 #000080 2 1>
-  <Line 40 40 20 0 #000080 2 1>
-  <Line 40 60 20 0 #000080 2 1>
-  <Line 40 80 20 0 #000080 2 1>
-  <.PortSym -60 20 9 0>
-  <.PortSym -60 40 11 0>
-  <.PortSym -60 60 13 0>
-  <.PortSym -60 80 15 0>
-  <.PortSym 60 20 10 180>
-  <.PortSym 60 40 12 180>
-  <.PortSym 60 60 14 180>
-  <.PortSym 60 80 16 180>
-  <.ID -50 96 X >
+  <Line -50 -70 20 0 #000080 2 1>
+  <Line -30 -60 0 -20 #005500 3 1>
+  <.PortSym -50 -70 1 0 >
+  <Line 50 -70 20 0 #000080 2 1>
+  <.PortSym 70 -70 2 180 >
+  <Line -30 -60 60 0 #005500 3 1>
+  <Line -30 -80 60 0 #005500 3 1>
+  <Line 30 -60 20 -10 #005500 3 1>
+  <Line 30 -80 20 10 #005500 3 1>
+  <Line -30 -40 0 -20 #005500 3 1>
+  <Line -30 -40 60 0 #005500 3 1>
+  <Line -30 -60 60 0 #005500 3 1>
+  <Line 30 -40 20 -10 #005500 3 1>
+  <Line 30 -60 20 10 #005500 3 1>
+  <Line -50 -50 20 0 #000080 2 1>
+  <Line 50 -50 20 0 #000080 2 1>
+  <.PortSym 70 -50 4 180 >
+  <Line -30 -20 0 -20 #005500 3 1>
+  <Line -30 -20 60 0 #005500 3 1>
+  <Line -30 -40 60 0 #005500 3 1>
+  <Line 30 -20 20 -10 #005500 3 1>
+  <Line 30 -40 20 10 #005500 3 1>
+  <Line -30 0 0 -20 #005500 3 1>
+  <Line -30 0 60 0 #005500 3 1>
+  <Line -30 -20 60 0 #005500 3 1>
+  <Line 30 0 20 -10 #005500 3 1>
+  <Line 30 -20 20 10 #005500 3 1>
+  <Line -50 -10 20 0 #000080 2 1>
+  <Line 50 -30 20 0 #000080 2 1>
+  <Line 50 -10 20 0 #000080 2 1>
+  <Line -50 -30 20 0 #000080 2 1>
+  <.PortSym -50 -50 3 0 >
+  <.PortSym -50 -30 5 0 >
+  <.PortSym 70 -30 6 180 >
+  <.PortSym -50 -10 7 0 >
+  <.PortSym 70 -10 8 180 >
+  <Line -30 20 0 -20 #005500 3 1>
+  <Line -30 20 60 0 #005500 3 1>
+  <Line -30 0 60 0 #005500 3 1>
+  <Line 30 20 20 -10 #005500 3 1>
+  <Line 30 0 20 10 #005500 3 1>
+  <Line -30 40 0 -20 #005500 3 1>
+  <Line -30 40 60 0 #005500 3 1>
+  <Line -30 20 60 0 #005500 3 1>
+  <Line 30 40 20 -10 #005500 3 1>
+  <Line 30 20 20 10 #005500 3 1>
+  <Line -30 60 0 -20 #005500 3 1>
+  <Line -30 60 60 0 #005500 3 1>
+  <Line -30 40 60 0 #005500 3 1>
+  <Line 30 60 20 -10 #005500 3 1>
+  <Line 30 40 20 10 #005500 3 1>
+  <Line -30 80 0 -20 #005500 3 1>
+  <Line -30 80 60 0 #005500 3 1>
+  <Line -30 60 60 0 #005500 3 1>
+  <Line 30 80 20 -10 #005500 3 1>
+  <Line 30 60 20 10 #005500 3 1>
+  <Line -50 10 20 0 #000080 2 1>
+  <Line -50 30 20 0 #000080 2 1>
+  <Line -50 50 20 0 #000080 2 1>
+  <Line -50 70 20 0 #000080 2 1>
+  <Line 50 10 20 0 #000080 2 1>
+  <Line 50 30 20 0 #000080 2 1>
+  <Line 50 50 20 0 #000080 2 1>
+  <Line 50 70 20 0 #000080 2 1>
+  <.PortSym -50 10 9 0 >
+  <.PortSym -50 30 11 0 >
+  <.PortSym -50 50 13 0 >
+  <.PortSym -50 70 15 0 >
+  <.PortSym 70 10 10 180 >
+  <.PortSym 70 30 12 180 >
+  <.PortSym 70 50 14 180 >
+  <.PortSym 70 70 16 180 >
+  <.ID -30 86 X>
+  <Text -24 -81 12 #005500 0 "D -> A">
+  <Text -24 -61 12 #005500 0 "D -> A">
+  <Text -24 -41 12 #005500 0 "D -> A">
+  <Text -24 -21 12 #005500 0 "D -> A">
+  <Text -24 -1 12 #005500 0 "D -> A">
+  <Text -24 19 12 #005500 0 "D -> A">
+  <Text -24 39 12 #005500 0 "D -> A">
+  <Text -24 59 12 #005500 0 "D -> A">
 </Symbol>
-
diff --git a/library/XyceDigital/FADDER.sym b/library/XyceDigital/FADDER.sym
index 3663a4ed..af4592e8 100644
--- a/library/XyceDigital/FADDER.sym
+++ b/library/XyceDigital/FADDER.sym
@@ -1,25 +1,24 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -60 -20 20 0 #000080 2 1>
-  <.PortSym -60 -20 1 0>
-  <Rectangle -40 -60 120 100 #005500 3 1 #c0c0c0 1 0>
-  <Line -60 0 20 0 #000080 2 1>
-  <.PortSym -60 0 2 0>
-  <Line -60 20 20 0 #000080 2 1>
-  <.PortSym -60 20 3 0>
-  <Line 80 -20 20 0 #000080 2 1>
-  <Line 80 20 20 0 #000080 2 1>
-  <.PortSym 100 -20 4 180>
-  <.PortSym 100 20 5 180>
-  <Line 25 -55 -15 0 #005500 4 1>
-  <Line 10 -55 10 10 #005500 4 1>
-  <Line 20 -45 -10 10 #005500 4 1>
-  <Line 25 -35 -15 0 #005500 4 1>
-  <Text -35 -33 10 #005500 0 "in1">
-  <Text -35 -12 10 #005500 0 "in2">
-  <Text -36 8 10 #005500 0 "carryin">
-  <Text 25 8 10 #005500 0 "carryOut">
-  <Text 28 -30 10 #005500 0 "sumOut">
-  <.ID -16 45 X>
+  <Line -80 -10 20 0 #000080 2 1>
+  <.PortSym -80 -10 1 0 >
+  <Rectangle -60 -50 120 100 #005500 3 1 #c0c0c0 1 0>
+  <Line -80 10 20 0 #000080 2 1>
+  <.PortSym -80 10 2 0 >
+  <Line -80 30 20 0 #000080 2 1>
+  <.PortSym -80 30 3 0 >
+  <Line 60 -10 20 0 #000080 2 1>
+  <Line 60 30 20 0 #000080 2 1>
+  <.PortSym 80 -10 4 180 >
+  <.PortSym 80 30 5 180 >
+  <Line 5 -45 -15 0 #005500 4 1>
+  <Line -10 -45 10 10 #005500 4 1>
+  <Line 0 -35 -10 10 #005500 4 1>
+  <Line 5 -25 -15 0 #005500 4 1>
+  <Text -55 -23 10 #005500 0 "in1">
+  <Text -55 -2 10 #005500 0 "in2">
+  <Text -56 18 10 #005500 0 "carryin">
+  <Text 5 18 10 #005500 0 "carryOut">
+  <.ID -36 55 X>
+  <Text 8 -20 10 #005500 0 "sumOut">
 </Symbol>
-
-
diff --git a/library/XyceDigital/GEN0OR1X4.sym b/library/XyceDigital/GEN0OR1X4.sym
index d02daabd..a7f6d5b7 100644
--- a/library/XyceDigital/GEN0OR1X4.sym
+++ b/library/XyceDigital/GEN0OR1X4.sym
@@ -1,19 +1,18 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line 20 0 20 0 #000080 2 1>
-  <Rectangle -64 -39 84 119 #005500 3 1 #c0c0c0 1 0>
-  <Text 7 -10 12 #005500 0 "0">
-  <.PortSym 40 0 1 180>
-  <Text -62 -38 12 #005500 0 " 0 or 1 gen">
-  <Line 20 20 20 0 #000080 2 1>
-  <.PortSym 40 20 2 180>
-  <Text 8 10 12 #005500 0 "1">
-  <Text 8 28 12 #005500 0 "2">
-  <Line 20 40 20 0 #000080 2 1>
-  <.PortSym 40 40 3 180>
-  <Text 8 50 12 #005500 0 "3">
-  <.PortSym 40 60 4 180>
-  <Line 20 60 20 0 #000080 2 1>
-  <.ID -60 94 X >
+  <Line 40 -30 20 0 #000080 2 1>
+  <Text 27 -40 12 #005500 0 "0">
+  <.PortSym 60 -30 1 180 >
+  <Text -42 -68 12 #005500 0 " 0 or 1 gen">
+  <Line 40 -10 20 0 #000080 2 1>
+  <.PortSym 60 -10 2 180 >
+  <Text 28 -20 12 #005500 0 "1">
+  <Text 28 -2 12 #005500 0 "2">
+  <Line 40 10 20 0 #000080 2 1>
+  <.PortSym 60 10 3 180 >
+  <Text 28 20 12 #005500 0 "3">
+  <.PortSym 60 30 4 180 >
+  <Line 40 30 20 0 #000080 2 1>
+  <.ID -40 54 X>
+  <Rectangle -40 -69 80 119 #005500 3 1 #c0c0c0 1 0>
 </Symbol>
-
-
diff --git a/library/XyceDigital/GEN0OR1X8.sym b/library/XyceDigital/GEN0OR1X8.sym
index 2921cfc0..f804d00c 100644
--- a/library/XyceDigital/GEN0OR1X8.sym
+++ b/library/XyceDigital/GEN0OR1X8.sym
@@ -1,33 +1,30 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -160 -20 0 0 #000080 2 1>
-  <Line -110 -20 0 0 #000080 2 1>
-  <Line 40 -20 20 0 #000080 2 1>
-  <.PortSym 60 -20 1 180>
-  <Text 24 -33 12 #005500 0 "0">
-  <Text 24 -15 12 #005500 0 "1">
-  <Line 40 0 20 0 #000080 2 1>
-  <.PortSym 60 0 2 180>
-  <Text 24 6 12 #005500 0 "2">
-  <Line 40 20 20 0 #000080 2 1>
-  <.PortSym 60 20 3 180>
-  <Text 24 27 12 #000000 0 "3">
-  <Text 24 46 12 #005500 0 "4">
-  <Text 24 66 12 #005500 0 "5">
-  <Text 24 84 12 #005500 0 "6">
-  <Text 24 104 12 #005500 0 "7">
-  <Line 40 40 20 0 #000080 2 1>
-  <.PortSym 60 40 4 180>
-  <Line 40 60 20 0 #000080 2 1>
-  <.PortSym 60 60 5 180>
-  <Line 40 80 20 0 #000080 2 1>
-  <.PortSym 60 80 6 180>
-  <Line 40 100 20 0 #000080 2 1>
-  <.PortSym 60 100 7 180>
-  <Line 60 120 -20 0 #000080 2 1>
-  <.PortSym 60 120 8 180>
-  <Rectangle -60 -70 100 210 #005500 3 1 #c0c0c0 1 0>
-  <Text -46 -65 12 #005500 0 "0 or 1 gen">
-  <.ID -175 -83 X >
+  <Line 50 -70 20 0 #000080 2 1>
+  <.PortSym 70 -70 1 180 >
+  <Text 34 -83 12 #005500 0 "0">
+  <Text 34 -65 12 #005500 0 "1">
+  <Line 50 -50 20 0 #000080 2 1>
+  <.PortSym 70 -50 2 180 >
+  <Text 34 -44 12 #005500 0 "2">
+  <Line 50 -30 20 0 #000080 2 1>
+  <.PortSym 70 -30 3 180 >
+  <Text 34 -23 12 #000000 0 "3">
+  <Text 34 -4 12 #005500 0 "4">
+  <Text 34 16 12 #005500 0 "5">
+  <Text 34 34 12 #005500 0 "6">
+  <Text 34 54 12 #005500 0 "7">
+  <Line 50 -10 20 0 #000080 2 1>
+  <.PortSym 70 -10 4 180 >
+  <Line 50 10 20 0 #000080 2 1>
+  <.PortSym 70 10 5 180 >
+  <Line 50 30 20 0 #000080 2 1>
+  <.PortSym 70 30 6 180 >
+  <Line 50 50 20 0 #000080 2 1>
+  <.PortSym 70 50 7 180 >
+  <Line 70 70 -20 0 #000080 2 1>
+  <.PortSym 70 70 8 180 >
+  <Rectangle -50 -120 100 210 #005500 3 1 #c0c0c0 1 0>
+  <Text -36 -115 12 #005500 0 "0 or 1 gen">
+  <.ID -45 97 X>
 </Symbol>
-
-
diff --git a/library/XyceDigital/INV.sym b/library/XyceDigital/INV.sym
index 6a64ef99..edb3f2e9 100644
--- a/library/XyceDigital/INV.sym
+++ b/library/XyceDigital/INV.sym
@@ -1,3 +1,4 @@
+<Qucs Schematic 1.0.0>
 <Symbol>
   <Rectangle -20 -60 40 60 #005500 3 1 #c0c0c0 1 0>
   <Text -4 -58 12 #005500 0 "1">
diff --git a/library/XyceDigital/LOGIC0.sym b/library/XyceDigital/LOGIC0.sym
index 45ed96ed..4d023d26 100644
--- a/library/XyceDigital/LOGIC0.sym
+++ b/library/XyceDigital/LOGIC0.sym
@@ -1,11 +1,12 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -10 30 30 0 #005500 3 1>
-  <Line -10 10 0 20 #005500 3 1>
-  <Line -10 10 30 0 #005500 3 1>
-  <Line 20 10 10 10 #005500 3 1>
-  <Line 20 30 10 -10 #005500 3 1>
-  <Line 30 20 10 0 #000080 2 1>
-  <.PortSym 40 20 1 180>
-  <Text 0 7 12 #005500 0 "0">
-  <.ID -10 34 X>
+  <Line -20 10 30 0 #005500 3 1>
+  <Line -20 -10 0 20 #005500 3 1>
+  <Line -20 -10 30 0 #005500 3 1>
+  <Line 10 -10 10 10 #005500 3 1>
+  <Line 10 10 10 -10 #005500 3 1>
+  <Line 20 0 10 0 #000080 2 1>
+  <.PortSym 30 0 1 180 >
+  <.ID -20 14 X>
+  <Text -9 -11 12 #005500 0 "0">
 </Symbol>
diff --git a/library/XyceDigital/LOGIC1.sym b/library/XyceDigital/LOGIC1.sym
index cb8990c2..2b0dc1e4 100644
--- a/library/XyceDigital/LOGIC1.sym
+++ b/library/XyceDigital/LOGIC1.sym
@@ -1,11 +1,12 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -10 30 30 0 #005500 3 1>
-  <Line -10 10 0 20 #005500 3 1>
-  <Line -10 10 30 0 #005500 3 1>
-  <Line 20 10 10 10 #005500 3 1>
-  <Line 20 30 10 -10 #005500 3 1>
-  <Line 30 20 10 0 #000080 2 1>
-  <.PortSym 40 20 1 180>
-  <Text 0 7 12 #005500 0 "1">
-  <.ID -10 34 X >
+  <Line -20 10 30 0 #005500 3 1>
+  <Line -20 -10 0 20 #005500 3 1>
+  <Line -20 -10 30 0 #005500 3 1>
+  <Line 10 -10 10 10 #005500 3 1>
+  <Line 10 10 10 -10 #005500 3 1>
+  <Line 20 0 10 0 #000080 2 1>
+  <Text -9 -11 12 #005500 0 "0">
+  <.PortSym 30 0 1 180 >
+  <.ID -20 14 X>
 </Symbol>
diff --git a/library/XyceDigital/MUX2TO1.sym b/library/XyceDigital/MUX2TO1.sym
index b05a9126..6e493d21 100644
--- a/library/XyceDigital/MUX2TO1.sym
+++ b/library/XyceDigital/MUX2TO1.sym
@@ -1,22 +1,22 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Rectangle -60 -60 100 130 #005500 3 1 #c0c0c0 1 0>
-  <Text -28 -57 12 #005500 0 "MUX">
-  <Ellipse -70 -25 10 10 #00007f 3 1 #c0c0c0 1 0>
-  <Line -80 -20 10 0 #000080 2 1>
-  <.PortSym -80 -20 1 0>
-  <Line -80 0 20 0 #000080 2 1>
-  <.PortSym -80 0 2 0>
-  <Line -80 20 20 0 #000080 2 1>
-  <.PortSym -80 20 3 0>
-  <Line -80 40 20 0 #000080 2 1>
-  <.PortSym -80 40 4 0>
-  <Text -57 -13 12 #005500 0 "G">
-  <Text -57 -33 12 #005500 0 "En">
-  <Text -58 8 12 #005500 0 "D0">
-  <Text -58 27 12 #005500 0 "D1">
-  <Line 40 10 20 0 #000080 2 1>
-  <.PortSym 60 10 5 180>
-  <Text 23 0 12 #005500 0 "Z">
-  <.ID -61 76 X>
+  <Rectangle -50 -70 100 130 #005500 3 1 #c0c0c0 1 0>
+  <Text -18 -67 12 #005500 0 "MUX">
+  <Ellipse -60 -35 10 10 #00007f 3 1 #c0c0c0 1 0>
+  <Line -70 -30 10 0 #000080 2 1>
+  <.PortSym -70 -30 1 0 >
+  <Line -70 -10 20 0 #000080 2 1>
+  <.PortSym -70 -10 2 0 >
+  <Line -70 10 20 0 #000080 2 1>
+  <.PortSym -70 10 3 0 >
+  <Line -70 30 20 0 #000080 2 1>
+  <.PortSym -70 30 4 0 >
+  <Text -47 -23 12 #005500 0 "G">
+  <Text -47 -43 12 #005500 0 "En">
+  <Text -48 -2 12 #005500 0 "D0">
+  <Text -48 17 12 #005500 0 "D1">
+  <Line 50 0 20 0 #000080 2 1>
+  <.PortSym 70 0 5 180 >
+  <Text 33 -10 12 #005500 0 "Z">
+  <.ID -51 66 X>
 </Symbol>
-
diff --git a/library/XyceDigital/MUX4TO1.sym b/library/XyceDigital/MUX4TO1.sym
index 7a5aed4c..ae31345e 100644
--- a/library/XyceDigital/MUX4TO1.sym
+++ b/library/XyceDigital/MUX4TO1.sym
@@ -1,31 +1,31 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Rectangle -40 -80 90 200 #005500 3 1 #c0c0c0 1 0>
-  <Text -13 -78 12 #005500 0 "MUX">
-  <Line -80 -40 25 0 #000080 2 1>
-  <Ellipse -55 -48 15 15 #005500 3 1 #c0c0c0 1 0>
-  <.PortSym -80 -40 1 0>
-  <Text -36 -52 12 #005500 0 "En">
-  <Line -80 -20 40 0 #000080 2 1>
-  <Text -35 -32 12 #005500 0 "G0">
-  <.PortSym -80 -20 2 0>
-  <Line -80 0 40 0 #000080 2 1>
-  <Line -80 20 40 0 #000080 2 1>
-  <.PortSym -80 0 3 0>
-  <.PortSym -80 20 4 0>
-  <Text -36 -12 12 #005500 0 "G1">
-  <Text -36 9 12 #005500 0 "D0">
-  <Line -80 40 40 0 #000080 2 1>
-  <.PortSym -80 40 5 0>
-  <Text -36 26 12 #005500 0 "D1">
-  <Line -80 60 40 0 #000080 2 1>
-  <.PortSym -80 60 6 0>
-  <Line -80 80 40 0 #000080 2 1>
-  <.PortSym -80 80 7 0>
-  <Text -36 49 12 #005500 0 "D2">
-  <Text -36 70 12 #005500 0 "D3">
-  <Line 50 20 30 0 #000080 2 1>
-  <Text 34 9 14 #005500 0 "Z">
-  <.PortSym 80 20 8 180>
-  <.ID -30 124 X>
+  <Rectangle -50 -100 90 200 #005500 3 1 #c0c0c0 1 0>
+  <Text -23 -98 12 #005500 0 "MUX">
+  <Line -80 -60 15 0 #000080 2 1>
+  <Ellipse -65 -68 15 15 #005500 3 1 #c0c0c0 1 0>
+  <Text -46 -72 12 #005500 0 "En">
+  <Line -80 -40 30 0 #000080 2 1>
+  <Text -45 -52 12 #005500 0 "G0">
+  <Line -80 -20 30 0 #000080 2 1>
+  <Line -80 0 30 0 #000080 2 1>
+  <Text -46 -32 12 #005500 0 "G1">
+  <Text -46 -11 12 #005500 0 "D0">
+  <Text -46 6 12 #005500 0 "D1">
+  <Line -80 40 30 0 #000080 2 1>
+  <Line -80 60 30 0 #000080 2 1>
+  <Text -46 29 12 #005500 0 "D2">
+  <Text -46 50 12 #005500 0 "D3">
+  <Text 24 -11 14 #005500 0 "Z">
+  <.ID -40 104 X>
+  <Line 40 0 20 0 #000080 2 1>
+  <.PortSym 60 0 8 180 >
+  <Line -80 20 30 0 #000080 2 1>
+  <.PortSym -80 -60 1 0 >
+  <.PortSym -80 -40 2 0 >
+  <.PortSym -80 -20 3 0 >
+  <.PortSym -80 0 4 0 >
+  <.PortSym -80 20 5 0 >
+  <.PortSym -80 40 6 0 >
+  <.PortSym -80 60 7 0 >
 </Symbol>
-
diff --git a/library/XyceDigital/MUX8TO1.sym b/library/XyceDigital/MUX8TO1.sym
index 24c9fef3..9cc09698 100644
--- a/library/XyceDigital/MUX8TO1.sym
+++ b/library/XyceDigital/MUX8TO1.sym
@@ -1,46 +1,46 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Rectangle -40 -80 90 290 #005500 3 1 #c0c0c0 1 0>
-  <Text -13 -78 12 #005500 0 "MUX">
-  <Line -80 -40 25 0 #000080 2 1>
-  <Ellipse -55 -48 15 15 #005500 3 1 #c0c0c0 1 0>
-  <.PortSym -80 -40 1 0>
-  <Text -36 -52 12 #005500 0 "En">
-  <Line -80 -20 40 0 #000080 2 1>
-  <.PortSym -80 -20 2 0>
-  <Line -80 0 40 0 #000080 2 1>
-  <Line -80 20 40 0 #000080 2 1>
-  <.PortSym -80 0 3 0>
-  <.PortSym -80 20 4 0>
-  <Line -80 40 40 0 #000080 2 1>
-  <.PortSym -80 40 5 0>
-  <Line -80 60 40 0 #000080 2 1>
-  <.PortSym -80 60 6 0>
-  <Line -80 80 40 0 #000080 2 1>
-  <.PortSym -80 80 7 0>
-  <Line -80 100 40 0 #000080 2 1>
-  <Line -80 120 40 0 #000080 2 1>
-  <Line -80 140 40 0 #000080 2 1>
-  <Line -80 160 40 0 #000080 2 1>
-  <.PortSym -80 100 8 0>
-  <.PortSym -80 120 9 0>
-  <.PortSym -80 140 10 0>
-  <.PortSym -80 160 11 0>
-  <Line 50 50 30 0 #000080 2 1>
-  <Text 33 36 14 #005500 0 "Z">
-  <Line -80 180 40 0 #000080 2 1>
-  <.PortSym -80 180 12 0>
-  <.PortSym 80 50 13 180>
-  <Text -34 167 12 #005500 0 "D7">
-  <Text -35 146 12 #005500 0 "D6">
-  <Text -35 127 12 #000000 0 "D5">
-  <Text -36 107 12 #005500 0 "D4">
-  <Text -36 86 12 #005500 0 "D3">
-  <Text -36 66 12 #005500 0 "D2">
-  <Text -36 47 12 #005500 0 "D1">
-  <Text -36 27 12 #005500 0 "D0">
-  <Text -37 7 12 #005500 0 "G2">
-  <Text -36 -13 12 #005500 0 "G1">
-  <Text -36 -33 12 #005500 0 "G0">
-  <.ID -30 214 X>
+  <Rectangle -50 -130 90 290 #005500 3 1 #c0c0c0 1 0>
+  <Text -23 -128 12 #005500 0 "MUX">
+  <Ellipse -65 -98 15 15 #005500 3 1 #c0c0c0 1 0>
+  <Text -46 -102 12 #005500 0 "En">
+  <Line -80 -70 30 0 #000080 2 1>
+  <Line -80 -50 30 0 #000080 2 1>
+  <Line -80 -30 30 0 #000080 2 1>
+  <Line -80 -10 30 0 #000080 2 1>
+  <Line -80 10 30 0 #000080 2 1>
+  <Line -80 30 30 0 #000080 2 1>
+  <Line -80 50 30 0 #000080 2 1>
+  <Line -80 70 30 0 #000080 2 1>
+  <Line -80 90 30 0 #000080 2 1>
+  <Line -80 110 30 0 #000080 2 1>
+  <Line 40 0 20 0 #000080 2 1>
+  <Text 23 -14 14 #005500 0 "Z">
+  <Line -80 130 30 0 #000080 2 1>
+  <Text -44 117 12 #005500 0 "D7">
+  <Text -45 96 12 #005500 0 "D6">
+  <Text -45 77 12 #000000 0 "D5">
+  <Text -46 57 12 #005500 0 "D4">
+  <Text -46 36 12 #005500 0 "D3">
+  <Text -46 16 12 #005500 0 "D2">
+  <Text -46 -3 12 #005500 0 "D1">
+  <Text -46 -23 12 #005500 0 "D0">
+  <Text -47 -43 12 #005500 0 "G2">
+  <Text -46 -63 12 #005500 0 "G1">
+  <Text -46 -83 12 #005500 0 "G0">
+  <.ID -40 164 X>
+  <.PortSym 60 0 13 180 >
+  <Line -80 -90 15 0 #000080 2 1>
+  <.PortSym -80 -90 1 0 >
+  <.PortSym -80 -70 2 0 >
+  <.PortSym -80 -50 3 0 >
+  <.PortSym -80 -30 4 0 >
+  <.PortSym -80 -10 5 0 >
+  <.PortSym -80 10 6 0 >
+  <.PortSym -80 30 7 0 >
+  <.PortSym -80 50 8 0 >
+  <.PortSym -80 70 9 0 >
+  <.PortSym -80 90 10 0 >
+  <.PortSym -80 110 11 0 >
+  <.PortSym -80 130 12 0 >
 </Symbol>
-
diff --git a/library/XyceDigital/NAND2.sym b/library/XyceDigital/NAND2.sym
index ca87cd88..b45494af 100644
--- a/library/XyceDigital/NAND2.sym
+++ b/library/XyceDigital/NAND2.sym
@@ -1,12 +1,13 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Rectangle -20 -40 40 81 #005500 3 1 #c0c0c0 1 0>
   <Ellipse 20 -5 10 10 #005500 3 1 #c0c0c0 1 0>
-  <Line 30 0 30 0 #000080 2 1>
   <Line -40 -10 20 0 #000080 2 1>
   <Line -40 10 20 0 #000080 2 1>
-  <.PortSym -40 -10 1 0>
-  <.PortSym -40 10 2 0>
-  <.PortSym 60 0 3 180>
-  <.ID -30 44 X>
-  <Text -5 -39 12 #005500 0 "&">
+  <.PortSym -40 -10 1 0 >
+  <.PortSym -40 10 2 0 >
+  <Text -5 -29 12 #005500 0 "&">
+  <Rectangle -20 -30 40 60 #005500 3 1 #c0c0c0 1 0>
+  <.ID -30 34 X>
+  <Line 30 0 10 0 #000080 2 1>
+  <.PortSym 40 0 3 180 >
 </Symbol>
diff --git a/library/XyceDigital/NAND4.sym b/library/XyceDigital/NAND4.sym
index 27e8f2bb..0bc85000 100644
--- a/library/XyceDigital/NAND4.sym
+++ b/library/XyceDigital/NAND4.sym
@@ -1,16 +1,17 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -60 -40 20 0 #000080 2 1>
-  <.PortSym -60 -40 1 0>
-  <Line -60 -20 20 0 #000080 2 1>
-  <.PortSym -60 -20 2 0>
-  <Line -60 0 20 0 #000080 2 1>
-  <Line -60 20 20 0 #000080 2 1>
-  <.PortSym -60 0 3 0>
-  <.PortSym -60 20 4 0>
-  <Rectangle -40 -70 70 120 #005500 3 1 #c0c0c0 1 0>
-  <Ellipse 30 -18 15 14 #00007f 3 1 #c0c0c0 1 0>
-  <Line 45 -10 35 0 #000080 2 1>
-  <.PortSym 80 -10 5 180>
-  <.ID -40 54 X>
-  <Text -11 -71 12 #005500 0 "&">
+  <Line -50 -30 20 0 #000080 2 1>
+  <.PortSym -50 -30 1 0 >
+  <Line -50 -10 20 0 #000080 2 1>
+  <.PortSym -50 -10 2 0 >
+  <Line -50 10 20 0 #000080 2 1>
+  <Line -50 30 20 0 #000080 2 1>
+  <.PortSym -50 10 3 0 >
+  <.PortSym -50 30 4 0 >
+  <.ID -30 64 X>
+  <Rectangle -30 -60 60 120 #005500 3 1 #c0c0c0 1 0>
+  <Ellipse 30 -8 15 14 #00007f 3 1 #c0c0c0 1 0>
+  <Line 45 0 15 0 #000080 2 1>
+  <.PortSym 60 0 5 180 >
+  <Text -6 -56 12 #005500 0 "&">
 </Symbol>
diff --git a/library/XyceDigital/NOR2.sym b/library/XyceDigital/NOR2.sym
index 62af5248..549ee3bb 100644
--- a/library/XyceDigital/NOR2.sym
+++ b/library/XyceDigital/NOR2.sym
@@ -1,13 +1,13 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Rectangle -20 -40 40 81 #005500 3 1 #c0c0c0 1 0>
   <Ellipse 20 -5 10 10 #005500 3 1 #c0c0c0 1 0>
-  <Line 30 0 30 0 #000080 2 1>
+  <Line 30 0 10 0 #000080 2 1>
   <Line -40 -10 20 0 #000080 2 1>
   <Line -40 10 20 0 #000080 2 1>
-  <.PortSym -40 -10 1 0>
-  <.PortSym -40 10 2 0>
-  <.PortSym 60 0 3 180>
-  <.ID -30 44 X>
-  <Text -10 -39 12 #005500 0 "≥ 1">
+  <.PortSym -40 -10 1 0 >
+  <.PortSym -40 10 2 0 >
+  <Rectangle -20 -30 40 60 #005500 3 1 #c0c0c0 1 0>
+  <.ID -30 34 X>
+  <.PortSym 40 0 3 180 >
+  <Text -20 -29 12 #005500 0 ">= 1">
 </Symbol>
-
diff --git a/library/XyceDigital/NOR4.sym b/library/XyceDigital/NOR4.sym
index 4306bf3b..6f2f9503 100644
--- a/library/XyceDigital/NOR4.sym
+++ b/library/XyceDigital/NOR4.sym
@@ -1,16 +1,17 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -60 -40 20 0 #000080 2 1>
-  <.PortSym -60 -40 1 0>
-  <Line -60 -20 20 0 #000080 2 1>
-  <.PortSym -60 -20 2 0>
-  <Line -60 0 20 0 #000080 2 1>
-  <Line -60 20 20 0 #000080 2 1>
-  <.PortSym -60 0 3 0>
-  <.PortSym -60 20 4 0>
-  <Text -16 -71 12 #005500 0 "≥ 1">
-  <Rectangle -40 -70 70 120 #005500 3 1 #c0c0c0 1 0>
-  <Ellipse 30 -18 15 14 #00007f 3 1 #c0c0c0 1 0>
-  <Line 45 -10 35 0 #000080 2 1>
-  <.PortSym 80 -10 5 180>
-  <.ID -40 54 X>
+  <Line -50 -30 20 0 #000080 2 1>
+  <.PortSym -50 -30 1 0 >
+  <Line -50 -10 20 0 #000080 2 1>
+  <.PortSym -50 -10 2 0 >
+  <Line -50 10 20 0 #000080 2 1>
+  <Line -50 30 20 0 #000080 2 1>
+  <.PortSym -50 10 3 0 >
+  <.PortSym -50 30 4 0 >
+  <.ID -30 64 X>
+  <Rectangle -30 -60 60 120 #005500 3 1 #c0c0c0 1 0>
+  <Ellipse 30 -8 15 14 #00007f 3 1 #c0c0c0 1 0>
+  <Line 45 0 15 0 #000080 2 1>
+  <.PortSym 60 0 5 180 >
+  <Text -16 -51 12 #005500 0 ">= 1">
 </Symbol>
diff --git a/library/XyceDigital/NXOR.sym b/library/XyceDigital/NXOR.sym
index a1797b7f..d72028c6 100644
--- a/library/XyceDigital/NXOR.sym
+++ b/library/XyceDigital/NXOR.sym
@@ -1,13 +1,13 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
   <Rectangle -20 -40 40 81 #005500 3 1 #c0c0c0 1 0>
   <Ellipse 20 -5 10 10 #005500 3 1 #c0c0c0 1 0>
-  <Line 30 0 30 0 #000080 2 1>
   <Line -40 -10 20 0 #000080 2 1>
   <Line -40 10 20 0 #000080 2 1>
-  <.PortSym -40 -10 1 0>
-  <.PortSym -40 10 2 0>
-  <.PortSym 60 0 3 180>
+  <.PortSym -40 -10 1 0 >
+  <.PortSym -40 10 2 0 >
   <.ID -30 44 X>
   <Text -10 -39 12 #005500 0 "= 1">
+  <Line 30 0 10 0 #000080 2 1>
+  <.PortSym 40 0 3 180 >
 </Symbol>
-
diff --git a/library/XyceDigital/OR2.sym b/library/XyceDigital/OR2.sym
index 67d833a0..a2c30929 100644
--- a/library/XyceDigital/OR2.sym
+++ b/library/XyceDigital/OR2.sym
@@ -1,12 +1,12 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
   <Line -40 -40 20 0 #000080 2 1>
-  <.PortSym -40 -40 1 0>
+  <.PortSym -40 -40 1 0 >
   <Line -40 -20 20 0 #000080 2 1>
-  <.PortSym -40 -20 2 0>
+  <.PortSym -40 -20 2 0 >
   <Line 40 -30 -20 0 #000080 2 1>
-  <.PortSym 40 -30 3 180>
+  <.PortSym 40 -30 3 180 >
   <Rectangle -20 -60 40 60 #005500 3 1 #c0c0c0 1 0>
-  <Text -11 -58 12 #005500 0 "≥ 1">
   <.ID -30 4 X>
+  <Text -21 -58 12 #005500 0 ">= 1">
 </Symbol>
-
diff --git a/library/XyceDigital/OR4.sym b/library/XyceDigital/OR4.sym
index df95a485..52570d7a 100644
--- a/library/XyceDigital/OR4.sym
+++ b/library/XyceDigital/OR4.sym
@@ -1,17 +1,16 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -60 -40 20 0 #000080 2 1>
-  <.PortSym -60 -40 1 0>
-  <Line -60 -20 20 0 #000080 2 1>
-  <.PortSym -60 -20 2 0>
-  <Line -60 0 20 0 #000080 2 1>
-  <Line -60 20 20 0 #000080 2 1>
-  <.PortSym -60 0 3 0>
-  <.PortSym -60 20 4 0>
-  <Rectangle -40 -70 70 120 #005500 3 1 #c0c0c0 1 0>
-  <.ID -40 54 X>
-  <Line 30 -10 30 0 #000080 2 1>
-  <.PortSym 60 -10 5 180>
-  <Text -17 -71 12 #005500 0 "≥ 1">
+  <Line -50 -30 20 0 #000080 2 1>
+  <Line -50 -10 20 0 #000080 2 1>
+  <Line -50 10 20 0 #000080 2 1>
+  <Line -50 30 20 0 #000080 2 1>
+  <Rectangle -30 -60 60 120 #005500 3 1 #c0c0c0 1 0>
+  <Line 30 0 20 0 #000080 2 1>
+  <Text -16 -51 12 #005500 0 ">= 1">
+  <.PortSym 50 0 5 180 >
+  <.PortSym -50 -30 1 0 >
+  <.PortSym -50 -10 2 0 >
+  <.PortSym -50 10 3 0 >
+  <.PortSym -50 30 4 0 >
+  <.ID -40 64 X>
 </Symbol>
-
-
diff --git a/library/XyceDigital/PATGENX1.sym b/library/XyceDigital/PATGENX1.sym
index e4c79583..56a69696 100644
--- a/library/XyceDigital/PATGENX1.sym
+++ b/library/XyceDigital/PATGENX1.sym
@@ -1,12 +1,12 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
-  <Line -40 -10 60 0 #005500 3 1>
-  <Line -40 10 60 0 #005500 3 1>
-  <Line 20 10 10 -10 #005500 3 1>
-  <Line 20 -10 10 10 #005500 3 1>
-  <Line 30 0 10 0 #000080 2 1>
-  <.PortSym 40 0 1 180>
-  <Line -40 -10 0 20 #005500 3 1>
-  <.ID -40 14 X >
-  <Text -37 -13 12 #005500 0 "PG">
+  <Line -50 -10 60 0 #005500 3 1>
+  <Line -50 10 60 0 #005500 3 1>
+  <Line 10 10 10 -10 #005500 3 1>
+  <Line 10 -10 10 10 #005500 3 1>
+  <Line 20 0 10 0 #000080 2 1>
+  <.PortSym 30 0 1 180 >
+  <Line -50 -10 0 20 #005500 3 1>
+  <.ID -49 14 X>
+  <Text -37 -10 12 #005500 0 "PG">
 </Symbol>
-
diff --git a/library/XyceDigital/PATGENX128.sym b/library/XyceDigital/PATGENX128.sym
index 9c11cfc4..d82714d5 100644
--- a/library/XyceDigital/PATGENX128.sym
+++ b/library/XyceDigital/PATGENX128.sym
@@ -1,40 +1,36 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
   <Line -50 -10 70 0 #005500 3 1>
   <Line -20 10 40 0 #005500 3 1>
   <Line 20 10 10 -10 #005500 3 1>
   <Line 20 -10 10 10 #005500 3 1>
   <Line 30 0 10 0 #000080 2 1>
-  <.PortSym 40 0 1 180>
+  <.PortSym 40 0 1 180 >
   <Line -50 10 70 0 #005500 3 1>
   <Line -50 30 70 0 #005500 3 1>
   <Line 20 30 10 -10 #005500 3 1>
   <Line 20 10 10 10 #005500 3 1>
   <Line 30 20 10 0 #000080 2 1>
-  <.PortSym 40 20 2 180>
-  <Text 9 9 10 #005500 0 "x2">
-  <Text 9 -12 10 #005500 0 "x1">
+  <.PortSym 40 20 2 180 >
   <Line -50 -10 0 20 #005500 3 1>
   <Line -50 10 0 20 #005500 3 1>
-  <Text -44 -13 12 #005500 0 "PG">
   <Line -20 30 40 0 #005500 3 1>
   <Line -50 30 70 0 #005500 3 1>
   <Line -50 50 70 0 #005500 3 1>
   <Line 20 50 10 -10 #005500 3 1>
   <Line 20 30 10 10 #005500 3 1>
-  <Text 9 29 10 #005500 0 "x4">
   <Line -50 30 0 20 #005500 3 1>
   <Line 30 40 10 0 #000080 2 1>
-  <.PortSym 40 40 3 180>
+  <.PortSym 40 40 3 180 >
   <Line -50 50 70 0 #005500 3 1>
   <Line -20 50 40 0 #005500 3 1>
   <Line -50 50 70 0 #005500 3 1>
   <Line -50 70 70 0 #005500 3 1>
   <Line 20 70 10 -10 #005500 3 1>
   <Line 20 50 10 10 #005500 3 1>
-  <Text 9 49 10 #005500 0 "x8">
   <Line -50 50 0 20 #005500 3 1>
   <Line 30 60 10 0 #000080 2 1>
-  <.PortSym 40 60 4 180>
+  <.PortSym 40 60 4 180 >
   <Line -50 70 70 0 #005500 3 1>
   <Line -20 70 40 0 #005500 3 1>
   <Line -50 70 70 0 #005500 3 1>
@@ -49,12 +45,10 @@
   <Line 20 110 10 -10 #005500 3 1>
   <Line 20 90 10 10 #005500 3 1>
   <Line -50 90 0 20 #005500 3 1>
-  <Text 0 89 10 #005500 0 "x32">
-  <Text 2 69 10 #005500 0 "x16">
   <Line 30 80 10 0 #000080 2 1>
   <Line 30 100 10 0 #000080 2 1>
-  <.PortSym 40 80 5 180>
-  <.PortSym 40 100 6 180>
+  <.PortSym 40 80 5 180 >
+  <.PortSym 40 100 6 180 >
   <Line -50 110 70 0 #005500 3 1>
   <Line -50 110 70 0 #005500 3 1>
   <Line -20 110 40 0 #005500 3 1>
@@ -70,11 +64,18 @@
   <Line 20 150 10 -10 #005500 3 1>
   <Line 20 130 10 10 #005500 3 1>
   <Line -50 130 0 20 #005500 3 1>
-  <Text 1 109 10 #005500 0 "x64">
-  <Text -7 129 10 #005500 0 "x128">
   <Line 30 120 10 0 #000080 2 1>
   <Line 30 140 10 0 #000080 2 1>
-  <.PortSym 40 120 7 180>
-  <.PortSym 40 140 8 180>
-  <.ID -63 155 X >
+  <.PortSym 40 120 7 180 >
+  <.PortSym 40 140 8 180 >
+  <.ID -63 155 X>
+  <Text -37 -10 12 #005500 0 "PG">
+  <Text 8 11 10 #005500 0 "x2">
+  <Text 8 -10 10 #005500 0 "x1">
+  <Text 8 31 10 #005500 0 "x4">
+  <Text 8 51 10 #005500 0 "x8">
+  <Text -1 91 10 #005500 0 "x32">
+  <Text 1 71 10 #005500 0 "x16">
+  <Text 0 111 10 #005500 0 "x64">
+  <Text -8 131 10 #005500 0 "x128">
 </Symbol>
diff --git a/library/XyceDigital/PATGENX2.sym b/library/XyceDigital/PATGENX2.sym
index db730ebf..e9fbb95e 100644
--- a/library/XyceDigital/PATGENX2.sym
+++ b/library/XyceDigital/PATGENX2.sym
@@ -1,20 +1,21 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
   <Line -50 -10 70 0 #005500 3 1>
   <Line -20 10 40 0 #005500 3 1>
   <Line 20 10 10 -10 #005500 3 1>
   <Line 20 -10 10 10 #005500 3 1>
   <Line 30 0 10 0 #000080 2 1>
-  <.PortSym 40 0 1 180>
+  <.PortSym 40 0 1 180 >
   <Line -50 10 70 0 #005500 3 1>
   <Line -50 30 70 0 #005500 3 1>
   <Line 20 30 10 -10 #005500 3 1>
   <Line 20 10 10 10 #005500 3 1>
   <Line 30 20 10 0 #000080 2 1>
-  <.PortSym 40 20 2 180>
-  <Text 9 9 10 #005500 0 "x2">
-  <Text 9 -12 10 #005500 0 "x1">
+  <.PortSym 40 20 2 180 >
   <Line -50 -10 0 20 #005500 3 1>
   <Line -50 10 0 20 #005500 3 1>
-  <.ID -53 35 X >
-  <Text -44 -13 12 #005500 0 "PG">
+  <.ID -53 35 X>
+  <Text -37 -10 12 #005500 0 "PG">
+  <Text 9 11 10 #005500 0 "x2">
+  <Text 9 -10 10 #005500 0 "x1">
 </Symbol>
diff --git a/library/XyceDigital/PATGENX32.sym b/library/XyceDigital/PATGENX32.sym
index 3c270c1e..f8205758 100644
--- a/library/XyceDigital/PATGENX32.sym
+++ b/library/XyceDigital/PATGENX32.sym
@@ -1,40 +1,36 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
   <Line -50 -10 70 0 #005500 3 1>
   <Line -20 10 40 0 #005500 3 1>
   <Line 20 10 10 -10 #005500 3 1>
   <Line 20 -10 10 10 #005500 3 1>
   <Line 30 0 10 0 #000080 2 1>
-  <.PortSym 40 0 1 180>
+  <.PortSym 40 0 1 180 >
   <Line -50 10 70 0 #005500 3 1>
   <Line -50 30 70 0 #005500 3 1>
   <Line 20 30 10 -10 #005500 3 1>
   <Line 20 10 10 10 #005500 3 1>
   <Line 30 20 10 0 #000080 2 1>
-  <.PortSym 40 20 2 180>
-  <Text 9 9 10 #005500 0 "x2">
-  <Text 9 -12 10 #005500 0 "x1">
+  <.PortSym 40 20 2 180 >
   <Line -50 -10 0 20 #005500 3 1>
   <Line -50 10 0 20 #005500 3 1>
-  <Text -44 -13 12 #005500 0 "PG">
   <Line -20 30 40 0 #005500 3 1>
   <Line -50 30 70 0 #005500 3 1>
   <Line -50 50 70 0 #005500 3 1>
   <Line 20 50 10 -10 #005500 3 1>
   <Line 20 30 10 10 #005500 3 1>
-  <Text 9 29 10 #005500 0 "x4">
   <Line -50 30 0 20 #005500 3 1>
   <Line 30 40 10 0 #000080 2 1>
-  <.PortSym 40 40 3 180>
+  <.PortSym 40 40 3 180 >
   <Line -50 50 70 0 #005500 3 1>
   <Line -20 50 40 0 #005500 3 1>
   <Line -50 50 70 0 #005500 3 1>
   <Line -50 70 70 0 #005500 3 1>
   <Line 20 70 10 -10 #005500 3 1>
   <Line 20 50 10 10 #005500 3 1>
-  <Text 9 49 10 #005500 0 "x8">
   <Line -50 50 0 20 #005500 3 1>
   <Line 30 60 10 0 #000080 2 1>
-  <.PortSym 40 60 4 180>
+  <.PortSym 40 60 4 180 >
   <Line -50 70 70 0 #005500 3 1>
   <Line -20 70 40 0 #005500 3 1>
   <Line -50 70 70 0 #005500 3 1>
@@ -49,12 +45,16 @@
   <Line 20 110 10 -10 #005500 3 1>
   <Line 20 90 10 10 #005500 3 1>
   <Line -50 90 0 20 #005500 3 1>
-  <Text 0 89 10 #005500 0 "x32">
-  <Text 2 69 10 #005500 0 "x16">
   <Line 30 80 10 0 #000080 2 1>
   <Line 30 100 10 0 #000080 2 1>
-  <.PortSym 40 80 5 180>
-  <.PortSym 40 100 6 180>
-  <.ID -53 115 X >
+  <.PortSym 40 80 5 180 >
+  <.PortSym 40 100 6 180 >
+  <.ID -53 115 X>
+  <Text -37 -10 12 #005500 0 "PG">
+  <Text 9 11 10 #005500 0 "x2">
+  <Text 9 -10 10 #005500 0 "x1">
+  <Text 9 31 10 #005500 0 "x4">
+  <Text 9 51 10 #005500 0 "x8">
+  <Text 0 91 10 #005500 0 "x32">
+  <Text 2 71 10 #005500 0 "x16">
 </Symbol>
-
diff --git a/library/XyceDigital/PATGENX4.sym b/library/XyceDigital/PATGENX4.sym
index 16af9998..9b9a5b68 100644
--- a/library/XyceDigital/PATGENX4.sym
+++ b/library/XyceDigital/PATGENX4.sym
@@ -1,30 +1,30 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
   <Line -50 -10 70 0 #005500 3 1>
   <Line -20 10 40 0 #005500 3 1>
   <Line 20 10 10 -10 #005500 3 1>
   <Line 20 -10 10 10 #005500 3 1>
   <Line 30 0 10 0 #000080 2 1>
-  <.PortSym 40 0 1 180>
+  <.PortSym 40 0 1 180 >
   <Line -50 10 70 0 #005500 3 1>
   <Line -50 30 70 0 #005500 3 1>
   <Line 20 30 10 -10 #005500 3 1>
   <Line 20 10 10 10 #005500 3 1>
   <Line 30 20 10 0 #000080 2 1>
-  <.PortSym 40 20 2 180>
-  <Text 9 9 10 #005500 0 "x2">
-  <Text 9 -12 10 #005500 0 "x1">
+  <.PortSym 40 20 2 180 >
   <Line -50 -10 0 20 #005500 3 1>
   <Line -50 10 0 20 #005500 3 1>
-  <Text -44 -13 12 #005500 0 "PG">
   <Line -20 30 40 0 #005500 3 1>
   <Line -50 30 70 0 #005500 3 1>
   <Line -50 50 70 0 #005500 3 1>
   <Line 20 50 10 -10 #005500 3 1>
   <Line 20 30 10 10 #005500 3 1>
-  <Text 9 29 10 #005500 0 "x4">
   <Line -50 30 0 20 #005500 3 1>
   <Line 30 40 10 0 #000080 2 1>
-  <.PortSym 40 40 3 180>
-  <.ID -53 55 X >
+  <.PortSym 40 40 3 180 >
+  <.ID -53 55 X>
+  <Text -37 -10 12 #005500 0 "PG">
+  <Text 9 11 10 #005500 0 "x2">
+  <Text 9 -10 10 #005500 0 "x1">
+  <Text 9 31 10 #005500 0 "x4">
 </Symbol>
-
diff --git a/library/XyceDigital/PATGENX8.sym b/library/XyceDigital/PATGENX8.sym
index 4fbfad98..448061b6 100644
--- a/library/XyceDigital/PATGENX8.sym
+++ b/library/XyceDigital/PATGENX8.sym
@@ -1,40 +1,40 @@
+<Qucs Schematic 24.3.99>
 <Symbol>
   <Line -50 -10 70 0 #005500 3 1>
   <Line -20 10 40 0 #005500 3 1>
   <Line 20 10 10 -10 #005500 3 1>
   <Line 20 -10 10 10 #005500 3 1>
   <Line 30 0 10 0 #000080 2 1>
-  <.PortSym 40 0 1 180>
+  <.PortSym 40 0 1 180 >
   <Line -50 10 70 0 #005500 3 1>
   <Line -50 30 70 0 #005500 3 1>
   <Line 20 30 10 -10 #005500 3 1>
   <Line 20 10 10 10 #005500 3 1>
   <Line 30 20 10 0 #000080 2 1>
-  <.PortSym 40 20 2 180>
-  <Text 9 9 10 #005500 0 "x2">
-  <Text 9 -12 10 #005500 0 "x1">
+  <.PortSym 40 20 2 180 >
   <Line -50 -10 0 20 #005500 3 1>
   <Line -50 10 0 20 #005500 3 1>
-  <Text -44 -13 12 #005500 0 "PG">
   <Line -20 30 40 0 #005500 3 1>
   <Line -50 30 70 0 #005500 3 1>
   <Line -50 50 70 0 #005500 3 1>
   <Line 20 50 10 -10 #005500 3 1>
   <Line 20 30 10 10 #005500 3 1>
-  <Text 9 29 10 #005500 0 "x4">
   <Line -50 30 0 20 #005500 3 1>
   <Line 30 40 10 0 #000080 2 1>
-  <.PortSym 40 40 3 180>
+  <.PortSym 40 40 3 180 >
   <Line -50 50 70 0 #005500 3 1>
   <Line -20 50 40 0 #005500 3 1>
   <Line -50 50 70 0 #005500 3 1>
   <Line -50 70 70 0 #005500 3 1>
   <Line 20 70 10 -10 #005500 3 1>
   <Line 20 50 10 10 #005500 3 1>
-  <Text 9 49 10 #005500 0 "x8">
   <Line -50 50 0 20 #005500 3 1>
   <Line 30 60 10 0 #000080 2 1>
-  <.PortSym 40 60 4 180>
-  <.ID -53 75 X >
+  <.PortSym 40 60 4 180 >
+  <Text -37 -10 12 #005500 0 "PG">
+  <Text 9 11 10 #005500 0 "x2">
+  <Text 9 -10 10 #005500 0 "x1">
+  <Text 9 31 10 #005500 0 "x4">
+  <Text 9 51 10 #005500 0 "x8">
+  <.ID -53 75 X>
 </Symbol>
-
diff --git a/library/XyceDigital/XOR.sym b/library/XyceDigital/XOR.sym
index aa15f579..c81709e2 100644
--- a/library/XyceDigital/XOR.sym
+++ b/library/XyceDigital/XOR.sym
@@ -1,3 +1,4 @@
+<Qucs Schematic 1.0.0>
 <Symbol>
   <Line -40 -40 20 0 #000080 2 1>
   <.PortSym -40 -40 1 0>