Update to prjtrellis e1f399c46256bf905556780880b5ecc249e524c4

Signed-off-by: David Shah <davey1576@gmail.com>

ECP5/tiledata/BANKREF8/bits.db

diff --git a/ECP5/tiledata/BANKREF8/bits.db b/ECP5/tiledata/BANKREF8/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/BANKREF8/bits.db
+++ b/ECP5/tiledata/BANKREF8/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/CIB/bits.db

diff --git a/ECP5/tiledata/CIB/bits.db b/ECP5/tiledata/CIB/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB/bits.db
+++ b/ECP5/tiledata/CIB/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/CIB_DSP/bits.db

diff --git a/ECP5/tiledata/CIB_DSP/bits.db b/ECP5/tiledata/CIB_DSP/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB_DSP/bits.db
+++ b/ECP5/tiledata/CIB_DSP/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/CIB_EBR/bits.db

diff --git a/ECP5/tiledata/CIB_EBR/bits.db b/ECP5/tiledata/CIB_EBR/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB_EBR/bits.db
+++ b/ECP5/tiledata/CIB_EBR/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/CIB_EFB0/bits.db

diff --git a/ECP5/tiledata/CIB_EFB0/bits.db b/ECP5/tiledata/CIB_EFB0/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB_EFB0/bits.db
+++ b/ECP5/tiledata/CIB_EFB0/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/CIB_EFB1/bits.db

diff --git a/ECP5/tiledata/CIB_EFB1/bits.db b/ECP5/tiledata/CIB_EFB1/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB_EFB1/bits.db
+++ b/ECP5/tiledata/CIB_EFB1/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/CIB_LR/bits.db

diff --git a/ECP5/tiledata/CIB_LR/bits.db b/ECP5/tiledata/CIB_LR/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB_LR/bits.db
+++ b/ECP5/tiledata/CIB_LR/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/CIB_LR_S/bits.db

diff --git a/ECP5/tiledata/CIB_LR_S/bits.db b/ECP5/tiledata/CIB_LR_S/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB_LR_S/bits.db
+++ b/ECP5/tiledata/CIB_LR_S/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/CIB_PLL0/bits.db

diff --git a/ECP5/tiledata/CIB_PLL0/bits.db b/ECP5/tiledata/CIB_PLL0/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB_PLL0/bits.db
+++ b/ECP5/tiledata/CIB_PLL0/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/CIB_PLL1/bits.db

diff --git a/ECP5/tiledata/CIB_PLL1/bits.db b/ECP5/tiledata/CIB_PLL1/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB_PLL1/bits.db
+++ b/ECP5/tiledata/CIB_PLL1/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/CIB_PLL2/bits.db

diff --git a/ECP5/tiledata/CIB_PLL2/bits.db b/ECP5/tiledata/CIB_PLL2/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB_PLL2/bits.db
+++ b/ECP5/tiledata/CIB_PLL2/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/CIB_PLL3/bits.db

diff --git a/ECP5/tiledata/CIB_PLL3/bits.db b/ECP5/tiledata/CIB_PLL3/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/CIB_PLL3/bits.db
+++ b/ECP5/tiledata/CIB_PLL3/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/DDRDLL_LL/bits.db

diff --git a/ECP5/tiledata/DDRDLL_LL/bits.db b/ECP5/tiledata/DDRDLL_LL/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DDRDLL_LL/bits.db
+++ b/ECP5/tiledata/DDRDLL_LL/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DDRDLL_LR/bits.db

diff --git a/ECP5/tiledata/DDRDLL_LR/bits.db b/ECP5/tiledata/DDRDLL_LR/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DDRDLL_LR/bits.db
+++ b/ECP5/tiledata/DDRDLL_LR/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DDRDLL_UL/bits.db

diff --git a/ECP5/tiledata/DDRDLL_UL/bits.db b/ECP5/tiledata/DDRDLL_UL/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DDRDLL_UL/bits.db
+++ b/ECP5/tiledata/DDRDLL_UL/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DDRDLL_UR/bits.db

diff --git a/ECP5/tiledata/DDRDLL_UR/bits.db b/ECP5/tiledata/DDRDLL_UR/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DDRDLL_UR/bits.db
+++ b/ECP5/tiledata/DDRDLL_UR/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DTR/bits.db

diff --git a/ECP5/tiledata/DTR/bits.db b/ECP5/tiledata/DTR/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DTR/bits.db
+++ b/ECP5/tiledata/DTR/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_0/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_0/bits.db b/ECP5/tiledata/DUMMY_TILE_0/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_0/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_0/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_1/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_1/bits.db b/ECP5/tiledata/DUMMY_TILE_1/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_1/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_1/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_2/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_2/bits.db b/ECP5/tiledata/DUMMY_TILE_2/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_2/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_2/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_4/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_4/bits.db b/ECP5/tiledata/DUMMY_TILE_4/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_4/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_4/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_5/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_5/bits.db b/ECP5/tiledata/DUMMY_TILE_5/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_5/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_5/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_6/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_6/bits.db b/ECP5/tiledata/DUMMY_TILE_6/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_6/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_6/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_7/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_7/bits.db b/ECP5/tiledata/DUMMY_TILE_7/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_7/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_7/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_8/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_8/bits.db b/ECP5/tiledata/DUMMY_TILE_8/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_8/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_8/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_A/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_A/bits.db b/ECP5/tiledata/DUMMY_TILE_A/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_A/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_A/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_E/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_E/bits.db b/ECP5/tiledata/DUMMY_TILE_E/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_E/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_E/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_F/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_F/bits.db b/ECP5/tiledata/DUMMY_TILE_F/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_F/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_F/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_S/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_S/bits.db b/ECP5/tiledata/DUMMY_TILE_S/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_S/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_S/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/DUMMY_TILE_T/bits.db

