diff --git a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds
index 6091e67..4c46612 100644
--- a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds
+++ b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds
Binary files differ
diff --git a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vccd_slice_5um.gds b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vccd_slice_5um.gds
index 17cdfe2..21da4c0 100644
--- a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vccd_slice_5um.gds
+++ b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vccd_slice_5um.gds
Binary files differ
diff --git a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vdda_slice_5um.gds b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vdda_slice_5um.gds
index f24b91e..4569967 100644
--- a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vdda_slice_5um.gds
+++ b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vdda_slice_5um.gds
Binary files differ
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_10um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_10um.lef
index 4948ee1..95035f3 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_10um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_10um.lef
@@ -160,11 +160,11 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 0.000 68.000 10.000 92.950 ;
+        RECT 0.000 68.000 1.000 92.950 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 68.000 10.000 92.965 ;
+        RECT 0.000 68.000 1.000 92.965 ;
     END
     PORT
       LAYER met5 ;
@@ -281,11 +281,13 @@
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 93.365 10.000 197.965 ;
-        RECT 0.000 66.900 10.000 67.600 ;
+        RECT 0.000 66.900 10.000 95.000 ;
+        RECT 0.000 172.000 10.000 197.965 ;
         RECT 0.000 61.050 10.000 61.650 ;
         RECT 0.000 55.100 10.000 55.800 ;
-        RECT 0.000 49.610 10.000 50.790 ;
+        RECT 0.000 49.710 10.000 50.690 ;
+      LAYER met5 ;
+        RECT 2.600 68.000 7.400 92.950 ;
   END
 END sky130_ef_io__com_bus_slice_10um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_1um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_1um.lef
index bd34ce3..2ab2a77 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_1um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_1um.lef
@@ -169,11 +169,10 @@
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 93.365 1.000 197.965 ;
-        RECT 0.000 66.900 1.000 67.600 ;
-        RECT 0.000 61.050 1.000 61.650 ;
+        RECT 0.000 66.900 1.000 95.000 ;
+	RECT 0.000 172.000 1.000 197.965 ;
         RECT 0.000 55.100 1.000 55.800 ;
-        RECT 0.000 49.610 1.000 50.790 ;
+        RECT 0.000 49.710 1.000 50.690 ;
   END
 END sky130_ef_io__com_bus_slice_1um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_20um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_20um.lef
index 2d650a0..bb10ad7 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_20um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_20um.lef
@@ -160,11 +160,11 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 0.000 68.000 20.000 92.950 ;
+        RECT 0.000 68.000 1.000 92.950 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 68.000 20.000 92.965 ;
+        RECT 0.000 68.000 1.000 92.965 ;
     END
     PORT
       LAYER met5 ;
@@ -281,11 +281,13 @@
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 93.365 20.000 197.965 ;
-        RECT 0.000 66.900 20.000 67.600 ;
+        RECT 0.000 66.900 20.000 95.000 ;
+        RECT 0.000 172.000 20.000 197.965 ;
         RECT 0.000 61.050 20.000 61.650 ;
         RECT 0.000 55.100 20.000 55.800 ;
-        RECT 0.000 49.610 20.000 50.790 ;
+        RECT 0.000 49.710 20.000 50.690 ;
+      LAYER met5 ;
+        RECT 2.600 68.000 17.400 92.950 ;
   END
 END sky130_ef_io__com_bus_slice_20um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_5um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_5um.lef
index 46f404e..e0a21f9 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_5um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__com_bus_slice_5um.lef
@@ -160,11 +160,11 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 0.000 68.000 5.000 92.950 ;
+        RECT 0.000 68.000 1.000 92.950 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 68.000 5.000 92.965 ;
+        RECT 0.000 68.000 1.000 92.965 ;
     END
     PORT
       LAYER met5 ;
@@ -281,11 +281,11 @@
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 93.365 5.000 197.965 ;
-        RECT 0.000 66.900 5.000 67.600 ;
+        RECT 0.000 66.900 5.000 95.000 ;
+        RECT 0.000 172.000 5.000 197.965 ;
         RECT 0.000 61.050 5.000 61.650 ;
         RECT 0.000 55.100 5.000 55.800 ;
-        RECT 0.000 49.610 5.000 50.790 ;
+        RECT 0.000 49.710 5.000 50.690 ;
   END
 END sky130_ef_io__com_bus_slice_5um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vccd_slice_5um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vccd_slice_5um.lef
index 8b85966..f4083ad 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vccd_slice_5um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vccd_slice_5um.lef
@@ -160,10 +160,6 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 0.000 68.000 1.000 92.950 ;
-    END
-    PORT
-      LAYER met4 ;
         RECT 0.000 68.000 1.000 92.965 ;
     END
     PORT
@@ -176,10 +172,6 @@
     END
     PORT
       LAYER met5 ;
-        RECT 4.000 68.000 5.000 92.950 ;
-    END
-    PORT
-      LAYER met4 ;
         RECT 4.000 68.000 5.000 92.965 ;
     END
     PORT
@@ -241,8 +233,7 @@
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 66.900 5.000 95.000 ;
-        RECT 0.000 172.000 5.000 197.965 ;
+        RECT 0.000 66.900 5.000 197.965 ;
         RECT 0.000 61.050 5.000 61.650 ;
         RECT 0.000 55.100 5.000 55.800 ;
         RECT 0.000 49.710 5.000 50.690 ;
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vdda_slice_5um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vdda_slice_5um.lef
index f887dcf..f1389d9 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vdda_slice_5um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vdda_slice_5um.lef
@@ -96,10 +96,6 @@
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 68.000 1.000 92.950 ;
-    END
-    PORT
-      LAYER met4 ;
         RECT 0.000 68.000 1.000 92.965 ;
     END
     PORT
