diff --git a/cells/gds/AND2X1.gds b/cells/gds/AND2X1.gds
index da085b5..6d0825c 100644
--- a/cells/gds/AND2X1.gds
+++ b/cells/gds/AND2X1.gds
Binary files differ
diff --git a/cells/gds/AND2X2.gds b/cells/gds/AND2X2.gds
index 2fba077..7b89860 100644
--- a/cells/gds/AND2X2.gds
+++ b/cells/gds/AND2X2.gds
Binary files differ
diff --git a/cells/gds/AOI21X1.gds b/cells/gds/AOI21X1.gds
index 0996218..efa4a70 100644
--- a/cells/gds/AOI21X1.gds
+++ b/cells/gds/AOI21X1.gds
Binary files differ
diff --git a/cells/gds/AOI22X1.gds b/cells/gds/AOI22X1.gds
index ae0f79b..eb7a58a 100644
--- a/cells/gds/AOI22X1.gds
+++ b/cells/gds/AOI22X1.gds
Binary files differ
diff --git a/cells/gds/BUFX2.gds b/cells/gds/BUFX2.gds
index c361f96..4491120 100644
--- a/cells/gds/BUFX2.gds
+++ b/cells/gds/BUFX2.gds
Binary files differ
diff --git a/cells/gds/BUFX4.gds b/cells/gds/BUFX4.gds
index 3422111..6dca590 100644
--- a/cells/gds/BUFX4.gds
+++ b/cells/gds/BUFX4.gds
Binary files differ
diff --git a/cells/gds/CLKBUF1.gds b/cells/gds/CLKBUF1.gds
index a1d9ec8..bf5e262 100644
--- a/cells/gds/CLKBUF1.gds
+++ b/cells/gds/CLKBUF1.gds
Binary files differ
diff --git a/cells/gds/INV.gds b/cells/gds/INV.gds
index 6c8f47e..05d2dc6 100644
--- a/cells/gds/INV.gds
+++ b/cells/gds/INV.gds
Binary files differ
diff --git a/cells/gds/INVX1.gds b/cells/gds/INVX1.gds
index 7f4c05e..40096cc 100644
--- a/cells/gds/INVX1.gds
+++ b/cells/gds/INVX1.gds
Binary files differ
diff --git a/cells/gds/INVX2.gds b/cells/gds/INVX2.gds
index e9c68cb..d74ff94 100644
--- a/cells/gds/INVX2.gds
+++ b/cells/gds/INVX2.gds
Binary files differ
diff --git a/cells/gds/INVX4.gds b/cells/gds/INVX4.gds
index 3984220..f927ec4 100644
--- a/cells/gds/INVX4.gds
+++ b/cells/gds/INVX4.gds
Binary files differ
diff --git a/cells/gds/INVX8.gds b/cells/gds/INVX8.gds
index 9e8573e..0408cf4 100644
--- a/cells/gds/INVX8.gds
+++ b/cells/gds/INVX8.gds
Binary files differ
diff --git a/cells/gds/MUX2X1.gds b/cells/gds/MUX2X1.gds
index 5d09108..7d97c65 100644
--- a/cells/gds/MUX2X1.gds
+++ b/cells/gds/MUX2X1.gds
Binary files differ
diff --git a/cells/gds/NAND2X1.gds b/cells/gds/NAND2X1.gds
index 64636ee..acb7279 100644
--- a/cells/gds/NAND2X1.gds
+++ b/cells/gds/NAND2X1.gds
Binary files differ
diff --git a/cells/gds/NAND3X1.gds b/cells/gds/NAND3X1.gds
index dc5304c..49d8cee 100644
--- a/cells/gds/NAND3X1.gds
+++ b/cells/gds/NAND3X1.gds
Binary files differ
diff --git a/cells/gds/OR2X1.gds b/cells/gds/OR2X1.gds
index 8bc6138..e220b14 100644
--- a/cells/gds/OR2X1.gds
+++ b/cells/gds/OR2X1.gds
Binary files differ
diff --git a/cells/gds/OR2X2.gds b/cells/gds/OR2X2.gds
index fcedfff..cce30e9 100644
--- a/cells/gds/OR2X2.gds
+++ b/cells/gds/OR2X2.gds
Binary files differ
diff --git a/cells/gds/XNOR2X1.gds b/cells/gds/XNOR2X1.gds
index a14c620..2644ef1 100644
--- a/cells/gds/XNOR2X1.gds
+++ b/cells/gds/XNOR2X1.gds
Binary files differ
diff --git a/cells/gds/XOR2X1.gds b/cells/gds/XOR2X1.gds
index 989b227..6141ace 100644
--- a/cells/gds/XOR2X1.gds
+++ b/cells/gds/XOR2X1.gds
Binary files differ
diff --git a/cells/mag/AND2X1.mag b/cells/mag/AND2X1.mag
index 934e930..c3e1efb 100644
--- a/cells/mag/AND2X1.mag
+++ b/cells/mag/AND2X1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887576
+timestamp 1624892565
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -322,39 +322,39 @@
 rect 0 -48 1152 -17
 << labels >>
 rlabel metal1 0 618 1152 714 0 VDD
-port 1 se
+port 3 se
 rlabel metal1 0 618 1152 714 0 VDD
+port 3 se
+rlabel metal1 0 -48 1152 48 0 GND
 port 2 se
 rlabel metal1 0 -48 1152 48 0 GND
-port 3 se
-rlabel metal1 0 -48 1152 48 0 GND
-port 4 se
+port 2 se
 rlabel metal1 931 88 989 146 0 Y
-port 5 se
+port 4 se
 rlabel metal1 946 146 974 439 0 Y
-port 6 se
+port 4 se
 rlabel metal1 931 439 989 497 0 Y
-port 7 se
+port 4 se
 rlabel metal1 547 169 605 227 0 B