diff --git a/ECP5/tiledata/DUMMY_TILE_T/bits.db b/ECP5/tiledata/DUMMY_TILE_T/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/DUMMY_TILE_T/bits.db
+++ b/ECP5/tiledata/DUMMY_TILE_T/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/ECLK_L/bits.db

diff --git a/ECP5/tiledata/ECLK_L/bits.db b/ECP5/tiledata/ECLK_L/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/ECLK_L/bits.db
+++ b/ECP5/tiledata/ECLK_L/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/ECLK_R/bits.db

diff --git a/ECP5/tiledata/ECLK_R/bits.db b/ECP5/tiledata/ECLK_R/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/ECLK_R/bits.db
+++ b/ECP5/tiledata/ECLK_R/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/EFB0_PICB0/bits.db

diff --git a/ECP5/tiledata/EFB0_PICB0/bits.db b/ECP5/tiledata/EFB0_PICB0/bits.db
index cd39643..c907694 100644
--- a/ECP5/tiledata/EFB0_PICB0/bits.db
+++ b/ECP5/tiledata/EFB0_PICB0/bits.db
@@ -1,6 +1,7 @@
 # Routing Mux Bits
 .mux JDIA
 INDDA_SIOLOGIC F21B0
+JPADDIA_PIO 
 
 
 # Non-Routing Configuration
@@ -82,8 +83,6 @@
 
 .fixed_conn JCLKB_SIOLOGIC N1E1_JCLK0
 
-.fixed_conn JDIA JPADDIA_PIO
-
 .fixed_conn JDIB JPADDIB_PIO
 
 .fixed_conn JDIRECTIONA_SIOLOGIC N1_JB1

ECP5/tiledata/EFB2_PICB0/bits.db

diff --git a/ECP5/tiledata/EFB2_PICB0/bits.db b/ECP5/tiledata/EFB2_PICB0/bits.db
index cd39643..c907694 100644
--- a/ECP5/tiledata/EFB2_PICB0/bits.db
+++ b/ECP5/tiledata/EFB2_PICB0/bits.db
@@ -1,6 +1,7 @@
 # Routing Mux Bits
 .mux JDIA
 INDDA_SIOLOGIC F21B0
+JPADDIA_PIO 
 
 
 # Non-Routing Configuration
@@ -82,8 +83,6 @@
 
 .fixed_conn JCLKB_SIOLOGIC N1E1_JCLK0
 
-.fixed_conn JDIA JPADDIA_PIO
-
 .fixed_conn JDIB JPADDIB_PIO
 
 .fixed_conn JDIRECTIONA_SIOLOGIC N1_JB1

ECP5/tiledata/MIB_CIB_LRC/bits.db

diff --git a/ECP5/tiledata/MIB_CIB_LRC/bits.db b/ECP5/tiledata/MIB_CIB_LRC/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/MIB_CIB_LRC/bits.db
+++ b/ECP5/tiledata/MIB_CIB_LRC/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/MIB_CIB_LRC_A/bits.db

diff --git a/ECP5/tiledata/MIB_CIB_LRC_A/bits.db b/ECP5/tiledata/MIB_CIB_LRC_A/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/MIB_CIB_LRC_A/bits.db
+++ b/ECP5/tiledata/MIB_CIB_LRC_A/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/MIB_CIB_LX/bits.db

diff --git a/ECP5/tiledata/MIB_CIB_LX/bits.db b/ECP5/tiledata/MIB_CIB_LX/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/MIB_CIB_LX/bits.db
+++ b/ECP5/tiledata/MIB_CIB_LX/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/MIB_CIB_RX/bits.db

diff --git a/ECP5/tiledata/MIB_CIB_RX/bits.db b/ECP5/tiledata/MIB_CIB_RX/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/MIB_CIB_RX/bits.db
+++ b/ECP5/tiledata/MIB_CIB_RX/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/MIB_DSP0/bits.db

diff --git a/ECP5/tiledata/MIB_DSP0/bits.db b/ECP5/tiledata/MIB_DSP0/bits.db
index c77a39a..b7f67b2 100644
--- a/ECP5/tiledata/MIB_DSP0/bits.db
+++ b/ECP5/tiledata/MIB_DSP0/bits.db
@@ -1,56 +1,74 @@
 # Routing Mux Bits
 .mux JMULTA0
+JMUIA0 
 JPO0 F63B0
 
 .mux JMULTA1
+JMUIA1 
 JPO1 F63B0
 
 .mux JMULTA10
+JMUIA10 
 JPO10 F63B0
 
 .mux JMULTA11
+JMUIA11 
 JPO11 F63B0
 
 .mux JMULTA12
+JMUIA12 
 JPO12 F63B0
 
 .mux JMULTA13
+JMUIA13 
 JPO13 F63B0
 
 .mux JMULTA14
+JMUIA14 
 JPO14 F63B0
 
 .mux JMULTA15