@@ -112,10 +108,6 @@
     END
     PORT
       LAYER met5 ;
-        RECT 4.000 68.000 5.000 92.950 ;
-    END
-    PORT
-      LAYER met4 ;
         RECT 4.000 68.000 5.000 92.965 ;
     END
     PORT
@@ -217,8 +209,7 @@
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 68.000 5.000 95.000 ;
-        RECT 0.000 172.000 5.000 197.965 ;
+        RECT 0.000 68.000 5.000 197.965 ;
   END
 END sky130_ef_io__disconnect_vdda_slice_5um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.mag b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.mag
index 96caef6..98e5406 100644
--- a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.mag
+++ b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.mag
@@ -113,17 +113,13 @@
 port 7 nsew power bidirectional
 flabel metal4 s 3800 0 4000 1090 0 FreeSans 800 0 0 0 VCCHIB
 port 7 nsew power bidirectional
-flabel metal5 s 0 13600 200 18590 0 FreeSans 800 0 0 0 VDDIO
-port 8 nsew power bidirectional
-flabel metal4 s 0 13600 200 18593 0 FreeSans 800 0 0 0 VDDIO
+flabel metal5 s 0 13600 200 18593 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
 flabel metal5 s 0 3570 200 4460 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
 flabel metal4 s 0 3550 200 4480 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
-flabel metal5 s 3800 13600 4000 18590 0 FreeSans 800 0 0 0 VDDIO
-port 8 nsew power bidirectional
-flabel metal4 s 3800 13600 4000 18593 0 FreeSans 800 0 0 0 VDDIO
+flabel metal5 s 3800 13600 4000 18593 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
 flabel metal5 s 3800 3570 4000 4460 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
@@ -169,6 +165,6 @@
 string LEFclass PAD AREAIO
 string FIXED_BBOX 0 0 4000 39593
 string GDS_FILE ../gds/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds
-string GDS_END 56838
+string GDS_END 56578
 string GDS_START 214
 << end >>
diff --git a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vccd_slice_5um.mag b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vccd_slice_5um.mag
index 62799bb..48c865f 100644
--- a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vccd_slice_5um.mag
+++ b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vccd_slice_5um.mag
@@ -99,17 +99,13 @@
 port 7 nsew power bidirectional
 flabel metal4 s 800 0 1000 1090 0 FreeSans 800 0 0 0 VCCHIB
 port 7 nsew power bidirectional
-flabel metal5 s 0 13600 200 18590 0 FreeSans 800 0 0 0 VDDIO
-port 8 nsew power bidirectional
-flabel metal4 s 0 13600 200 18593 0 FreeSans 800 0 0 0 VDDIO
+flabel metal5 s 0 13600 200 18593 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
 flabel metal5 s 0 3570 200 4460 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
 flabel metal4 s 0 3550 200 4480 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
-flabel metal5 s 800 13600 1000 18590 0 FreeSans 800 0 0 0 VDDIO
-port 8 nsew power bidirectional
-flabel metal4 s 800 13600 1000 18593 0 FreeSans 800 0 0 0 VDDIO
+flabel metal5 s 800 13600 1000 18593 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
 flabel metal5 s 800 3570 1000 4460 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
@@ -139,6 +135,6 @@
 string LEFclass PAD AREAIO
 string FIXED_BBOX 0 0 1000 39593
 string GDS_FILE ../gds/sky130_ef_io__disconnect_vccd_slice_5um.gds
-string GDS_END 8282
+string GDS_END 8022
 string GDS_START 170
 << end >>
diff --git a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vdda_slice_5um.mag b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vdda_slice_5um.mag
index 5f15955..9faa618 100644
--- a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vdda_slice_5um.mag
+++ b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vdda_slice_5um.mag
@@ -55,17 +55,13 @@
 port 7 nsew power bidirectional
 flabel metal4 s 800 0 1000 1090 0 FreeSans 800 0 0 0 VCCHIB
 port 7 nsew power bidirectional
-flabel metal5 s 0 13600 200 18590 0 FreeSans 800 0 0 0 VDDIO
-port 8 nsew power bidirectional
-flabel metal4 s 0 13600 200 18593 0 FreeSans 800 0 0 0 VDDIO
+flabel metal5 s 0 13600 200 18593 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
 flabel metal5 s 0 3570 200 4460 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
 flabel metal4 s 0 3550 200 4480 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
-flabel metal5 s 800 13600 1000 18590 0 FreeSans 800 0 0 0 VDDIO
-port 8 nsew power bidirectional
-flabel metal4 s 800 13600 1000 18593 0 FreeSans 800 0 0 0 VDDIO
+flabel metal5 s 800 13600 1000 18593 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
 flabel metal5 s 800 3570 1000 4460 0 FreeSans 800 0 0 0 VDDIO
 port 8 nsew power bidirectional
@@ -119,6 +115,6 @@
 string LEFclass PAD AREAIO
 string FIXED_BBOX 0 0 1000 39593
 string GDS_FILE ../gds/sky130_ef_io__disconnect_vdda_slice_5um.gds
-string GDS_END 7232
+string GDS_END 6972
 string GDS_START 170
 << end >>