-port 8 se
+port 1 se
 rlabel metal1 562 227 590 356 0 B
-port 9 se
+port 1 se
 rlabel metal1 547 356 605 414 0 B
-port 10 se
+port 1 se
 rlabel metal1 259 169 317 227 0 A
-port 11 se
+port 0 se
 rlabel metal1 274 227 302 356 0 A
-port 12 se
+port 0 se
 rlabel metal1 259 356 317 414 0 A
-port 13 se
+port 0 se
 rlabel locali 0 -17 1152 17 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 31 17 1121 48 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 0 649 1152 683 4 VDD
-port 1 se
+port 3 se power default abutment
 rlabel locali 31 618 1121 649 4 VDD
-port 1 se
+port 3 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 1152 666
 << end >>
diff --git a/cells/mag/AND2X2.mag b/cells/mag/AND2X2.mag
index e144470..9161e94 100644
--- a/cells/mag/AND2X2.mag
+++ b/cells/mag/AND2X2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887577
+timestamp 1624892566
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -317,35 +317,35 @@
 rect 0 -48 1152 -17
 << labels >>
 rlabel metal1 0 618 1152 714 0 VDD
-port 1 se
+port 3 se
 rlabel metal1 0 618 1152 714 0 VDD
+port 3 se
+rlabel metal1 0 -48 1152 48 0 GND
 port 2 se
 rlabel metal1 0 -48 1152 48 0 GND
-port 3 se
-rlabel metal1 0 -48 1152 48 0 GND
-port 4 se
+port 2 se
 rlabel metal1 931 88 989 146 0 Y
-port 5 se
+port 4 se
 rlabel metal1 946 146 974 439 0 Y
-port 6 se
+port 4 se
 rlabel metal1 931 439 989 497 0 Y
-port 7 se
+port 4 se
 rlabel metal1 259 169 317 227 0 A
-port 8 se
+port 0 se
 rlabel metal1 274 227 302 356 0 A
-port 9 se
+port 0 se
 rlabel metal1 259 356 317 414 0 A
-port 10 se
+port 0 se
 rlabel metal1 547 356 605 414 0 B
-port 11 se
+port 1 se
 rlabel locali 0 -17 1152 17 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 31 17 1121 48 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 0 649 1152 683 4 VDD
-port 1 se
+port 3 se power default abutment
 rlabel locali 31 618 1121 649 4 VDD
-port 1 se
+port 3 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 1152 666
 << end >>
diff --git a/cells/mag/AOI21X1.mag b/cells/mag/AOI21X1.mag
index 24b8616..8a42463 100644
--- a/cells/mag/AOI21X1.mag
+++ b/cells/mag/AOI21X1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887578
+timestamp 1624892575
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -316,53 +316,53 @@
 rect 0 -48 1152 -17
 << labels >>
 rlabel metal1 0 618 1152 714 0 VDD
-port 1 se
+port 4 se
 rlabel metal1 0 618 1152 714 0 VDD
-port 2 se
+port 4 se
 rlabel metal1 0 -48 1152 48 0 GND
 port 3 se
 rlabel metal1 0 -48 1152 48 0 GND
-port 4 se
+port 3 se
 rlabel metal1 115 88 173 103 0 Y
 port 5 se
 rlabel metal1 931 88 989 103 0 Y
-port 6 se
+port 5 se
 rlabel metal1 115 103 989 131 0 Y
-port 7 se
+port 5 se
 rlabel metal1 115 131 173 146 0 Y
-port 8 se
+port 5 se
 rlabel metal1 931 131 989 146 0 Y
-port 9 se
+port 5 se
 rlabel metal1 130 146 158 439 0 Y
-port 10 se
+port 5 se
 rlabel metal1 115 439 173 497 0 Y
-port 11 se
+port 5 se
 rlabel metal1 547 169 605 227 0 A
-port 12 se
+port 0 se
 rlabel metal1 562 227 590 356 0 A
-port 13 se
+port 0 se
 rlabel metal1 547 356 605 414 0 A
-port 14 se
+port 0 se
 rlabel metal1 259 169 317 227 0 C
-port 15 se
+port 2 se
 rlabel metal1 274 227 302 356 0 C
-port 16 se
+port 2 se
 rlabel metal1 259 356 317 414 0 C
-port 17 se
+port 2 se
 rlabel metal1 835 169 893 227 0 B
-port 18 se
+port 1 se
 rlabel metal1 850 227 878 356 0 B
-port 19 se
+port 1 se
 rlabel metal1 835 356 893 414 0 B
-port 20 se
+port 1 se
 rlabel locali 0 -17 1152 17 4 GND
-port 3 se
+port 3 se ground default abutment
 rlabel locali 31 17 1121 48 4 GND
-port 3 se
+port 3 se ground default abutment
 rlabel locali 0 649 1152 683 4 VDD
-port 1 se
+port 4 se power default abutment
 rlabel locali 31 618 1121 649 4 VDD
-port 1 se
+port 4 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 1152 666
 << end >>
diff --git a/cells/mag/AOI22X1.mag b/cells/mag/AOI22X1.mag
index ae304d0..f9b09f9 100644
--- a/cells/mag/AOI22X1.mag
+++ b/cells/mag/AOI22X1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887579
+timestamp 1624892576
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -390,59 +390,59 @@
 rect 0 -48 1440 -17
 << labels >>
 rlabel metal1 0 618 1440 714 0 VDD
-port 1 se
+port 5 se
 rlabel metal1 0 618 1440 714 0 VDD
-port 2 se
+port 5 se
 rlabel metal1 0 -48 1440 48 0 GND
-port 3 se
+port 4 se
 rlabel metal1 0 -48 1440 48 0 GND
 port 4 se
 rlabel metal1 163 88 221 103 0 Y
-port 5 se
+port 6 se
 rlabel metal1 1219 88 1277 103 0 Y
 port 6 se
 rlabel metal1 163 103 1277 131 0 Y