+JMUIA15 
 JPO15 F63B0
 
 .mux JMULTA16
+JMUIA16 
 JPO16 F63B0
 
 .mux JMULTA17
+JMUIA17 
 JPO17 F63B0
 
 .mux JMULTA2
+JMUIA2 
 JPO2 F63B0
 
 .mux JMULTA3
+JMUIA3 
 JPO3 F63B0
 
 .mux JMULTA4
+JMUIA4 
 JPO4 F63B0
 
 .mux JMULTA5
+JMUIA5 
 JPO5 F63B0
 
 .mux JMULTA6
+JMUIA6 
 JPO6 F63B0
 
 .mux JMULTA7
+JMUIA7 
 JPO7 F63B0
 
 .mux JMULTA8
+JMUIA8 
 JPO8 F63B0
 
 .mux JMULTA9
+JMUIA9 
 JPO9 F63B0
 
 
@@ -1009,42 +1027,6 @@
 
 .fixed_conn JMUIA9 E1_JB1
 
-.fixed_conn JMULTA0 JMUIA0
-
-.fixed_conn JMULTA1 JMUIA1
-
-.fixed_conn JMULTA10 JMUIA10
-
-.fixed_conn JMULTA11 JMUIA11
-
-.fixed_conn JMULTA12 JMUIA12
-
-.fixed_conn JMULTA13 JMUIA13
-
-.fixed_conn JMULTA14 JMUIA14
-
-.fixed_conn JMULTA15 JMUIA15
-
-.fixed_conn JMULTA16 JMUIA16
-
-.fixed_conn JMULTA17 JMUIA17
-
-.fixed_conn JMULTA2 JMUIA2
-
-.fixed_conn JMULTA3 JMUIA3
-
-.fixed_conn JMULTA4 JMUIA4
-
-.fixed_conn JMULTA5 JMUIA5
-
-.fixed_conn JMULTA6 JMUIA6
-
-.fixed_conn JMULTA7 JMUIA7
-
-.fixed_conn JMULTA8 JMUIA8
-
-.fixed_conn JMULTA9 JMUIA9
-
 .fixed_conn JOPPRE_PRADD18 E3_JA4
 
 .fixed_conn JOPPRE_PRADD9 E3_JA4

ECP5/tiledata/OSC/bits.db

diff --git a/ECP5/tiledata/OSC/bits.db b/ECP5/tiledata/OSC/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/OSC/bits.db
+++ b/ECP5/tiledata/OSC/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/PICB0/bits.db

diff --git a/ECP5/tiledata/PICB0/bits.db b/ECP5/tiledata/PICB0/bits.db
index cd39643..c907694 100644
--- a/ECP5/tiledata/PICB0/bits.db
+++ b/ECP5/tiledata/PICB0/bits.db
@@ -1,6 +1,7 @@
 # Routing Mux Bits
 .mux JDIA
 INDDA_SIOLOGIC F21B0
+JPADDIA_PIO 
 
 
 # Non-Routing Configuration
@@ -82,8 +83,6 @@
 
 .fixed_conn JCLKB_SIOLOGIC N1E1_JCLK0
 
-.fixed_conn JDIA JPADDIA_PIO
-
 .fixed_conn JDIB JPADDIB_PIO
 
 .fixed_conn JDIRECTIONA_SIOLOGIC N1_JB1

ECP5/tiledata/PICL0/bits.db

diff --git a/ECP5/tiledata/PICL0/bits.db b/ECP5/tiledata/PICL0/bits.db
index 2011a67..d2481f4 100644
--- a/ECP5/tiledata/PICL0/bits.db
+++ b/ECP5/tiledata/PICL0/bits.db
@@ -1,15 +1,19 @@
 # Routing Mux Bits
 .mux ECLKA
+BNK_ECLK0 
 BNK_ECLK1 F4B1
 
 .mux ECLKB
+BNK_ECLK0 
 BNK_ECLK1 F6B6
 
 .mux JDIA
 INDDA_IOLOGIC F8B1
+JPADDIA_PIO 
 
 .mux JDIB
 INDDB_IOLOGIC F0B7
+JPADDIB_PIO 
 
 
 # Non-Routing Configuration
@@ -209,12 +213,8 @@
 
 .fixed_conn E1_JQ5 JDIB
 
-.fixed_conn ECLKA BNK_ECLK0
-
 .fixed_conn ECLKA_IOLOGIC ECLKA
 
-.fixed_conn ECLKB BNK_ECLK0
-
 .fixed_conn ECLKB_IOLOGIC ECLKB
 
 .fixed_conn ECLKC BNK_ECLK0
@@ -289,10 +289,6 @@
 
 .fixed_conn JCLKD_IOLOGIC S2E1_JCLK1
 
-.fixed_conn JDIA JPADDIA_PIO
-
-.fixed_conn JDIB JPADDIB_PIO
-
 .fixed_conn JDIC JPADDIC_PIO
 
 .fixed_conn JDID JPADDID_PIO

ECP5/tiledata/PICL0_DQS2/bits.db

diff --git a/ECP5/tiledata/PICL0_DQS2/bits.db b/ECP5/tiledata/PICL0_DQS2/bits.db
index 2011a67..d2481f4 100644
--- a/ECP5/tiledata/PICL0_DQS2/bits.db
+++ b/ECP5/tiledata/PICL0_DQS2/bits.db
@@ -1,15 +1,19 @@
 # Routing Mux Bits
 .mux ECLKA