-port 7 se
+port 6 se
 rlabel metal1 163 131 221 146 0 Y
-port 8 se
+port 6 se
 rlabel metal1 1219 131 1277 146 0 Y
-port 9 se
+port 6 se
 rlabel metal1 1042 131 1070 439 0 Y
-port 10 se
+port 6 se
 rlabel metal1 1027 439 1085 497 0 Y
-port 11 se
+port 6 se
 rlabel metal1 1123 169 1181 227 0 D
-port 12 se
+port 3 se
 rlabel metal1 1138 227 1166 356 0 D
-port 13 se
+port 3 se
 rlabel metal1 1123 356 1181 414 0 D
-port 14 se
+port 3 se
 rlabel metal1 259 169 317 227 0 B
-port 15 se
+port 1 se
 rlabel metal1 274 227 302 356 0 B
-port 16 se
+port 1 se
 rlabel metal1 259 356 317 414 0 B
-port 17 se
+port 1 se
 rlabel metal1 835 169 893 227 0 C
-port 18 se
+port 2 se
 rlabel metal1 850 227 878 356 0 C
-port 19 se
+port 2 se
 rlabel metal1 835 356 893 414 0 C
-port 20 se
+port 2 se
 rlabel metal1 547 169 605 227 0 A
-port 21 se
+port 0 se
 rlabel metal1 562 227 590 356 0 A
-port 22 se
+port 0 se
 rlabel metal1 547 356 605 414 0 A
-port 23 se
+port 0 se
 rlabel locali 0 -17 1440 17 4 GND
-port 3 se
+port 4 se ground default abutment
 rlabel locali 31 17 1409 48 4 GND
-port 3 se
+port 4 se ground default abutment
 rlabel locali 0 649 1440 683 4 VDD
-port 1 se
+port 5 se power default abutment
 rlabel locali 31 618 1409 649 4 VDD
-port 1 se
+port 5 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 1440 666
 << end >>
diff --git a/cells/mag/BUFX2.mag b/cells/mag/BUFX2.mag
index f2fe82e..3f7d5eb 100644
--- a/cells/mag/BUFX2.mag
+++ b/cells/mag/BUFX2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887580
+timestamp 1624892577
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -244,29 +244,29 @@
 rect 0 -48 864 -17
 << labels >>
 rlabel metal1 0 618 864 714 0 VDD
-port 1 se
+port 2 se
 rlabel metal1 0 618 864 714 0 VDD
 port 2 se
 rlabel metal1 0 -48 864 48 0 GND
-port 3 se
+port 1 se
 rlabel metal1 0 -48 864 48 0 GND
-port 4 se
+port 1 se
 rlabel metal1 643 88 701 146 0 Y
-port 5 se
+port 3 se
 rlabel metal1 658 146 686 439 0 Y
-port 6 se
+port 3 se
 rlabel metal1 643 439 701 497 0 Y
-port 7 se
+port 3 se
 rlabel metal1 259 169 317 227 0 A
-port 8 se
+port 0 se
 rlabel locali 0 -17 864 17 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 31 17 833 48 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 0 649 864 683 4 VDD
-port 1 se
+port 2 se power default abutment
 rlabel locali 31 618 833 649 4 VDD
-port 1 se
+port 2 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 864 666
 << end >>
diff --git a/cells/mag/BUFX4.mag b/cells/mag/BUFX4.mag
index f667b3e..6650390 100644
--- a/cells/mag/BUFX4.mag
+++ b/cells/mag/BUFX4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887581
+timestamp 1624892578
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -333,41 +333,41 @@
 rect 0 -48 1152 -17
 << labels >>
 rlabel metal1 0 618 1152 714 0 VDD
-port 1 se
+port 2 se
 rlabel metal1 0 618 1152 714 0 VDD
 port 2 se
 rlabel metal1 0 -48 1152 48 0 GND
-port 3 se
+port 1 se
 rlabel metal1 0 -48 1152 48 0 GND
-port 4 se
+port 1 se
 rlabel metal1 739 88 797 103 0 Y
-port 5 se
+port 3 se
 rlabel metal1 739 103 974 131 0 Y
-port 6 se
+port 3 se
 rlabel metal1 739 131 797 146 0 Y
-port 7 se
+port 3 se
 rlabel metal1 739 439 797 454 0 Y
-port 8 se
+port 3 se
 rlabel metal1 946 131 974 454 0 Y
-port 9 se
+port 3 se
 rlabel metal1 739 454 974 482 0 Y
-port 10 se
+port 3 se
 rlabel metal1 739 482 797 497 0 Y
-port 11 se
+port 3 se
 rlabel metal1 259 250 317 308 0 A
-port 12 se
+port 0 se
 rlabel metal1 274 308 302 356 0 A
-port 13 se
+port 0 se
 rlabel metal1 259 356 317 414 0 A
-port 14 se
+port 0 se
 rlabel locali 0 -17 1152 17 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 31 17 1121 48 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 0 649 1152 683 4 VDD
-port 1 se
+port 2 se power default abutment
 rlabel locali 31 618 1121 649 4 VDD
-port 1 se
+port 2 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 1152 666
 << end >>
diff --git a/cells/mag/CLKBUF1.mag b/cells/mag/CLKBUF1.mag
index db9c048..4251eaf 100644
--- a/cells/mag/CLKBUF1.mag
+++ b/cells/mag/CLKBUF1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887582
+timestamp 1624892579
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -778,41 +778,41 @@
 rect 0 -48 2592 -17
 << labels >>
 rlabel metal1 0 618 2592 714 0 VDD
-port 1 se
+port 2 se
 rlabel metal1 0 618 2592 714 0 VDD
 port 2 se
 rlabel metal1 0 -48 2592 48 0 GND
-port 3 se
+port 1 se
 rlabel metal1 0 -48 2592 48 0 GND
-port 4 se
+port 1 se
 rlabel metal1 2083 88 2141 146 0 Y
-port 5 se
+port 3 se
 rlabel metal1 259 169 317 227 0 A
-port 6 se
+port 0 se
 rlabel metal1 547 250 605 308 0 A
-port 7 se
+port 0 se
 rlabel metal1 274 227 302 356 0 A
-port 8 se
+port 0 se
 rlabel metal1 562 308 590 356 0 A
-port 9 se
+port 0 se
 rlabel metal1 259 356 317 414 0 A
-port 10 se
+port 0 se
 rlabel metal1 547 356 605 414 0 A
-port 11 se
+port 0 se
 rlabel metal1 274 414 302 535 0 A
-port 12 se
+port 0 se
 rlabel metal1 562 414 590 535 0 A
-port 13 se
+port 0 se
 rlabel metal1 274 535 590 563 0 A
-port 14 se
+port 0 se
 rlabel locali 0 -17 2592 17 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 31 17 2561 48 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 0 649 2592 683 4 VDD
-port 1 se
+port 2 se power default abutment
 rlabel locali 31 618 2561 649 4 VDD
-port 1 se
+port 2 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 2592 666
 << end >>
diff --git a/cells/mag/INV.mag b/cells/mag/INV.mag
index 9bebd91..9497878 100644
--- a/cells/mag/INV.mag
+++ b/cells/mag/INV.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887583
+timestamp 1624892580
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -159,33 +159,33 @@
 rect 0 -48 576 -17
 << labels >>
 rlabel metal1 0 618 576 714 0 VDD
-port 1 se
+port 2 se
 rlabel metal1 0 618 576 714 0 VDD
 port 2 se
 rlabel metal1 0 -48 576 48 0 GND
-port 3 se
+port 1 se
 rlabel metal1 0 -48 576 48 0 GND
-port 4 se
+port 1 se
 rlabel metal1 115 88 173 146 0 Y
-port 5 se
+port 3 se
 rlabel metal1 130 146 158 439 0 Y
-port 6 se
+port 3 se
 rlabel metal1 115 439 173 497 0 Y
-port 7 se
+port 3 se
 rlabel metal1 259 169 317 227 0 A
-port 8 se
+port 0 se
 rlabel metal1 274 227 302 356 0 A
-port 9 se
+port 0 se
 rlabel metal1 259 356 317 414 0 A
-port 10 se
+port 0 se
 rlabel locali 0 -17 576 17 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 31 17 545 48 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 0 649 576 683 4 VDD
-port 1 se
+port 2 se power default abutment
 rlabel locali 31 618 545 649 4 VDD
-port 1 se
+port 2 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 576 666
 << end >>
diff --git a/cells/mag/INVX1.mag b/cells/mag/INVX1.mag
index 9bebd91..eb9fad8 100644
--- a/cells/mag/INVX1.mag
+++ b/cells/mag/INVX1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887583
+timestamp 1624892581
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -159,33 +159,33 @@
 rect 0 -48 576 -17
 << labels >>
 rlabel metal1 0 618 576 714 0 VDD
-port 1 se
+port 2 se
 rlabel metal1 0 618 576 714 0 VDD
 port 2 se
 rlabel metal1 0 -48 576 48 0 GND
-port 3 se
+port 1 se
 rlabel metal1 0 -48 576 48 0 GND
-port 4 se
+port 1 se
 rlabel metal1 115 88 173 146 0 Y
-port 5 se
+port 3 se
 rlabel metal1 130 146 158 439 0 Y
-port 6 se
+port 3 se
 rlabel metal1 115 439 173 497 0 Y
-port 7 se
+port 3 se
 rlabel metal1 259 169 317 227 0 A
-port 8 se
+port 0 se
 rlabel metal1 274 227 302 356 0 A
-port 9 se
+port 0 se
 rlabel metal1 259 356 317 414 0 A
-port 10 se
+port 0 se
 rlabel locali 0 -17 576 17 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 31 17 545 48 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 0 649 576 683 4 VDD
-port 1 se
+port 2 se power default abutment
 rlabel locali 31 618 545 649 4 VDD
-port 1 se
+port 2 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 576 666
 << end >>
diff --git a/cells/mag/INVX2.mag b/cells/mag/INVX2.mag
index c4ef321..be1aac2 100644
--- a/cells/mag/INVX2.mag
+++ b/cells/mag/INVX2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887584
+timestamp 1624892582
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -159,33 +159,33 @@
 rect 0 -48 576 -17
 << labels >>
 rlabel metal1 0 618 576 714 0 VDD
-port 1 se
+port 2 se
 rlabel metal1 0 618 576 714 0 VDD
 port 2 se
 rlabel metal1 0 -48 576 48 0 GND
-port 3 se
+port 1 se
 rlabel metal1 0 -48 576 48 0 GND
-port 4 se
+port 1 se
 rlabel metal1 115 88 173 146 0 Y
-port 5 se
+port 3 se
 rlabel metal1 130 146 158 439 0 Y
-port 6 se
+port 3 se
 rlabel metal1 115 439 173 497 0 Y
-port 7 se
+port 3 se
 rlabel metal1 259 169 317 227 0 A
-port 8 se
+port 0 se
 rlabel metal1 274 227 302 356 0 A
-port 9 se
+port 0 se
 rlabel metal1 259 356 317 414 0 A
-port 10 se
+port 0 se
 rlabel locali 0 -17 576 17 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 31 17 545 48 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 0 649 576 683 4 VDD
-port 1 se
+port 2 se power default abutment
 rlabel locali 31 618 545 649 4 VDD
-port 1 se
+port 2 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 576 666
 << end >>