+BNK_ECLK0 
 BNK_ECLK1 F4B1
 
 .mux ECLKB
+BNK_ECLK0 
 BNK_ECLK1 F6B6
 
 .mux JDIA
 INDDA_IOLOGIC F8B1
+JPADDIA_PIO 
 
 .mux JDIB
 INDDB_IOLOGIC F0B7
+JPADDIB_PIO 
 
 
 # Non-Routing Configuration
@@ -209,12 +213,8 @@
 
 .fixed_conn E1_JQ5 JDIB
 
-.fixed_conn ECLKA BNK_ECLK0
-
 .fixed_conn ECLKA_IOLOGIC ECLKA
 
-.fixed_conn ECLKB BNK_ECLK0
-
 .fixed_conn ECLKB_IOLOGIC ECLKB
 
 .fixed_conn ECLKC BNK_ECLK0
@@ -289,10 +289,6 @@
 
 .fixed_conn JCLKD_IOLOGIC S2E1_JCLK1
 
-.fixed_conn JDIA JPADDIA_PIO
-
-.fixed_conn JDIB JPADDIB_PIO
-
 .fixed_conn JDIC JPADDIC_PIO
 
 .fixed_conn JDID JPADDID_PIO

ECP5/tiledata/PICL1/bits.db

diff --git a/ECP5/tiledata/PICL1/bits.db b/ECP5/tiledata/PICL1/bits.db
index 709fb7b..bed34cf 100644
--- a/ECP5/tiledata/PICL1/bits.db
+++ b/ECP5/tiledata/PICL1/bits.db
@@ -99,7 +99,7 @@
 
 .config_enum PIOA.OPENDRAIN
 OFF F4B1 F5B1 !F5B2 F6B1
-ON !F4B1 F5B2 !F5B1 !F6B1
+ON !F4B1 !F5B1 F5B2 !F6B1
 
 .config_enum PIOA.PULLMODE DOWN
 DOWN !F7B0 !F8B0
@@ -164,7 +164,7 @@
 
 .config_enum PIOB.OPENDRAIN
 OFF F0B4 F8B3 F9B3 !F9B4
-ON !F0B4 !F8B3 F9B4 !F9B3
+ON !F0B4 !F8B3 !F9B3 F9B4
 
 .config_enum PIOB.PULLMODE DOWN
 DOWN !F1B3 !F2B3
@@ -269,7 +269,7 @@
 
 .config_enum PIOC.OPENDRAIN
 OFF F2B6 F3B6 !F3B7 F4B6
-ON !F2B6 !F3B6 F3B7 !F4B6
+ON !F2B6 F3B7 !F3B6 !F4B6
 
 .config_enum PIOC.PULLMODE DOWN
 DOWN !F5B5 !F6B5
@@ -334,7 +334,7 @@
 
 .config_enum PIOD.OPENDRAIN
 OFF F6B8 F7B8 !F7B9 F8B8
-ON !F6B8 !F7B8 F7B9 !F8B8
+ON !F6B8 F7B9 !F7B8 !F8B8
 
 .config_enum PIOD.PULLMODE DOWN
 DOWN !F0B8 !F9B7

ECP5/tiledata/PICL1_DQS0/bits.db

diff --git a/ECP5/tiledata/PICL1_DQS0/bits.db b/ECP5/tiledata/PICL1_DQS0/bits.db
index bed34cf..709fb7b 100644
--- a/ECP5/tiledata/PICL1_DQS0/bits.db
+++ b/ECP5/tiledata/PICL1_DQS0/bits.db
@@ -99,7 +99,7 @@
 
 .config_enum PIOA.OPENDRAIN
 OFF F4B1 F5B1 !F5B2 F6B1
-ON !F4B1 !F5B1 F5B2 !F6B1
+ON !F4B1 F5B2 !F5B1 !F6B1
 
 .config_enum PIOA.PULLMODE DOWN
 DOWN !F7B0 !F8B0
@@ -164,7 +164,7 @@
 
 .config_enum PIOB.OPENDRAIN
 OFF F0B4 F8B3 F9B3 !F9B4
-ON !F0B4 !F8B3 !F9B3 F9B4
+ON !F0B4 !F8B3 F9B4 !F9B3
 
 .config_enum PIOB.PULLMODE DOWN
 DOWN !F1B3 !F2B3
@@ -269,7 +269,7 @@
 
 .config_enum PIOC.OPENDRAIN
 OFF F2B6 F3B6 !F3B7 F4B6
-ON !F2B6 F3B7 !F3B6 !F4B6
+ON !F2B6 !F3B6 F3B7 !F4B6
 
 .config_enum PIOC.PULLMODE DOWN
 DOWN !F5B5 !F6B5
@@ -334,7 +334,7 @@
 
 .config_enum PIOD.OPENDRAIN
 OFF F6B8 F7B8 !F7B9 F8B8
-ON !F6B8 F7B9 !F7B8 !F8B8
+ON !F6B8 !F7B8 F7B9 !F8B8
 
 .config_enum PIOD.PULLMODE DOWN
 DOWN !F0B8 !F9B7

ECP5/tiledata/PICL1_DQS3/bits.db