diff --git a/cells/mag/INVX4.mag b/cells/mag/INVX4.mag
index 60e130d..cad585d 100644
--- a/cells/mag/INVX4.mag
+++ b/cells/mag/INVX4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887585
+timestamp 1624892583
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -252,57 +252,57 @@
 rect 0 -48 864 -17
 << labels >>
 rlabel metal1 0 618 864 714 0 VDD
-port 1 se
+port 2 se
 rlabel metal1 0 618 864 714 0 VDD
 port 2 se
 rlabel metal1 0 -48 864 48 0 GND
-port 3 se
+port 1 se
 rlabel metal1 0 -48 864 48 0 GND
-port 4 se
+port 1 se
 rlabel metal1 115 88 173 146 0 Y
-port 5 se
+port 3 se
 rlabel metal1 643 88 701 146 0 Y
-port 6 se
+port 3 se
 rlabel metal1 130 146 158 439 0 Y
-port 7 se
+port 3 se
 rlabel metal1 658 146 686 439 0 Y
-port 8 se
+port 3 se
 rlabel metal1 115 439 173 454 0 Y
-port 9 se
+port 3 se
 rlabel metal1 643 439 701 454 0 Y
-port 10 se
+port 3 se
 rlabel metal1 115 454 701 482 0 Y
-port 11 se
+port 3 se
 rlabel metal1 115 482 173 497 0 Y
-port 12 se
+port 3 se
 rlabel metal1 643 482 701 497 0 Y
-port 13 se
+port 3 se
 rlabel metal1 259 169 317 227 0 A
-port 14 se
+port 0 se
 rlabel metal1 547 169 605 227 0 A
-port 15 se
+port 0 se
 rlabel metal1 274 227 302 356 0 A
-port 16 se
+port 0 se
 rlabel metal1 562 227 590 356 0 A
-port 17 se
+port 0 se
 rlabel metal1 259 356 317 371 0 A
-port 18 se
+port 0 se
 rlabel metal1 547 356 605 371 0 A
-port 19 se
+port 0 se
 rlabel metal1 259 371 605 399 0 A
-port 20 se
+port 0 se
 rlabel metal1 259 399 317 414 0 A
-port 21 se
+port 0 se
 rlabel metal1 547 399 605 414 0 A
-port 22 se
+port 0 se
 rlabel locali 0 -17 864 17 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 31 17 833 48 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 0 649 864 683 4 VDD
-port 1 se
+port 2 se power default abutment
 rlabel locali 31 618 833 649 4 VDD
-port 1 se
+port 2 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 864 666
 << end >>
diff --git a/cells/mag/INVX8.mag b/cells/mag/INVX8.mag
index 623b64d..42389fa 100644
--- a/cells/mag/INVX8.mag
+++ b/cells/mag/INVX8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887586
+timestamp 1624892584
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -424,85 +424,85 @@
 rect 0 -48 1440 -17
 << labels >>
 rlabel metal1 0 618 1440 714 0 VDD
-port 1 se
+port 2 se
 rlabel metal1 0 618 1440 714 0 VDD
 port 2 se
 rlabel metal1 0 -48 1440 48 0 GND
-port 3 se
+port 1 se
 rlabel metal1 0 -48 1440 48 0 GND
-port 4 se
+port 1 se
 rlabel metal1 739 88 797 103 0 Y
-port 5 se
+port 3 se
 rlabel metal1 1219 88 1277 103 0 Y
-port 6 se
+port 3 se
 rlabel metal1 739 103 1277 131 0 Y
-port 7 se
+port 3 se
 rlabel metal1 163 88 221 146 0 Y
-port 8 se
+port 3 se
 rlabel metal1 739 131 797 146 0 Y
-port 9 se
+port 3 se
 rlabel metal1 1219 131 1277 146 0 Y
-port 10 se
+port 3 se
 rlabel metal1 178 146 206 439 0 Y
-port 11 se
+port 3 se
 rlabel metal1 1234 146 1262 439 0 Y
-port 12 se
+port 3 se
 rlabel metal1 163 439 221 454 0 Y
-port 13 se
+port 3 se
 rlabel metal1 739 439 797 454 0 Y
-port 14 se
+port 3 se
 rlabel metal1 1219 439 1277 454 0 Y
-port 15 se
+port 3 se
 rlabel metal1 163 454 1277 482 0 Y
-port 16 se
+port 3 se
 rlabel metal1 163 482 221 497 0 Y
-port 17 se
+port 3 se
 rlabel metal1 739 482 797 497 0 Y
-port 18 se
+port 3 se
 rlabel metal1 1219 482 1277 497 0 Y
-port 19 se
+port 3 se
 rlabel metal1 259 169 317 184 0 A
-port 20 se
+port 0 se
 rlabel metal1 547 169 605 184 0 A
-port 21 se
+port 0 se
 rlabel metal1 835 169 893 184 0 A
-port 22 se
+port 0 se
 rlabel metal1 1123 169 1181 184 0 A
-port 23 se
+port 0 se
 rlabel metal1 259 184 1181 212 0 A
-port 24 se
+port 0 se
 rlabel metal1 259 212 317 227 0 A
-port 25 se
+port 0 se
 rlabel metal1 547 212 605 227 0 A
-port 26 se
+port 0 se
 rlabel metal1 835 212 893 227 0 A
-port 27 se
+port 0 se
 rlabel metal1 1123 212 1181 227 0 A
-port 28 se
+port 0 se
 rlabel metal1 274 227 302 356 0 A
-port 29 se
+port 0 se
 rlabel metal1 562 227 590 356 0 A
-port 30 se
+port 0 se
 rlabel metal1 850 227 878 356 0 A
-port 31 se
+port 0 se
 rlabel metal1 1138 227 1166 356 0 A
-port 32 se
+port 0 se
 rlabel metal1 259 356 317 414 0 A
-port 33 se
+port 0 se
 rlabel metal1 547 356 605 414 0 A
-port 34 se
+port 0 se
 rlabel metal1 835 356 893 414 0 A
-port 35 se
+port 0 se
 rlabel metal1 1123 356 1181 414 0 A
-port 36 se
+port 0 se
 rlabel locali 0 -17 1440 17 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 31 17 1409 48 4 GND
-port 3 se
+port 1 se ground default abutment
 rlabel locali 0 649 1440 683 4 VDD
-port 1 se
+port 2 se power default abutment
 rlabel locali 31 618 1409 649 4 VDD
-port 1 se
+port 2 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 1440 666
 << end >>
diff --git a/cells/mag/MUX2X1.mag b/cells/mag/MUX2X1.mag
index 55ca4f6..3e163d5 100644
--- a/cells/mag/MUX2X1.mag
+++ b/cells/mag/MUX2X1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887587
+timestamp 1624892585
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -456,57 +456,57 @@
 rect 0 -48 1728 -17
 << labels >>
 rlabel metal1 0 618 1728 714 0 VDD
-port 1 se
+port 4 se
 rlabel metal1 0 618 1728 714 0 VDD
+port 4 se
+rlabel metal1 0 -48 1728 48 0 GND
 port 2 se
 rlabel metal1 0 -48 1728 48 0 GND
-port 3 se
-rlabel metal1 0 -48 1728 48 0 GND
-port 4 se
+port 2 se
 rlabel metal1 1027 88 1085 103 0 Y
 port 5 se
 rlabel metal1 1027 103 1262 131 0 Y
-port 6 se
+port 5 se
 rlabel metal1 1027 131 1085 146 0 Y
-port 7 se
+port 5 se
 rlabel metal1 1027 439 1085 454 0 Y
-port 8 se
+port 5 se
 rlabel metal1 1234 131 1262 454 0 Y
-port 9 se
+port 5 se
 rlabel metal1 1027 454 1262 482 0 Y
-port 10 se
+port 5 se
 rlabel metal1 1027 482 1085 497 0 Y
-port 11 se
+port 5 se
 rlabel metal1 259 169 317 184 0 S
-port 12 se
+port 3 se
 rlabel metal1 643 169 701 184 0 S
-port 13 se
+port 3 se
 rlabel metal1 259 184 701 212 0 S
-port 14 se
+port 3 se
 rlabel metal1 259 212 317 227 0 S
-port 15 se
+port 3 se
 rlabel metal1 643 212 701 227 0 S
-port 16 se
+port 3 se
 rlabel metal1 274 227 302 277 0 S
-port 17 se
+port 3 se
 rlabel metal1 259 277 317 335 0 S
-port 18 se
+port 3 se
 rlabel metal1 547 250 605 308 0 A
-port 19 se
+port 0 se
 rlabel metal1 1411 169 1469 227 0 B
-port 20 se
+port 1 se
 rlabel metal1 1426 227 1454 356 0 B
-port 21 se
+port 1 se
 rlabel metal1 1411 356 1469 414 0 B
-port 22 se
+port 1 se
 rlabel locali 0 -17 1728 17 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 31 17 1697 48 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 0 649 1728 683 4 VDD
-port 1 se
+port 4 se power default abutment
 rlabel locali 31 618 1697 649 4 VDD
-port 1 se
+port 4 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 1728 666
 << end >>
diff --git a/cells/mag/NAND2X1.mag b/cells/mag/NAND2X1.mag
index 9049dc8..8bf34ae 100644
--- a/cells/mag/NAND2X1.mag
+++ b/cells/mag/NAND2X1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887588
+timestamp 1624892586
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -232,47 +232,47 @@
 rect 0 -48 864 -17
 << labels >>
 rlabel metal1 0 618 864 714 0 VDD
-port 1 se
+port 3 se
 rlabel metal1 0 618 864 714 0 VDD
+port 3 se
+rlabel metal1 0 -48 864 48 0 GND
 port 2 se
 rlabel metal1 0 -48 864 48 0 GND
-port 3 se
-rlabel metal1 0 -48 864 48 0 GND
-port 4 se
+port 2 se
 rlabel metal1 115 88 173 146 0 Y
-port 5 se
+port 4 se
 rlabel metal1 130 146 158 439 0 Y
-port 6 se
+port 4 se
 rlabel metal1 115 439 173 454 0 Y
-port 7 se
+port 4 se
 rlabel metal1 643 439 701 454 0 Y
-port 8 se
+port 4 se
 rlabel metal1 115 454 701 482 0 Y
-port 9 se
+port 4 se
 rlabel metal1 115 482 173 497 0 Y
-port 10 se
+port 4 se
 rlabel metal1 643 482 701 497 0 Y
-port 11 se
+port 4 se
 rlabel metal1 259 169 317 227 0 B
-port 12 se
+port 1 se
 rlabel metal1 274 227 302 356 0 B
-port 13 se
+port 1 se
 rlabel metal1 259 356 317 414 0 B
-port 14 se
+port 1 se
 rlabel metal1 547 169 605 227 0 A
-port 15 se
+port 0 se
 rlabel metal1 562 227 590 356 0 A
-port 16 se
+port 0 se
 rlabel metal1 547 356 605 414 0 A
-port 17 se
+port 0 se
 rlabel locali 0 -17 864 17 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 31 17 833 48 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 0 649 864 683 4 VDD
-port 1 se
+port 3 se power default abutment
 rlabel locali 31 618 833 649 4 VDD
-port 1 se
+port 3 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 864 666
 << end >>
diff --git a/cells/mag/NAND3X1.mag b/cells/mag/NAND3X1.mag
index fa25d27..c36ea5f 100644
--- a/cells/mag/NAND3X1.mag
+++ b/cells/mag/NAND3X1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887589
+timestamp 1624892587
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -300,53 +300,53 @@
 rect 0 -48 1152 -17
 << labels >>
 rlabel metal1 0 618 1152 714 0 VDD