diff --git a/ECP5/tiledata/PICL1_DQS3/bits.db b/ECP5/tiledata/PICL1_DQS3/bits.db
index f134d0c..e6cb9fa 100644
--- a/ECP5/tiledata/PICL1_DQS3/bits.db
+++ b/ECP5/tiledata/PICL1_DQS3/bits.db
@@ -99,7 +99,7 @@
 
 .config_enum PIOA.OPENDRAIN
 OFF F4B1 F5B1 !F5B2 F6B1
-ON !F4B1 !F5B1 F5B2 !F6B1
+ON !F4B1 F5B2 !F5B1 !F6B1
 
 .config_enum PIOA.PULLMODE DOWN
 DOWN !F7B0 !F8B0
@@ -164,7 +164,7 @@
 
 .config_enum PIOB.OPENDRAIN
 OFF F0B4 F8B3 F9B3 !F9B4
-ON !F0B4 !F8B3 F9B4 !F9B3
+ON !F0B4 !F8B3 !F9B3 F9B4
 
 .config_enum PIOB.PULLMODE DOWN
 DOWN !F1B3 !F2B3
@@ -269,7 +269,7 @@
 
 .config_enum PIOC.OPENDRAIN
 OFF F2B6 F3B6 !F3B7 F4B6
-ON !F2B6 !F3B6 F3B7 !F4B6
+ON !F2B6 F3B7 !F3B6 !F4B6
 
 .config_enum PIOC.PULLMODE DOWN
 DOWN !F5B5 !F6B5
@@ -334,7 +334,7 @@
 
 .config_enum PIOD.OPENDRAIN
 OFF F6B8 F7B8 !F7B9 F8B8
-ON !F6B8 !F7B8 F7B9 !F8B8
+ON !F6B8 F7B9 !F7B8 !F8B8
 
 .config_enum PIOD.PULLMODE DOWN
 DOWN !F0B8 !F9B7

ECP5/tiledata/PICR0/bits.db

diff --git a/ECP5/tiledata/PICR0/bits.db b/ECP5/tiledata/PICR0/bits.db
index 360eed8..20b6ef1 100644
--- a/ECP5/tiledata/PICR0/bits.db
+++ b/ECP5/tiledata/PICR0/bits.db
@@ -1,15 +1,19 @@
 # Routing Mux Bits
 .mux ECLKA
+BNK_ECLK0 
 BNK_ECLK1 F5B1
 
 .mux ECLKB
+BNK_ECLK0 
 BNK_ECLK1 F3B6
 
 .mux JDIA
 INDDA_IOLOGIC F1B1
+JPADDIA_PIO 
 
 .mux JDIB
 INDDB_IOLOGIC F9B7
+JPADDIB_PIO 
 
 
 # Non-Routing Configuration
@@ -175,12 +179,8 @@
 
 .fixed_conn DQSWD_IOLOGIC DQSG_DQSW
 
-.fixed_conn ECLKA BNK_ECLK0
-
 .fixed_conn ECLKA_IOLOGIC ECLKA
 
-.fixed_conn ECLKB BNK_ECLK0
-
 .fixed_conn ECLKB_IOLOGIC ECLKB
 
 .fixed_conn ECLKC BNK_ECLK0
@@ -255,10 +255,6 @@
 
 .fixed_conn JCLKD_IOLOGIC S2W1_JCLK1
 
-.fixed_conn JDIA JPADDIA_PIO
-
-.fixed_conn JDIB JPADDIB_PIO
-
 .fixed_conn JDIC JPADDIC_PIO
 
 .fixed_conn JDID JPADDID_PIO

ECP5/tiledata/PICR0_DQS2/bits.db

diff --git a/ECP5/tiledata/PICR0_DQS2/bits.db b/ECP5/tiledata/PICR0_DQS2/bits.db
index 360eed8..20b6ef1 100644
--- a/ECP5/tiledata/PICR0_DQS2/bits.db
+++ b/ECP5/tiledata/PICR0_DQS2/bits.db
@@ -1,15 +1,19 @@
 # Routing Mux Bits
 .mux ECLKA
+BNK_ECLK0 
 BNK_ECLK1 F5B1
 
 .mux ECLKB
+BNK_ECLK0 
 BNK_ECLK1 F3B6
 
 .mux JDIA
 INDDA_IOLOGIC F1B1
+JPADDIA_PIO 
 
 .mux JDIB
 INDDB_IOLOGIC F9B7
+JPADDIB_PIO 
 
 
 # Non-Routing Configuration
@@ -175,12 +179,8 @@
 
 .fixed_conn DQSWD_IOLOGIC DQSG_DQSW
 
-.fixed_conn ECLKA BNK_ECLK0
-
 .fixed_conn ECLKA_IOLOGIC ECLKA
 
-.fixed_conn ECLKB BNK_ECLK0
-
 .fixed_conn ECLKB_IOLOGIC ECLKB
 
 .fixed_conn ECLKC BNK_ECLK0
@@ -255,10 +255,6 @@
 
 .fixed_conn JCLKD_IOLOGIC S2W1_JCLK1
 
-.fixed_conn JDIA JPADDIA_PIO
-
-.fixed_conn JDIB JPADDIB_PIO
-
 .fixed_conn JDIC JPADDIC_PIO
 
 .fixed_conn JDID JPADDID_PIO

ECP5/tiledata/PICR1/bits.db