-port 1 se
+port 4 se
 rlabel metal1 0 618 1152 714 0 VDD
-port 2 se
+port 4 se
 rlabel metal1 0 -48 1152 48 0 GND
 port 3 se
 rlabel metal1 0 -48 1152 48 0 GND
-port 4 se
+port 3 se
 rlabel metal1 115 88 173 146 0 Y
 port 5 se
 rlabel metal1 130 146 158 439 0 Y
-port 6 se
+port 5 se
 rlabel metal1 115 439 173 454 0 Y
-port 7 se
+port 5 se
 rlabel metal1 643 439 701 454 0 Y
-port 8 se
+port 5 se
 rlabel metal1 115 454 701 482 0 Y
-port 9 se
+port 5 se
 rlabel metal1 115 482 173 497 0 Y
-port 10 se
+port 5 se
 rlabel metal1 643 482 701 497 0 Y
-port 11 se
+port 5 se
 rlabel metal1 259 169 317 227 0 C
-port 12 se
+port 2 se
 rlabel metal1 274 227 302 356 0 C
-port 13 se
+port 2 se
 rlabel metal1 259 356 317 414 0 C
-port 14 se
+port 2 se
 rlabel metal1 547 169 605 227 0 B
-port 15 se
+port 1 se
 rlabel metal1 562 227 590 356 0 B
-port 16 se
+port 1 se
 rlabel metal1 547 356 605 414 0 B
-port 17 se
+port 1 se
 rlabel metal1 835 169 893 227 0 A
-port 18 se
+port 0 se
 rlabel metal1 850 227 878 356 0 A
-port 19 se
+port 0 se
 rlabel metal1 835 356 893 414 0 A
-port 20 se
+port 0 se
 rlabel locali 0 -17 1152 17 4 GND
-port 3 se
+port 3 se ground default abutment
 rlabel locali 31 17 1121 48 4 GND
-port 3 se
+port 3 se ground default abutment
 rlabel locali 0 649 1152 683 4 VDD
-port 1 se
+port 4 se power default abutment
 rlabel locali 31 618 1121 649 4 VDD
-port 1 se
+port 4 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 1152 666
 << end >>
diff --git a/cells/mag/OR2X1.mag b/cells/mag/OR2X1.mag
index 115a754..a9290e4 100644
--- a/cells/mag/OR2X1.mag
+++ b/cells/mag/OR2X1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887590
+timestamp 1624892587
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -316,35 +316,35 @@
 rect 0 -48 1152 -17
 << labels >>
 rlabel metal1 0 618 1152 714 0 VDD
-port 1 se
+port 3 se
 rlabel metal1 0 618 1152 714 0 VDD
+port 3 se
+rlabel metal1 0 -48 1152 48 0 GND
 port 2 se
 rlabel metal1 0 -48 1152 48 0 GND
-port 3 se
-rlabel metal1 0 -48 1152 48 0 GND
-port 4 se
+port 2 se
 rlabel metal1 931 88 989 146 0 Y
-port 5 se
+port 4 se
 rlabel metal1 946 146 974 439 0 Y
-port 6 se
+port 4 se
 rlabel metal1 931 439 989 497 0 Y
-port 7 se
+port 4 se
 rlabel metal1 259 250 317 308 0 A
-port 8 se
+port 0 se
 rlabel metal1 274 308 302 356 0 A
-port 9 se
+port 0 se
 rlabel metal1 259 356 317 414 0 A
-port 10 se
+port 0 se
 rlabel metal1 547 356 605 414 0 B
-port 11 se
+port 1 se
 rlabel locali 0 -17 1152 17 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 31 17 1121 48 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 0 649 1152 683 4 VDD
-port 1 se
+port 3 se power default abutment
 rlabel locali 31 618 1121 649 4 VDD
-port 1 se
+port 3 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 1152 666
 << end >>
diff --git a/cells/mag/OR2X2.mag b/cells/mag/OR2X2.mag
index 7403292..304b5c4 100644
--- a/cells/mag/OR2X2.mag
+++ b/cells/mag/OR2X2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887591
+timestamp 1624892588
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -316,35 +316,35 @@
 rect 0 -48 1152 -17
 << labels >>
 rlabel metal1 0 618 1152 714 0 VDD
-port 1 se
+port 3 se
 rlabel metal1 0 618 1152 714 0 VDD
+port 3 se
+rlabel metal1 0 -48 1152 48 0 GND
 port 2 se
 rlabel metal1 0 -48 1152 48 0 GND
-port 3 se
-rlabel metal1 0 -48 1152 48 0 GND
-port 4 se
+port 2 se
 rlabel metal1 931 88 989 146 0 Y
-port 5 se
+port 4 se
 rlabel metal1 946 146 974 439 0 Y
-port 6 se
+port 4 se
 rlabel metal1 931 439 989 497 0 Y
-port 7 se
+port 4 se
 rlabel metal1 259 356 317 414 0 A
-port 8 se
+port 0 se
 rlabel metal1 547 250 605 308 0 B
-port 9 se
+port 1 se
 rlabel metal1 562 308 590 356 0 B
-port 10 se
+port 1 se
 rlabel metal1 547 356 605 414 0 B
-port 11 se
+port 1 se
 rlabel locali 0 -17 1152 17 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 31 17 1121 48 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 0 649 1152 683 4 VDD
-port 1 se
+port 3 se power default abutment
 rlabel locali 31 618 1121 649 4 VDD
-port 1 se
+port 3 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 1152 666
 << end >>
diff --git a/cells/mag/XNOR2X1.mag b/cells/mag/XNOR2X1.mag
index 1a1bfed..8a505a6 100644
--- a/cells/mag/XNOR2X1.mag
+++ b/cells/mag/XNOR2X1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887592
+timestamp 1624892589
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -528,63 +528,63 @@
 rect 0 -48 2016 -17
 << labels >>
 rlabel metal1 0 618 2016 714 0 VDD