diff --git a/ECP5/tiledata/PICR1/bits.db b/ECP5/tiledata/PICR1/bits.db
index ca91418..97bf59f 100644
--- a/ECP5/tiledata/PICR1/bits.db
+++ b/ECP5/tiledata/PICR1/bits.db
@@ -99,7 +99,7 @@
 
 .config_enum PIOA.OPENDRAIN
 OFF F3B1 F4B1 !F4B2 F5B1
-ON !F3B1 !F4B1 F4B2 !F5B1
+ON !F3B1 F4B2 !F4B1 !F5B1
 
 .config_enum PIOA.PULLMODE DOWN
 DOWN !F1B0 !F2B0
@@ -164,7 +164,7 @@
 
 .config_enum PIOB.OPENDRAIN
 OFF F0B3 !F0B4 F1B3 F9B4
-ON !F0B3 F0B4 !F1B3 !F9B4
+ON F0B4 !F0B3 !F1B3 !F9B4
 
 .config_enum PIOB.PULLMODE DOWN
 DOWN !F7B3 !F8B3
@@ -269,7 +269,7 @@
 
 .config_enum PIOC.OPENDRAIN
 OFF F5B6 F6B6 !F6B7 F7B6
-ON !F5B6 !F6B6 F6B7 !F7B6
+ON !F5B6 F6B7 !F6B6 !F7B6
 
 .config_enum PIOC.PULLMODE DOWN
 DOWN !F3B5 !F4B5
@@ -334,7 +334,7 @@
 
 .config_enum PIOD.OPENDRAIN
 OFF F1B8 F2B8 !F2B9 F3B8
-ON !F1B8 F2B9 !F2B8 !F3B8
+ON !F1B8 !F2B8 F2B9 !F3B8
 
 .config_enum PIOD.PULLMODE DOWN
 DOWN !F0B7 !F9B8

ECP5/tiledata/PICR1_DQS0/bits.db

diff --git a/ECP5/tiledata/PICR1_DQS0/bits.db b/ECP5/tiledata/PICR1_DQS0/bits.db
index 97bf59f..ca91418 100644
--- a/ECP5/tiledata/PICR1_DQS0/bits.db
+++ b/ECP5/tiledata/PICR1_DQS0/bits.db
@@ -99,7 +99,7 @@
 
 .config_enum PIOA.OPENDRAIN
 OFF F3B1 F4B1 !F4B2 F5B1
-ON !F3B1 F4B2 !F4B1 !F5B1
+ON !F3B1 !F4B1 F4B2 !F5B1
 
 .config_enum PIOA.PULLMODE DOWN
 DOWN !F1B0 !F2B0
@@ -164,7 +164,7 @@
 
 .config_enum PIOB.OPENDRAIN
 OFF F0B3 !F0B4 F1B3 F9B4
-ON F0B4 !F0B3 !F1B3 !F9B4
+ON !F0B3 F0B4 !F1B3 !F9B4
 
 .config_enum PIOB.PULLMODE DOWN
 DOWN !F7B3 !F8B3
@@ -269,7 +269,7 @@
 
 .config_enum PIOC.OPENDRAIN
 OFF F5B6 F6B6 !F6B7 F7B6
-ON !F5B6 F6B7 !F6B6 !F7B6
+ON !F5B6 !F6B6 F6B7 !F7B6
 
 .config_enum PIOC.PULLMODE DOWN
 DOWN !F3B5 !F4B5
@@ -334,7 +334,7 @@
 
 .config_enum PIOD.OPENDRAIN
 OFF F1B8 F2B8 !F2B9 F3B8
-ON !F1B8 !F2B8 F2B9 !F3B8
+ON !F1B8 F2B9 !F2B8 !F3B8
 
 .config_enum PIOD.PULLMODE DOWN
 DOWN !F0B7 !F9B8

ECP5/tiledata/PICR1_DQS3/bits.db

diff --git a/ECP5/tiledata/PICR1_DQS3/bits.db b/ECP5/tiledata/PICR1_DQS3/bits.db
index 97bf59f..ca91418 100644
--- a/ECP5/tiledata/PICR1_DQS3/bits.db
+++ b/ECP5/tiledata/PICR1_DQS3/bits.db
@@ -99,7 +99,7 @@
 
 .config_enum PIOA.OPENDRAIN
 OFF F3B1 F4B1 !F4B2 F5B1
-ON !F3B1 F4B2 !F4B1 !F5B1
+ON !F3B1 !F4B1 F4B2 !F5B1
 
 .config_enum PIOA.PULLMODE DOWN
 DOWN !F1B0 !F2B0
@@ -164,7 +164,7 @@
 
 .config_enum PIOB.OPENDRAIN
 OFF F0B3 !F0B4 F1B3 F9B4
-ON F0B4 !F0B3 !F1B3 !F9B4
+ON !F0B3 F0B4 !F1B3 !F9B4
 
 .config_enum PIOB.PULLMODE DOWN
 DOWN !F7B3 !F8B3
@@ -269,7 +269,7 @@
 
 .config_enum PIOC.OPENDRAIN
 OFF F5B6 F6B6 !F6B7 F7B6
-ON !F5B6 F6B7 !F6B6 !F7B6
+ON !F5B6 !F6B6 F6B7 !F7B6
 
 .config_enum PIOC.PULLMODE DOWN
 DOWN !F3B5 !F4B5
@@ -334,7 +334,7 @@
 
 .config_enum PIOD.OPENDRAIN
 OFF F1B8 F2B8 !F2B9 F3B8
-ON !F1B8 !F2B8 F2B9 !F3B8
+ON !F1B8 F2B9 !F2B8 !F3B8
 
 .config_enum PIOD.PULLMODE DOWN
 DOWN !F0B7 !F9B8

ECP5/tiledata/PLC2/bits.db

diff --git a/ECP5/tiledata/PLC2/bits.db b/ECP5/tiledata/PLC2/bits.db
index c1e4e32..19c121a 100644
--- a/ECP5/tiledata/PLC2/bits.db
+++ b/ECP5/tiledata/PLC2/bits.db
@@ -1256,27 +1256,35 @@
 W3_H06E0303 F101B2 F103B3
 
 .mux F0
+F0_SLICE 
 F5A_SLICE F8B10
 
 .mux F1
+F1_SLICE 
 FXA_SLICE F8B11
 
 .mux F2
+F2_SLICE 
 F5B_SLICE F43B10
 
 .mux F3
+F3_SLICE 
 FXB_SLICE F43B11
 
 .mux F4
+F4_SLICE 
 F5C_SLICE F62B10
 
 .mux F5
+F5_SLICE 
 FXC_SLICE F62B11
 
 .mux F6
 F5D_SLICE F97B10
+F6_SLICE 
 
 .mux F7
+F7_SLICE 
 FXD_SLICE F97B11
 
 .mux H00L0000
@@ -1300,6 +1308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -1322,10 +1331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 F4 F58B5 F61B4
 F6 F58B5 F64B4
 H02E0401 F58B4 F60B4
@@ -1348,6 +1359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 F5 F58B3 F61B2
 F7 F58B3 F64B2
 H02E0501 F58B2 F60B2
@@ -2120,6 +2132,7 @@
 Q6 F63B5 F66B4
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2142,6 +2155,7 @@
 Q7 F63B3 F66B2
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2160,6 +2174,7 @@
 H02W0201 F63B9 F66B9
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 Q0 F60B9 F66B8
 Q2 F63B9 F66B8
 S1_V02N0401 F61B9 F65B9
@@ -2182,6 +2197,7 @@
 H02W0301 F63B7 F66B7
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 Q1 F60B7 F66B6
 Q3 F63B7 F66B6
 S1_V02N0501 F61B7 F65B7
@@ -3086,22 +3102,6 @@
 
 .fixed_conn DI7_SLICE DI7
 
-.fixed_conn F0 F0_SLICE
-
-.fixed_conn F1 F1_SLICE
-
-.fixed_conn F2 F2_SLICE
-
-.fixed_conn F3 F3_SLICE
-
-.fixed_conn F4 F4_SLICE
-
-.fixed_conn F5 F5_SLICE
-
-.fixed_conn F6 F6_SLICE
-
-.fixed_conn F7 F7_SLICE
-
 .fixed_conn FCI HFIE0000
 
 .fixed_conn FCIB_SLICE FCOA_SLICE
@@ -3146,14 +3146,6 @@
 
 .fixed_conn FXBD_SLICE FXBD
 
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn HL7W0001 F3
 
 .fixed_conn LSR0_SLICE MUXLSR0
@@ -3196,14 +3188,6 @@
 
 .fixed_conn Q7 Q7_SLICE
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-
 .fixed_conn WAD0 WADO0C_SLICE
 
 .fixed_conn WAD0A_SLICE WAD0

ECP5/tiledata/PLL0_LL/bits.db

diff --git a/ECP5/tiledata/PLL0_LL/bits.db b/ECP5/tiledata/PLL0_LL/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/PLL0_LL/bits.db
+++ b/ECP5/tiledata/PLL0_LL/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/PLL0_LR/bits.db

diff --git a/ECP5/tiledata/PLL0_LR/bits.db b/ECP5/tiledata/PLL0_LR/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/PLL0_LR/bits.db
+++ b/ECP5/tiledata/PLL0_LR/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/PLL0_UL/bits.db

diff --git a/ECP5/tiledata/PLL0_UL/bits.db b/ECP5/tiledata/PLL0_UL/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/PLL0_UL/bits.db
+++ b/ECP5/tiledata/PLL0_UL/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/PLL0_UR/bits.db

diff --git a/ECP5/tiledata/PLL0_UR/bits.db b/ECP5/tiledata/PLL0_UR/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/PLL0_UR/bits.db
+++ b/ECP5/tiledata/PLL0_UR/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/PLL1_LR/bits.db

diff --git a/ECP5/tiledata/PLL1_LR/bits.db b/ECP5/tiledata/PLL1_LR/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/PLL1_LR/bits.db
+++ b/ECP5/tiledata/PLL1_LR/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/PLL1_UL/bits.db

diff --git a/ECP5/tiledata/PLL1_UL/bits.db b/ECP5/tiledata/PLL1_UL/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/PLL1_UL/bits.db
+++ b/ECP5/tiledata/PLL1_UL/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/PLL1_UR/bits.db

diff --git a/ECP5/tiledata/PLL1_UR/bits.db b/ECP5/tiledata/PLL1_UR/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/PLL1_UR/bits.db
+++ b/ECP5/tiledata/PLL1_UR/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/POR/bits.db