-port 1 se
+port 3 se
 rlabel metal1 0 618 2016 714 0 VDD
+port 3 se
+rlabel metal1 0 -48 2016 48 0 GND
 port 2 se
 rlabel metal1 0 -48 2016 48 0 GND
-port 3 se
-rlabel metal1 0 -48 2016 48 0 GND
-port 4 se
+port 2 se
 rlabel metal1 931 88 989 146 0 Y
-port 5 se
+port 4 se
 rlabel metal1 259 169 317 184 0 B
-port 6 se
+port 1 se
 rlabel metal1 547 169 605 184 0 B
-port 7 se
+port 1 se
 rlabel metal1 259 184 605 212 0 B
-port 8 se
+port 1 se
 rlabel metal1 259 212 317 227 0 B
-port 9 se
+port 1 se
 rlabel metal1 547 212 605 227 0 B
-port 10 se
+port 1 se
 rlabel metal1 274 227 302 356 0 B
-port 11 se
+port 1 se
 rlabel metal1 562 227 590 356 0 B
-port 12 se
+port 1 se
 rlabel metal1 259 356 317 414 0 B
-port 13 se
+port 1 se
 rlabel metal1 547 356 605 414 0 B
-port 14 se
+port 1 se
 rlabel metal1 1123 169 1181 184 0 A
-port 15 se
+port 0 se
 rlabel metal1 1699 169 1757 184 0 A
-port 16 se
+port 0 se
 rlabel metal1 1042 184 1757 212 0 A
-port 17 se
+port 0 se
 rlabel metal1 1123 212 1181 227 0 A
-port 18 se
+port 0 se
 rlabel metal1 1699 212 1757 227 0 A
-port 19 se
+port 0 se
 rlabel metal1 1714 227 1742 356 0 A
-port 20 se
+port 0 se
 rlabel metal1 835 356 893 371 0 A
-port 21 se
+port 0 se
 rlabel metal1 1042 212 1070 371 0 A
-port 22 se
+port 0 se
 rlabel metal1 835 371 1070 399 0 A
-port 23 se
+port 0 se
 rlabel metal1 835 399 893 414 0 A
-port 24 se
+port 0 se
 rlabel metal1 1699 356 1757 414 0 A
-port 25 se
+port 0 se
 rlabel locali 0 -17 2016 17 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 31 17 1985 48 4 GND
-port 3 se
+port 2 se ground default abutment
 rlabel locali 0 649 2016 683 4 VDD
-port 1 se
+port 3 se power default abutment
 rlabel locali 31 618 1985 649 4 VDD
-port 1 se
+port 3 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 2016 666
 << end >>
diff --git a/cells/mag/XOR2X1.mag b/cells/mag/XOR2X1.mag
index 2e3427f..b2483dd 100644
--- a/cells/mag/XOR2X1.mag
+++ b/cells/mag/XOR2X1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1624887593
+timestamp 1624892590
 << checkpaint >>
 rect -1260 -1374 11260 2038
 << nwell >>
@@ -533,45 +533,45 @@
 rect 0 -48 2016 -17
 << labels >>
 rlabel metal1 0 618 2016 714 0 VDD
-port 1 se
+port 3 se
 rlabel metal1 0 618 2016 714 0 VDD
-port 2 se
+port 3 se
 rlabel metal1 0 -48 2016 48 0 GND
-port 4 se
+port 2 se
 rlabel metal1 931 88 989 146 0 Y
-port 5 se
+port 4 se
 rlabel metal1 259 169 317 227 0 A
-port 6 se
+port 0 se
 rlabel metal1 835 169 893 227 0 A
-port 7 se
+port 0 se
 rlabel metal1 274 227 302 356 0 A
-port 8 se
+port 0 se
 rlabel metal1 259 356 317 371 0 A
-port 9 se
+port 0 se
 rlabel metal1 850 227 878 371 0 A
-port 10 se
+port 0 se
 rlabel metal1 1123 356 1181 371 0 A
-port 11 se
+port 0 se
 rlabel metal1 259 371 1181 399 0 A
-port 12 se
+port 0 se
 rlabel metal1 259 399 317 414 0 A
-port 13 se
+port 0 se
 rlabel metal1 1123 399 1181 414 0 A
-port 14 se
+port 0 se
 rlabel metal1 547 169 605 227 0 B
-port 15 se
+port 1 se
 rlabel metal1 562 227 590 277 0 B
-port 16 se
+port 1 se
 rlabel metal1 547 277 605 335 0 B
-port 17 se
+port 1 se
 rlabel locali 0 -17 2016 17 4 GND
-port 4 se
+port 2 se ground default abutment
 rlabel locali 31 17 1985 48 4 GND
-port 4 se
+port 2 se ground default abutment
 rlabel locali 0 649 2016 683 4 VDD
-port 1 se
+port 3 se power default abutment
 rlabel locali 31 618 1985 649 4 VDD
-port 1 se
+port 3 se power default abutment
 << properties >>
 string FIXED_BBOX 0 0 2016 666
 << end >>
diff --git a/cells/mag/fixup.pl b/cells/mag/fixup.pl
index d67bf39..fd90dc2 100755
--- a/cells/mag/fixup.pl
+++ b/cells/mag/fixup.pl
@@ -38,17 +38,28 @@
 box 0 -17 $width 17
 label GND se locali
 port make
+port use ground
+port shape abutment
+
 box 31 17 $min 48
 label GND se locali
 port make
+port use ground
+port shape abutment
 
 box 0 649 $width 683
 label VDD se locali
 port make
+port use power
+port shape abutment
+
 box 31 618 $min 649
 label VDD se locali
 port make
+port use power
+port shape abutment
 
+port renumber
 save
 gds
 quit