diff --git a/ECP5/tiledata/POR/bits.db b/ECP5/tiledata/POR/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/POR/bits.db
+++ b/ECP5/tiledata/POR/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/PVT_COUNT2/bits.db

diff --git a/ECP5/tiledata/PVT_COUNT2/bits.db b/ECP5/tiledata/PVT_COUNT2/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/PVT_COUNT2/bits.db
+++ b/ECP5/tiledata/PVT_COUNT2/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/SPICB0/bits.db

diff --git a/ECP5/tiledata/SPICB0/bits.db b/ECP5/tiledata/SPICB0/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/SPICB0/bits.db
+++ b/ECP5/tiledata/SPICB0/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections

ECP5/tiledata/VCIB_DCU0/bits.db

diff --git a/ECP5/tiledata/VCIB_DCU0/bits.db b/ECP5/tiledata/VCIB_DCU0/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCU0/bits.db
+++ b/ECP5/tiledata/VCIB_DCU0/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCU1/bits.db

diff --git a/ECP5/tiledata/VCIB_DCU1/bits.db b/ECP5/tiledata/VCIB_DCU1/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCU1/bits.db
+++ b/ECP5/tiledata/VCIB_DCU1/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCU2/bits.db

diff --git a/ECP5/tiledata/VCIB_DCU2/bits.db b/ECP5/tiledata/VCIB_DCU2/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCU2/bits.db
+++ b/ECP5/tiledata/VCIB_DCU2/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCU3/bits.db

diff --git a/ECP5/tiledata/VCIB_DCU3/bits.db b/ECP5/tiledata/VCIB_DCU3/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCU3/bits.db
+++ b/ECP5/tiledata/VCIB_DCU3/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCUA/bits.db

diff --git a/ECP5/tiledata/VCIB_DCUA/bits.db b/ECP5/tiledata/VCIB_DCUA/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCUA/bits.db
+++ b/ECP5/tiledata/VCIB_DCUA/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCUB/bits.db

diff --git a/ECP5/tiledata/VCIB_DCUB/bits.db b/ECP5/tiledata/VCIB_DCUB/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCUB/bits.db
+++ b/ECP5/tiledata/VCIB_DCUB/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCUC/bits.db

diff --git a/ECP5/tiledata/VCIB_DCUC/bits.db b/ECP5/tiledata/VCIB_DCUC/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCUC/bits.db
+++ b/ECP5/tiledata/VCIB_DCUC/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCUD/bits.db

diff --git a/ECP5/tiledata/VCIB_DCUD/bits.db b/ECP5/tiledata/VCIB_DCUD/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCUD/bits.db
+++ b/ECP5/tiledata/VCIB_DCUD/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCUF/bits.db

diff --git a/ECP5/tiledata/VCIB_DCUF/bits.db b/ECP5/tiledata/VCIB_DCUF/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCUF/bits.db
+++ b/ECP5/tiledata/VCIB_DCUF/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCUG/bits.db

diff --git a/ECP5/tiledata/VCIB_DCUG/bits.db b/ECP5/tiledata/VCIB_DCUG/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCUG/bits.db
+++ b/ECP5/tiledata/VCIB_DCUG/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCUH/bits.db

diff --git a/ECP5/tiledata/VCIB_DCUH/bits.db b/ECP5/tiledata/VCIB_DCUH/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCUH/bits.db
+++ b/ECP5/tiledata/VCIB_DCUH/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VCIB_DCUI/bits.db

diff --git a/ECP5/tiledata/VCIB_DCUI/bits.db b/ECP5/tiledata/VCIB_DCUI/bits.db
index 0d693ab..93d1428 100644
--- a/ECP5/tiledata/VCIB_DCUI/bits.db
+++ b/ECP5/tiledata/VCIB_DCUI/bits.db
@@ -308,6 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
+WBOUNCE 
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -330,10 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
+WBOUNCE 
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
+EBOUNCE 
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -356,6 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
+EBOUNCE 
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2064,6 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
+SBOUNCE 
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2086,6 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
+SBOUNCE 
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2106,6 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
+NBOUNCE 
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2128,6 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
+NBOUNCE 
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2621,14 +2629,6 @@
 
 
 # Fixed Connections
-.fixed_conn H00L0000 WBOUNCE
-
-.fixed_conn H00L0100 WBOUNCE
-
-.fixed_conn H00R0000 EBOUNCE
-
-.fixed_conn H00R0100 EBOUNCE
-
 .fixed_conn JA0_CIBTEST JA0
 
 .fixed_conn JA1_CIBTEST JA1
@@ -2757,11 +2757,3 @@
 
 .fixed_conn JQ7 JQ7_CIBTEST
 
-.fixed_conn V00B0000 SBOUNCE
-
-.fixed_conn V00B0100 SBOUNCE
-
-.fixed_conn V00T0000 NBOUNCE
-
-.fixed_conn V00T0100 NBOUNCE
-

ECP5/tiledata/VIQ_BUF/bits.db

diff --git a/ECP5/tiledata/VIQ_BUF/bits.db b/ECP5/tiledata/VIQ_BUF/bits.db
index 8b13789..d13466e 100644
--- a/ECP5/tiledata/VIQ_BUF/bits.db
+++ b/ECP5/tiledata/VIQ_BUF/bits.db
@@ -1 +1,5 @@
+# Routing Mux Bits
 
+# Non-Routing Configuration
+
+# Fixed Connections