diff --git a/ECP5/tiledata/CIB/bits.db b/ECP5/tiledata/CIB/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB/bits.db
+++ b/ECP5/tiledata/CIB/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/CIB_DSP/bits.db b/ECP5/tiledata/CIB_DSP/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB_DSP/bits.db
+++ b/ECP5/tiledata/CIB_DSP/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/CIB_EBR/bits.db b/ECP5/tiledata/CIB_EBR/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB_EBR/bits.db
+++ b/ECP5/tiledata/CIB_EBR/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/CIB_EFB0/bits.db b/ECP5/tiledata/CIB_EFB0/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB_EFB0/bits.db
+++ b/ECP5/tiledata/CIB_EFB0/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/CIB_EFB1/bits.db b/ECP5/tiledata/CIB_EFB1/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB_EFB1/bits.db
+++ b/ECP5/tiledata/CIB_EFB1/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/CIB_LR/bits.db b/ECP5/tiledata/CIB_LR/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB_LR/bits.db
+++ b/ECP5/tiledata/CIB_LR/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/CIB_LR_S/bits.db b/ECP5/tiledata/CIB_LR_S/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB_LR_S/bits.db
+++ b/ECP5/tiledata/CIB_LR_S/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/CIB_PLL0/bits.db b/ECP5/tiledata/CIB_PLL0/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB_PLL0/bits.db
+++ b/ECP5/tiledata/CIB_PLL0/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/CIB_PLL1/bits.db b/ECP5/tiledata/CIB_PLL1/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB_PLL1/bits.db
+++ b/ECP5/tiledata/CIB_PLL1/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/CIB_PLL2/bits.db b/ECP5/tiledata/CIB_PLL2/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB_PLL2/bits.db
+++ b/ECP5/tiledata/CIB_PLL2/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/CIB_PLL3/bits.db b/ECP5/tiledata/CIB_PLL3/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/CIB_PLL3/bits.db
+++ b/ECP5/tiledata/CIB_PLL3/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/EBR_CMUX_LL/bits.db b/ECP5/tiledata/EBR_CMUX_LL/bits.db
index 5b78b09..9aecff7 100644
--- a/ECP5/tiledata/EBR_CMUX_LL/bits.db
+++ b/ECP5/tiledata/EBR_CMUX_LL/bits.db
@@ -7,6 +7,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_CMUX_UL/bits.db b/ECP5/tiledata/EBR_CMUX_UL/bits.db
index c77f58a..bc7dbf3 100644
--- a/ECP5/tiledata/EBR_CMUX_UL/bits.db
+++ b/ECP5/tiledata/EBR_CMUX_UL/bits.db
@@ -7,6 +7,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_LL0/bits.db b/ECP5/tiledata/EBR_SPINE_LL0/bits.db
index 9cf651e..577f555 100644
--- a/ECP5/tiledata/EBR_SPINE_LL0/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_LL0/bits.db
@@ -55,6 +55,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_LL1/bits.db b/ECP5/tiledata/EBR_SPINE_LL1/bits.db
index 9cf651e..577f555 100644
--- a/ECP5/tiledata/EBR_SPINE_LL1/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_LL1/bits.db
@@ -55,6 +55,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_LL2/bits.db b/ECP5/tiledata/EBR_SPINE_LL2/bits.db
index 5b78b09..9aecff7 100644
--- a/ECP5/tiledata/EBR_SPINE_LL2/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_LL2/bits.db
@@ -7,6 +7,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_LR0/bits.db b/ECP5/tiledata/EBR_SPINE_LR0/bits.db
index 9cf651e..577f555 100644
--- a/ECP5/tiledata/EBR_SPINE_LR0/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_LR0/bits.db
@@ -55,6 +55,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_LR1/bits.db b/ECP5/tiledata/EBR_SPINE_LR1/bits.db
index 9cf651e..577f555 100644
--- a/ECP5/tiledata/EBR_SPINE_LR1/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_LR1/bits.db
@@ -55,6 +55,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_LR2/bits.db b/ECP5/tiledata/EBR_SPINE_LR2/bits.db
index 5b78b09..9aecff7 100644
--- a/ECP5/tiledata/EBR_SPINE_LR2/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_LR2/bits.db
@@ -7,6 +7,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_UL0/bits.db b/ECP5/tiledata/EBR_SPINE_UL0/bits.db
index 9cf651e..577f555 100644
--- a/ECP5/tiledata/EBR_SPINE_UL0/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_UL0/bits.db
@@ -55,6 +55,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_UL1/bits.db b/ECP5/tiledata/EBR_SPINE_UL1/bits.db
index 9cf651e..577f555 100644
--- a/ECP5/tiledata/EBR_SPINE_UL1/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_UL1/bits.db
@@ -55,6 +55,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_UL2/bits.db b/ECP5/tiledata/EBR_SPINE_UL2/bits.db
index 5b78b09..9aecff7 100644
--- a/ECP5/tiledata/EBR_SPINE_UL2/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_UL2/bits.db
@@ -7,6 +7,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_UR0/bits.db b/ECP5/tiledata/EBR_SPINE_UR0/bits.db
index 9cf651e..577f555 100644
--- a/ECP5/tiledata/EBR_SPINE_UR0/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_UR0/bits.db
@@ -55,6 +55,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_UR1/bits.db b/ECP5/tiledata/EBR_SPINE_UR1/bits.db
index 9cf651e..577f555 100644
--- a/ECP5/tiledata/EBR_SPINE_UR1/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_UR1/bits.db
@@ -55,6 +55,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EBR_SPINE_UR2/bits.db b/ECP5/tiledata/EBR_SPINE_UR2/bits.db
index 5b78b09..9aecff7 100644
--- a/ECP5/tiledata/EBR_SPINE_UR2/bits.db
+++ b/ECP5/tiledata/EBR_SPINE_UR2/bits.db
@@ -7,6 +7,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/EFB0_PICB0/bits.db b/ECP5/tiledata/EFB0_PICB0/bits.db
index c907694..7c4718b 100644
--- a/ECP5/tiledata/EFB0_PICB0/bits.db
+++ b/ECP5/tiledata/EFB0_PICB0/bits.db
@@ -1,7 +1,7 @@
 # Routing Mux Bits
 .mux JDIA
 INDDA_SIOLOGIC F21B0
-JPADDIA_PIO 
+JPADDIA_PIO -
 
 
 # Non-Routing Configuration
@@ -18,7 +18,7 @@
 INPUT_LVCMOS25 F0B1 F1B1 F7B1 F11B1
 INPUT_LVCMOS33 F0B1 F1B1 F2B1 F7B1 F11B1
 INPUT_LVTTL33 F0B1 F1B1 F2B1 F7B1 F11B1
-NONE 
+NONE -
 OUTPUT_LVCMOS12 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS15 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS18 F5B1 F7B1 F54B0 F55B0
diff --git a/ECP5/tiledata/EFB1_PICB1/bits.db b/ECP5/tiledata/EFB1_PICB1/bits.db
index 3804f51..d5e3425 100644
--- a/ECP5/tiledata/EFB1_PICB1/bits.db
+++ b/ECP5/tiledata/EFB1_PICB1/bits.db
@@ -17,7 +17,7 @@
 INPUT_LVCMOS25 F0B1 F1B1 F7B1 F11B1
 INPUT_LVCMOS33 F0B1 F1B1 F2B1 F7B1 F11B1
 INPUT_LVTTL33 F0B1 F1B1 F2B1 F7B1 F11B1
-NONE 
+NONE -
 OUTPUT_LVCMOS12 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS15 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS18 F5B1 F7B1 F54B0 F55B0
diff --git a/ECP5/tiledata/EFB2_PICB0/bits.db b/ECP5/tiledata/EFB2_PICB0/bits.db
index c907694..7c4718b 100644
--- a/ECP5/tiledata/EFB2_PICB0/bits.db
+++ b/ECP5/tiledata/EFB2_PICB0/bits.db
@@ -1,7 +1,7 @@
 # Routing Mux Bits
 .mux JDIA
 INDDA_SIOLOGIC F21B0
-JPADDIA_PIO 
+JPADDIA_PIO -
 
 
 # Non-Routing Configuration
@@ -18,7 +18,7 @@
 INPUT_LVCMOS25 F0B1 F1B1 F7B1 F11B1
 INPUT_LVCMOS33 F0B1 F1B1 F2B1 F7B1 F11B1
 INPUT_LVTTL33 F0B1 F1B1 F2B1 F7B1 F11B1
-NONE 
+NONE -
 OUTPUT_LVCMOS12 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS15 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS18 F5B1 F7B1 F54B0 F55B0
diff --git a/ECP5/tiledata/EFB3_PICB1/bits.db b/ECP5/tiledata/EFB3_PICB1/bits.db
index 3804f51..d5e3425 100644
--- a/ECP5/tiledata/EFB3_PICB1/bits.db
+++ b/ECP5/tiledata/EFB3_PICB1/bits.db
@@ -17,7 +17,7 @@
 INPUT_LVCMOS25 F0B1 F1B1 F7B1 F11B1
 INPUT_LVCMOS33 F0B1 F1B1 F2B1 F7B1 F11B1
 INPUT_LVTTL33 F0B1 F1B1 F2B1 F7B1 F11B1
-NONE 
+NONE -
 OUTPUT_LVCMOS12 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS15 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS18 F5B1 F7B1 F54B0 F55B0
diff --git a/ECP5/tiledata/MIB_CIB_LR/bits.db b/ECP5/tiledata/MIB_CIB_LR/bits.db
index 210d9b4..485f88d 100644
--- a/ECP5/tiledata/MIB_CIB_LR/bits.db
+++ b/ECP5/tiledata/MIB_CIB_LR/bits.db
@@ -38,36 +38,36 @@
 BIDIR_SSTL18D_II F1B1 F1B4 F2B4 F3B6 F4B9 F5B9
 BIDIR_SSTL18_I F1B4 F2B4
 BIDIR_SSTL18_II F1B4 F2B4
-INPUT_BLVDS25 
-INPUT_HSUL12 
-INPUT_HSUL12D 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS18D 
-INPUT_LVCMOS25 
-INPUT_LVCMOS25D 
-INPUT_LVCMOS33 
-INPUT_LVCMOS33D 
-INPUT_LVDS 
-INPUT_LVPECL33 
-INPUT_LVTTL33 
-INPUT_MLVDS25 
-INPUT_SLVS 
-INPUT_SSTL135D_I 
-INPUT_SSTL135D_II 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15D_I 
-INPUT_SSTL15D_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18D_I 
-INPUT_SSTL18D_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-INPUT_SUBLVDS 
-NONE 
+INPUT_BLVDS25 -
+INPUT_HSUL12 -
+INPUT_HSUL12D -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS18D -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS25D -
+INPUT_LVCMOS33 -
+INPUT_LVCMOS33D -
+INPUT_LVDS -
+INPUT_LVPECL33 -
+INPUT_LVTTL33 -
+INPUT_MLVDS25 -
+INPUT_SLVS -
+INPUT_SSTL135D_I -
+INPUT_SSTL135D_II -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15D_I -
+INPUT_SSTL15D_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18D_I -
+INPUT_SSTL18D_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+INPUT_SUBLVDS -
+NONE -
 OUTPUT_BLVDS25E F1B1 F1B4 F2B4 F3B6 F4B9 F5B9
 OUTPUT_HSUL12 F1B4 F2B4
 OUTPUT_HSUL12D F1B1 F1B4 F2B4 F3B6 F4B9 F5B9
@@ -109,20 +109,20 @@
 BIDIR_SSTL15_II F4B9 F5B9
 BIDIR_SSTL18_I F4B9 F5B9
 BIDIR_SSTL18_II F4B9 F5B9
-INPUT_HSUL12 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-NONE 
+INPUT_HSUL12 -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+NONE -
 OUTPUT_HSUL12 F4B9 F5B9
 OUTPUT_LVCMOS12 F4B9 F5B9
 OUTPUT_LVCMOS15 F4B9 F5B9
diff --git a/ECP5/tiledata/MIB_CIB_LR_A/bits.db b/ECP5/tiledata/MIB_CIB_LR_A/bits.db
index c486cf3..4a7fbaf 100644
--- a/ECP5/tiledata/MIB_CIB_LR_A/bits.db
+++ b/ECP5/tiledata/MIB_CIB_LR_A/bits.db
@@ -38,36 +38,36 @@
 BIDIR_SSTL18D_II F4B9 F5B9 F6B6 F7B4 F8B1 F8B4
 BIDIR_SSTL18_I F7B4 F8B4
 BIDIR_SSTL18_II F7B4 F8B4
-INPUT_BLVDS25 
-INPUT_HSUL12 
-INPUT_HSUL12D 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS18D 
-INPUT_LVCMOS25 
-INPUT_LVCMOS25D 
-INPUT_LVCMOS33 
-INPUT_LVCMOS33D 
-INPUT_LVDS 
-INPUT_LVPECL33 
-INPUT_LVTTL33 
-INPUT_MLVDS25 
-INPUT_SLVS 
-INPUT_SSTL135D_I 
-INPUT_SSTL135D_II 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15D_I 
-INPUT_SSTL15D_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18D_I 
-INPUT_SSTL18D_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-INPUT_SUBLVDS 
-NONE 
+INPUT_BLVDS25 -
+INPUT_HSUL12 -
+INPUT_HSUL12D -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS18D -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS25D -
+INPUT_LVCMOS33 -
+INPUT_LVCMOS33D -
+INPUT_LVDS -
+INPUT_LVPECL33 -
+INPUT_LVTTL33 -
+INPUT_MLVDS25 -
+INPUT_SLVS -
+INPUT_SSTL135D_I -
+INPUT_SSTL135D_II -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15D_I -
+INPUT_SSTL15D_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18D_I -
+INPUT_SSTL18D_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+INPUT_SUBLVDS -
+NONE -
 OUTPUT_BLVDS25E F4B9 F5B9 F6B6 F7B4 F8B1 F8B4
 OUTPUT_HSUL12 F7B4 F8B4
 OUTPUT_HSUL12D F4B9 F5B9 F6B6 F7B4 F8B1 F8B4
@@ -109,20 +109,20 @@
 BIDIR_SSTL15_II F4B9 F5B9
 BIDIR_SSTL18_I F4B9 F5B9
 BIDIR_SSTL18_II F4B9 F5B9
-INPUT_HSUL12 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-NONE 
+INPUT_HSUL12 -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+NONE -
 OUTPUT_HSUL12 F4B9 F5B9
 OUTPUT_LVCMOS12 F4B9 F5B9
 OUTPUT_LVCMOS15 F4B9 F5B9
diff --git a/ECP5/tiledata/MIB_DSP0/bits.db b/ECP5/tiledata/MIB_DSP0/bits.db
index b7f67b2..6a51ccd 100644
--- a/ECP5/tiledata/MIB_DSP0/bits.db
+++ b/ECP5/tiledata/MIB_DSP0/bits.db
@@ -1,74 +1,74 @@
 # Routing Mux Bits
 .mux JMULTA0
-JMUIA0 
+JMUIA0 -
 JPO0 F63B0
 
 .mux JMULTA1
-JMUIA1 
+JMUIA1 -
 JPO1 F63B0
 
 .mux JMULTA10
-JMUIA10 
+JMUIA10 -
 JPO10 F63B0
 
 .mux JMULTA11
-JMUIA11 
+JMUIA11 -
 JPO11 F63B0
 
 .mux JMULTA12
-JMUIA12 
+JMUIA12 -
 JPO12 F63B0
 
 .mux JMULTA13
-JMUIA13 
+JMUIA13 -
 JPO13 F63B0
 
 .mux JMULTA14
-JMUIA14 
+JMUIA14 -
 JPO14 F63B0
 
 .mux JMULTA15
-JMUIA15 
+JMUIA15 -
 JPO15 F63B0
 
 .mux JMULTA16
-JMUIA16 
+JMUIA16 -
 JPO16 F63B0
 
 .mux JMULTA17
-JMUIA17 
+JMUIA17 -
 JPO17 F63B0
 
 .mux JMULTA2
-JMUIA2 
+JMUIA2 -
 JPO2 F63B0
 
 .mux JMULTA3
-JMUIA3 
+JMUIA3 -
 JPO3 F63B0
 
 .mux JMULTA4
-JMUIA4 
+JMUIA4 -
 JPO4 F63B0
 
 .mux JMULTA5
-JMUIA5 
+JMUIA5 -
 JPO5 F63B0
 
 .mux JMULTA6
-JMUIA6 
+JMUIA6 -
 JPO6 F63B0
 
 .mux JMULTA7
-JMUIA7 
+JMUIA7 -
 JPO7 F63B0
 
 .mux JMULTA8
-JMUIA8 
+JMUIA8 -
 JPO8 F63B0
 
 .mux JMULTA9
-JMUIA9 
+JMUIA9 -
 JPO9 F63B0
 
 
diff --git a/ECP5/tiledata/MIB_EBR7/bits.db b/ECP5/tiledata/MIB_EBR7/bits.db
index e7c449b..7762fa3 100644
--- a/ECP5/tiledata/MIB_EBR7/bits.db
+++ b/ECP5/tiledata/MIB_EBR7/bits.db
@@ -12,6 +12,11 @@
 !F34B0
 
 .config EBR3.WID 000011111
+-
+-
+-
+-
+-
 F105B0
 F104B0
 F92B0
diff --git a/ECP5/tiledata/MIB_EBR8/bits.db b/ECP5/tiledata/MIB_EBR8/bits.db
index 5b78b09..9aecff7 100644
--- a/ECP5/tiledata/MIB_EBR8/bits.db
+++ b/ECP5/tiledata/MIB_EBR8/bits.db
@@ -7,6 +7,10 @@
 F4B0
 F2B0
 F1B0
+-
+-
+-
+-
 
 .config_enum EBR3.GSR ENABLED
 DISABLED F41B0
diff --git a/ECP5/tiledata/PICB0/bits.db b/ECP5/tiledata/PICB0/bits.db
index c907694..7c4718b 100644
--- a/ECP5/tiledata/PICB0/bits.db
+++ b/ECP5/tiledata/PICB0/bits.db
@@ -1,7 +1,7 @@
 # Routing Mux Bits
 .mux JDIA
 INDDA_SIOLOGIC F21B0
-JPADDIA_PIO 
+JPADDIA_PIO -
 
 
 # Non-Routing Configuration
@@ -18,7 +18,7 @@
 INPUT_LVCMOS25 F0B1 F1B1 F7B1 F11B1
 INPUT_LVCMOS33 F0B1 F1B1 F2B1 F7B1 F11B1
 INPUT_LVTTL33 F0B1 F1B1 F2B1 F7B1 F11B1
-NONE 
+NONE -
 OUTPUT_LVCMOS12 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS15 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS18 F5B1 F7B1 F54B0 F55B0
diff --git a/ECP5/tiledata/PICB1/bits.db b/ECP5/tiledata/PICB1/bits.db
index 3804f51..d5e3425 100644
--- a/ECP5/tiledata/PICB1/bits.db
+++ b/ECP5/tiledata/PICB1/bits.db
@@ -17,7 +17,7 @@
 INPUT_LVCMOS25 F0B1 F1B1 F7B1 F11B1
 INPUT_LVCMOS33 F0B1 F1B1 F2B1 F7B1 F11B1
 INPUT_LVTTL33 F0B1 F1B1 F2B1 F7B1 F11B1
-NONE 
+NONE -
 OUTPUT_LVCMOS12 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS15 F5B1 F7B1 F54B0 F55B0
 OUTPUT_LVCMOS18 F5B1 F7B1 F54B0 F55B0
diff --git a/ECP5/tiledata/PICL0/bits.db b/ECP5/tiledata/PICL0/bits.db
index d2481f4..d1480e0 100644
--- a/ECP5/tiledata/PICL0/bits.db
+++ b/ECP5/tiledata/PICL0/bits.db
@@ -1,19 +1,19 @@
 # Routing Mux Bits
 .mux ECLKA
-BNK_ECLK0 
+BNK_ECLK0 -
 BNK_ECLK1 F4B1
 
 .mux ECLKB
-BNK_ECLK0 
+BNK_ECLK0 -
 BNK_ECLK1 F6B6
 
 .mux JDIA
 INDDA_IOLOGIC F8B1
-JPADDIA_PIO 
+JPADDIA_PIO -
 
 .mux JDIB
 INDDB_IOLOGIC F0B7
-JPADDIB_PIO 
+JPADDIB_PIO -
 
 
 # Non-Routing Configuration
@@ -44,36 +44,36 @@
 BIDIR_SSTL18D_II F1B1 F1B4 F2B4 F3B6 F3B9 F4B9
 BIDIR_SSTL18_I F1B4 F2B4
 BIDIR_SSTL18_II F1B4 F2B4
-INPUT_BLVDS25 
-INPUT_HSUL12 
-INPUT_HSUL12D 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS18D 
-INPUT_LVCMOS25 
-INPUT_LVCMOS25D 
-INPUT_LVCMOS33 
-INPUT_LVCMOS33D 
-INPUT_LVDS 
-INPUT_LVPECL33 
-INPUT_LVTTL33 
-INPUT_MLVDS25 
-INPUT_SLVS 
-INPUT_SSTL135D_I 
-INPUT_SSTL135D_II 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15D_I 
-INPUT_SSTL15D_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18D_I 
-INPUT_SSTL18D_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-INPUT_SUBLVDS 
-NONE 
+INPUT_BLVDS25 -
+INPUT_HSUL12 -
+INPUT_HSUL12D -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS18D -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS25D -
+INPUT_LVCMOS33 -
+INPUT_LVCMOS33D -
+INPUT_LVDS -
+INPUT_LVPECL33 -
+INPUT_LVTTL33 -
+INPUT_MLVDS25 -
+INPUT_SLVS -
+INPUT_SSTL135D_I -
+INPUT_SSTL135D_II -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15D_I -
+INPUT_SSTL15D_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18D_I -
+INPUT_SSTL18D_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+INPUT_SUBLVDS -
+NONE -
 OUTPUT_BLVDS25E F1B1 F1B4 F2B4 F3B6 F3B9 F4B9
 OUTPUT_HSUL12 F1B4 F2B4
 OUTPUT_HSUL12D F1B1 F1B4 F2B4 F3B6 F3B9 F4B9
@@ -117,20 +117,20 @@
 BIDIR_SSTL15_II F3B9 F4B9
 BIDIR_SSTL18_I F3B9 F4B9
 BIDIR_SSTL18_II F3B9 F4B9
-INPUT_HSUL12 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-NONE 
+INPUT_HSUL12 -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+NONE -
 OUTPUT_HSUL12 F3B9 F4B9
 OUTPUT_LVCMOS12 F3B9 F4B9
 OUTPUT_LVCMOS15 F3B9 F4B9
diff --git a/ECP5/tiledata/PICL0_DQS2/bits.db b/ECP5/tiledata/PICL0_DQS2/bits.db
index d2481f4..d1480e0 100644
--- a/ECP5/tiledata/PICL0_DQS2/bits.db
+++ b/ECP5/tiledata/PICL0_DQS2/bits.db
@@ -1,19 +1,19 @@
 # Routing Mux Bits
 .mux ECLKA
-BNK_ECLK0 
+BNK_ECLK0 -
 BNK_ECLK1 F4B1
 
 .mux ECLKB
-BNK_ECLK0 
+BNK_ECLK0 -
 BNK_ECLK1 F6B6
 
 .mux JDIA
 INDDA_IOLOGIC F8B1
-JPADDIA_PIO 
+JPADDIA_PIO -
 
 .mux JDIB
 INDDB_IOLOGIC F0B7
-JPADDIB_PIO 
+JPADDIB_PIO -
 
 
 # Non-Routing Configuration
@@ -44,36 +44,36 @@
 BIDIR_SSTL18D_II F1B1 F1B4 F2B4 F3B6 F3B9 F4B9
 BIDIR_SSTL18_I F1B4 F2B4
 BIDIR_SSTL18_II F1B4 F2B4
-INPUT_BLVDS25 
-INPUT_HSUL12 
-INPUT_HSUL12D 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS18D 
-INPUT_LVCMOS25 
-INPUT_LVCMOS25D 
-INPUT_LVCMOS33 
-INPUT_LVCMOS33D 
-INPUT_LVDS 
-INPUT_LVPECL33 
-INPUT_LVTTL33 
-INPUT_MLVDS25 
-INPUT_SLVS 
-INPUT_SSTL135D_I 
-INPUT_SSTL135D_II 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15D_I 
-INPUT_SSTL15D_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18D_I 
-INPUT_SSTL18D_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-INPUT_SUBLVDS 
-NONE 
+INPUT_BLVDS25 -
+INPUT_HSUL12 -
+INPUT_HSUL12D -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS18D -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS25D -
+INPUT_LVCMOS33 -
+INPUT_LVCMOS33D -
+INPUT_LVDS -
+INPUT_LVPECL33 -
+INPUT_LVTTL33 -
+INPUT_MLVDS25 -
+INPUT_SLVS -
+INPUT_SSTL135D_I -
+INPUT_SSTL135D_II -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15D_I -
+INPUT_SSTL15D_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18D_I -
+INPUT_SSTL18D_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+INPUT_SUBLVDS -
+NONE -
 OUTPUT_BLVDS25E F1B1 F1B4 F2B4 F3B6 F3B9 F4B9
 OUTPUT_HSUL12 F1B4 F2B4
 OUTPUT_HSUL12D F1B1 F1B4 F2B4 F3B6 F3B9 F4B9
@@ -117,20 +117,20 @@
 BIDIR_SSTL15_II F3B9 F4B9
 BIDIR_SSTL18_I F3B9 F4B9
 BIDIR_SSTL18_II F3B9 F4B9
-INPUT_HSUL12 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-NONE 
+INPUT_HSUL12 -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+NONE -
 OUTPUT_HSUL12 F3B9 F4B9
 OUTPUT_LVCMOS12 F3B9 F4B9
 OUTPUT_LVCMOS15 F3B9 F4B9
diff --git a/ECP5/tiledata/PICL1/bits.db b/ECP5/tiledata/PICL1/bits.db
index 709fb7b..08f8dbb 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
diff --git a/ECP5/tiledata/PICL1_DQS0/bits.db b/ECP5/tiledata/PICL1_DQS0/bits.db
index bed34cf..08f8dbb 100644
--- a/ECP5/tiledata/PICL1_DQS0/bits.db
+++ b/ECP5/tiledata/PICL1_DQS0/bits.db
@@ -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
diff --git a/ECP5/tiledata/PICL1_DQS3/bits.db b/ECP5/tiledata/PICL1_DQS3/bits.db
index f134d0c..08f8dbb 100644
--- a/ECP5/tiledata/PICL1_DQS3/bits.db
+++ b/ECP5/tiledata/PICL1_DQS3/bits.db
@@ -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
diff --git a/ECP5/tiledata/PICL2/bits.db b/ECP5/tiledata/PICL2/bits.db
index 210d9b4..485f88d 100644
--- a/ECP5/tiledata/PICL2/bits.db
+++ b/ECP5/tiledata/PICL2/bits.db
@@ -38,36 +38,36 @@
 BIDIR_SSTL18D_II F1B1 F1B4 F2B4 F3B6 F4B9 F5B9
 BIDIR_SSTL18_I F1B4 F2B4
 BIDIR_SSTL18_II F1B4 F2B4
-INPUT_BLVDS25 
-INPUT_HSUL12 
-INPUT_HSUL12D 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS18D 
-INPUT_LVCMOS25 
-INPUT_LVCMOS25D 
-INPUT_LVCMOS33 
-INPUT_LVCMOS33D 
-INPUT_LVDS 
-INPUT_LVPECL33 
-INPUT_LVTTL33 
-INPUT_MLVDS25 
-INPUT_SLVS 
-INPUT_SSTL135D_I 
-INPUT_SSTL135D_II 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15D_I 
-INPUT_SSTL15D_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18D_I 
-INPUT_SSTL18D_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-INPUT_SUBLVDS 
-NONE 
+INPUT_BLVDS25 -
+INPUT_HSUL12 -
+INPUT_HSUL12D -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS18D -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS25D -
+INPUT_LVCMOS33 -
+INPUT_LVCMOS33D -
+INPUT_LVDS -
+INPUT_LVPECL33 -
+INPUT_LVTTL33 -
+INPUT_MLVDS25 -
+INPUT_SLVS -
+INPUT_SSTL135D_I -
+INPUT_SSTL135D_II -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15D_I -
+INPUT_SSTL15D_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18D_I -
+INPUT_SSTL18D_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+INPUT_SUBLVDS -
+NONE -
 OUTPUT_BLVDS25E F1B1 F1B4 F2B4 F3B6 F4B9 F5B9
 OUTPUT_HSUL12 F1B4 F2B4
 OUTPUT_HSUL12D F1B1 F1B4 F2B4 F3B6 F4B9 F5B9
@@ -109,20 +109,20 @@
 BIDIR_SSTL15_II F4B9 F5B9
 BIDIR_SSTL18_I F4B9 F5B9
 BIDIR_SSTL18_II F4B9 F5B9
-INPUT_HSUL12 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-NONE 
+INPUT_HSUL12 -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+NONE -
 OUTPUT_HSUL12 F4B9 F5B9
 OUTPUT_LVCMOS12 F4B9 F5B9
 OUTPUT_LVCMOS15 F4B9 F5B9
diff --git a/ECP5/tiledata/PICL2_DQS1/bits.db b/ECP5/tiledata/PICL2_DQS1/bits.db
index 210d9b4..485f88d 100644
--- a/ECP5/tiledata/PICL2_DQS1/bits.db
+++ b/ECP5/tiledata/PICL2_DQS1/bits.db
@@ -38,36 +38,36 @@
 BIDIR_SSTL18D_II F1B1 F1B4 F2B4 F3B6 F4B9 F5B9
 BIDIR_SSTL18_I F1B4 F2B4
 BIDIR_SSTL18_II F1B4 F2B4
-INPUT_BLVDS25 
-INPUT_HSUL12 
-INPUT_HSUL12D 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS18D 
-INPUT_LVCMOS25 
-INPUT_LVCMOS25D 
-INPUT_LVCMOS33 
-INPUT_LVCMOS33D 
-INPUT_LVDS 
-INPUT_LVPECL33 
-INPUT_LVTTL33 
-INPUT_MLVDS25 
-INPUT_SLVS 
-INPUT_SSTL135D_I 
-INPUT_SSTL135D_II 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15D_I 
-INPUT_SSTL15D_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18D_I 
-INPUT_SSTL18D_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-INPUT_SUBLVDS 
-NONE 
+INPUT_BLVDS25 -
+INPUT_HSUL12 -
+INPUT_HSUL12D -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS18D -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS25D -
+INPUT_LVCMOS33 -
+INPUT_LVCMOS33D -
+INPUT_LVDS -
+INPUT_LVPECL33 -
+INPUT_LVTTL33 -
+INPUT_MLVDS25 -
+INPUT_SLVS -
+INPUT_SSTL135D_I -
+INPUT_SSTL135D_II -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15D_I -
+INPUT_SSTL15D_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18D_I -
+INPUT_SSTL18D_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+INPUT_SUBLVDS -
+NONE -
 OUTPUT_BLVDS25E F1B1 F1B4 F2B4 F3B6 F4B9 F5B9
 OUTPUT_HSUL12 F1B4 F2B4
 OUTPUT_HSUL12D F1B1 F1B4 F2B4 F3B6 F4B9 F5B9
@@ -109,20 +109,20 @@
 BIDIR_SSTL15_II F4B9 F5B9
 BIDIR_SSTL18_I F4B9 F5B9
 BIDIR_SSTL18_II F4B9 F5B9
-INPUT_HSUL12 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-NONE 
+INPUT_HSUL12 -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+NONE -
 OUTPUT_HSUL12 F4B9 F5B9
 OUTPUT_LVCMOS12 F4B9 F5B9
 OUTPUT_LVCMOS15 F4B9 F5B9
diff --git a/ECP5/tiledata/PICR0/bits.db b/ECP5/tiledata/PICR0/bits.db
index 20b6ef1..c610472 100644
--- a/ECP5/tiledata/PICR0/bits.db
+++ b/ECP5/tiledata/PICR0/bits.db
@@ -1,19 +1,19 @@
 # Routing Mux Bits
 .mux ECLKA
-BNK_ECLK0 
+BNK_ECLK0 -
 BNK_ECLK1 F5B1
 
 .mux ECLKB
-BNK_ECLK0 
+BNK_ECLK0 -
 BNK_ECLK1 F3B6
 
 .mux JDIA
 INDDA_IOLOGIC F1B1
-JPADDIA_PIO 
+JPADDIA_PIO -
 
 .mux JDIB
 INDDB_IOLOGIC F9B7
-JPADDIB_PIO 
+JPADDIB_PIO -
 
 
 # Non-Routing Configuration
@@ -44,36 +44,36 @@
 BIDIR_SSTL18D_II F5B9 F6B6 F6B9 F7B4 F8B1 F8B4
 BIDIR_SSTL18_I F7B4 F8B4
 BIDIR_SSTL18_II F7B4 F8B4
-INPUT_BLVDS25 
-INPUT_HSUL12 
-INPUT_HSUL12D 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS18D 
-INPUT_LVCMOS25 
-INPUT_LVCMOS25D 
-INPUT_LVCMOS33 
-INPUT_LVCMOS33D 
-INPUT_LVDS 
-INPUT_LVPECL33 
-INPUT_LVTTL33 
-INPUT_MLVDS25 
-INPUT_SLVS 
-INPUT_SSTL135D_I 
-INPUT_SSTL135D_II 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15D_I 
-INPUT_SSTL15D_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18D_I 
-INPUT_SSTL18D_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-INPUT_SUBLVDS 
-NONE 
+INPUT_BLVDS25 -
+INPUT_HSUL12 -
+INPUT_HSUL12D -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS18D -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS25D -
+INPUT_LVCMOS33 -
+INPUT_LVCMOS33D -
+INPUT_LVDS -
+INPUT_LVPECL33 -
+INPUT_LVTTL33 -
+INPUT_MLVDS25 -
+INPUT_SLVS -
+INPUT_SSTL135D_I -
+INPUT_SSTL135D_II -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15D_I -
+INPUT_SSTL15D_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18D_I -
+INPUT_SSTL18D_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+INPUT_SUBLVDS -
+NONE -
 OUTPUT_BLVDS25E F5B9 F6B6 F6B9 F7B4 F8B1 F8B4
 OUTPUT_HSUL12 F7B4 F8B4
 OUTPUT_HSUL12D F5B9 F6B6 F6B9 F7B4 F8B1 F8B4
@@ -117,20 +117,20 @@
 BIDIR_SSTL15_II F5B9 F6B9
 BIDIR_SSTL18_I F5B9 F6B9
 BIDIR_SSTL18_II F5B9 F6B9
-INPUT_HSUL12 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-NONE 
+INPUT_HSUL12 -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+NONE -
 OUTPUT_HSUL12 F5B9 F6B9
 OUTPUT_LVCMOS12 F5B9 F6B9
 OUTPUT_LVCMOS15 F5B9 F6B9
diff --git a/ECP5/tiledata/PICR0_DQS2/bits.db b/ECP5/tiledata/PICR0_DQS2/bits.db
index 20b6ef1..c610472 100644
--- a/ECP5/tiledata/PICR0_DQS2/bits.db
+++ b/ECP5/tiledata/PICR0_DQS2/bits.db
@@ -1,19 +1,19 @@
 # Routing Mux Bits
 .mux ECLKA
-BNK_ECLK0 
+BNK_ECLK0 -
 BNK_ECLK1 F5B1
 
 .mux ECLKB
-BNK_ECLK0 
+BNK_ECLK0 -
 BNK_ECLK1 F3B6
 
 .mux JDIA
 INDDA_IOLOGIC F1B1
-JPADDIA_PIO 
+JPADDIA_PIO -
 
 .mux JDIB
 INDDB_IOLOGIC F9B7
-JPADDIB_PIO 
+JPADDIB_PIO -
 
 
 # Non-Routing Configuration
@@ -44,36 +44,36 @@
 BIDIR_SSTL18D_II F5B9 F6B6 F6B9 F7B4 F8B1 F8B4
 BIDIR_SSTL18_I F7B4 F8B4
 BIDIR_SSTL18_II F7B4 F8B4
-INPUT_BLVDS25 
-INPUT_HSUL12 
-INPUT_HSUL12D 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS18D 
-INPUT_LVCMOS25 
-INPUT_LVCMOS25D 
-INPUT_LVCMOS33 
-INPUT_LVCMOS33D 
-INPUT_LVDS 
-INPUT_LVPECL33 
-INPUT_LVTTL33 
-INPUT_MLVDS25 
-INPUT_SLVS 
-INPUT_SSTL135D_I 
-INPUT_SSTL135D_II 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15D_I 
-INPUT_SSTL15D_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18D_I 
-INPUT_SSTL18D_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-INPUT_SUBLVDS 
-NONE 
+INPUT_BLVDS25 -
+INPUT_HSUL12 -
+INPUT_HSUL12D -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS18D -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS25D -
+INPUT_LVCMOS33 -
+INPUT_LVCMOS33D -
+INPUT_LVDS -
+INPUT_LVPECL33 -
+INPUT_LVTTL33 -
+INPUT_MLVDS25 -
+INPUT_SLVS -
+INPUT_SSTL135D_I -
+INPUT_SSTL135D_II -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15D_I -
+INPUT_SSTL15D_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18D_I -
+INPUT_SSTL18D_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+INPUT_SUBLVDS -
+NONE -
 OUTPUT_BLVDS25E F5B9 F6B6 F6B9 F7B4 F8B1 F8B4
 OUTPUT_HSUL12 F7B4 F8B4
 OUTPUT_HSUL12D F5B9 F6B6 F6B9 F7B4 F8B1 F8B4
@@ -117,20 +117,20 @@
 BIDIR_SSTL15_II F5B9 F6B9
 BIDIR_SSTL18_I F5B9 F6B9
 BIDIR_SSTL18_II F5B9 F6B9
-INPUT_HSUL12 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-NONE 
+INPUT_HSUL12 -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+NONE -
 OUTPUT_HSUL12 F5B9 F6B9
 OUTPUT_LVCMOS12 F5B9 F6B9
 OUTPUT_LVCMOS15 F5B9 F6B9
diff --git a/ECP5/tiledata/PICR1/bits.db b/ECP5/tiledata/PICR1/bits.db
index ca91418..da41f39 100644
--- a/ECP5/tiledata/PICR1/bits.db
+++ b/ECP5/tiledata/PICR1/bits.db
@@ -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
diff --git a/ECP5/tiledata/PICR1_DQS0/bits.db b/ECP5/tiledata/PICR1_DQS0/bits.db
index 97bf59f..da41f39 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
diff --git a/ECP5/tiledata/PICR1_DQS3/bits.db b/ECP5/tiledata/PICR1_DQS3/bits.db
index 97bf59f..da41f39 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
diff --git a/ECP5/tiledata/PICR2/bits.db b/ECP5/tiledata/PICR2/bits.db
index c486cf3..4a7fbaf 100644
--- a/ECP5/tiledata/PICR2/bits.db
+++ b/ECP5/tiledata/PICR2/bits.db
@@ -38,36 +38,36 @@
 BIDIR_SSTL18D_II F4B9 F5B9 F6B6 F7B4 F8B1 F8B4
 BIDIR_SSTL18_I F7B4 F8B4
 BIDIR_SSTL18_II F7B4 F8B4
-INPUT_BLVDS25 
-INPUT_HSUL12 
-INPUT_HSUL12D 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS18D 
-INPUT_LVCMOS25 
-INPUT_LVCMOS25D 
-INPUT_LVCMOS33 
-INPUT_LVCMOS33D 
-INPUT_LVDS 
-INPUT_LVPECL33 
-INPUT_LVTTL33 
-INPUT_MLVDS25 
-INPUT_SLVS 
-INPUT_SSTL135D_I 
-INPUT_SSTL135D_II 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15D_I 
-INPUT_SSTL15D_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18D_I 
-INPUT_SSTL18D_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-INPUT_SUBLVDS 
-NONE 
+INPUT_BLVDS25 -
+INPUT_HSUL12 -
+INPUT_HSUL12D -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS18D -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS25D -
+INPUT_LVCMOS33 -
+INPUT_LVCMOS33D -
+INPUT_LVDS -
+INPUT_LVPECL33 -
+INPUT_LVTTL33 -
+INPUT_MLVDS25 -
+INPUT_SLVS -
+INPUT_SSTL135D_I -
+INPUT_SSTL135D_II -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15D_I -
+INPUT_SSTL15D_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18D_I -
+INPUT_SSTL18D_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+INPUT_SUBLVDS -
+NONE -
 OUTPUT_BLVDS25E F4B9 F5B9 F6B6 F7B4 F8B1 F8B4
 OUTPUT_HSUL12 F7B4 F8B4
 OUTPUT_HSUL12D F4B9 F5B9 F6B6 F7B4 F8B1 F8B4
@@ -109,20 +109,20 @@
 BIDIR_SSTL15_II F4B9 F5B9
 BIDIR_SSTL18_I F4B9 F5B9
 BIDIR_SSTL18_II F4B9 F5B9
-INPUT_HSUL12 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-NONE 
+INPUT_HSUL12 -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+NONE -
 OUTPUT_HSUL12 F4B9 F5B9
 OUTPUT_LVCMOS12 F4B9 F5B9
 OUTPUT_LVCMOS15 F4B9 F5B9
diff --git a/ECP5/tiledata/PICR2_DQS1/bits.db b/ECP5/tiledata/PICR2_DQS1/bits.db
index c486cf3..4a7fbaf 100644
--- a/ECP5/tiledata/PICR2_DQS1/bits.db
+++ b/ECP5/tiledata/PICR2_DQS1/bits.db
@@ -38,36 +38,36 @@
 BIDIR_SSTL18D_II F4B9 F5B9 F6B6 F7B4 F8B1 F8B4
 BIDIR_SSTL18_I F7B4 F8B4
 BIDIR_SSTL18_II F7B4 F8B4
-INPUT_BLVDS25 
-INPUT_HSUL12 
-INPUT_HSUL12D 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS18D 
-INPUT_LVCMOS25 
-INPUT_LVCMOS25D 
-INPUT_LVCMOS33 
-INPUT_LVCMOS33D 
-INPUT_LVDS 
-INPUT_LVPECL33 
-INPUT_LVTTL33 
-INPUT_MLVDS25 
-INPUT_SLVS 
-INPUT_SSTL135D_I 
-INPUT_SSTL135D_II 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15D_I 
-INPUT_SSTL15D_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18D_I 
-INPUT_SSTL18D_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-INPUT_SUBLVDS 
-NONE 
+INPUT_BLVDS25 -
+INPUT_HSUL12 -
+INPUT_HSUL12D -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS18D -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS25D -
+INPUT_LVCMOS33 -
+INPUT_LVCMOS33D -
+INPUT_LVDS -
+INPUT_LVPECL33 -
+INPUT_LVTTL33 -
+INPUT_MLVDS25 -
+INPUT_SLVS -
+INPUT_SSTL135D_I -
+INPUT_SSTL135D_II -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15D_I -
+INPUT_SSTL15D_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18D_I -
+INPUT_SSTL18D_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+INPUT_SUBLVDS -
+NONE -
 OUTPUT_BLVDS25E F4B9 F5B9 F6B6 F7B4 F8B1 F8B4
 OUTPUT_HSUL12 F7B4 F8B4
 OUTPUT_HSUL12D F4B9 F5B9 F6B6 F7B4 F8B1 F8B4
@@ -109,20 +109,20 @@
 BIDIR_SSTL15_II F4B9 F5B9
 BIDIR_SSTL18_I F4B9 F5B9
 BIDIR_SSTL18_II F4B9 F5B9
-INPUT_HSUL12 
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-INPUT_SSTL135_I 
-INPUT_SSTL135_II 
-INPUT_SSTL15_I 
-INPUT_SSTL15_II 
-INPUT_SSTL18_I 
-INPUT_SSTL18_II 
-NONE 
+INPUT_HSUL12 -
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+INPUT_SSTL135_I -
+INPUT_SSTL135_II -
+INPUT_SSTL15_I -
+INPUT_SSTL15_II -
+INPUT_SSTL18_I -
+INPUT_SSTL18_II -
+NONE -
 OUTPUT_HSUL12 F4B9 F5B9
 OUTPUT_LVCMOS12 F4B9 F5B9
 OUTPUT_LVCMOS15 F4B9 F5B9
diff --git a/ECP5/tiledata/PICT0/bits.db b/ECP5/tiledata/PICT0/bits.db
index 82dbaf7..f5ec918 100644
--- a/ECP5/tiledata/PICT0/bits.db
+++ b/ECP5/tiledata/PICT0/bits.db
@@ -11,13 +11,13 @@
 BIDIR_LVCMOS25 F54B0 F55B0
 BIDIR_LVCMOS33 F54B0 F55B0
 BIDIR_LVTTL33 F54B0 F55B0
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-NONE 
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+NONE -
 OUTPUT_LVCMOS12 F54B0 F55B0
 OUTPUT_LVCMOS15 F54B0 F55B0
 OUTPUT_LVCMOS18 F54B0 F55B0
diff --git a/ECP5/tiledata/PICT1/bits.db b/ECP5/tiledata/PICT1/bits.db
index f491d57..a9d03e4 100644
--- a/ECP5/tiledata/PICT1/bits.db
+++ b/ECP5/tiledata/PICT1/bits.db
@@ -11,13 +11,13 @@
 BIDIR_LVCMOS25 F54B0 F55B0
 BIDIR_LVCMOS33 F54B0 F55B0
 BIDIR_LVTTL33 F54B0 F55B0
-INPUT_LVCMOS12 
-INPUT_LVCMOS15 
-INPUT_LVCMOS18 
-INPUT_LVCMOS25 
-INPUT_LVCMOS33 
-INPUT_LVTTL33 
-NONE 
+INPUT_LVCMOS12 -
+INPUT_LVCMOS15 -
+INPUT_LVCMOS18 -
+INPUT_LVCMOS25 -
+INPUT_LVCMOS33 -
+INPUT_LVTTL33 -
+NONE -
 OUTPUT_LVCMOS12 F54B0 F55B0
 OUTPUT_LVCMOS15 F54B0 F55B0
 OUTPUT_LVCMOS18 F54B0 F55B0
diff --git a/ECP5/tiledata/PLC2/bits.db b/ECP5/tiledata/PLC2/bits.db
index 19c121a..d7e45e3 100644
--- a/ECP5/tiledata/PLC2/bits.db
+++ b/ECP5/tiledata/PLC2/bits.db
@@ -1256,35 +1256,35 @@
 W3_H06E0303 F101B2 F103B3
 
 .mux F0
-F0_SLICE 
+F0_SLICE -
 F5A_SLICE F8B10
 
 .mux F1
-F1_SLICE 
+F1_SLICE -
 FXA_SLICE F8B11
 
 .mux F2
-F2_SLICE 
+F2_SLICE -
 F5B_SLICE F43B10
 
 .mux F3
-F3_SLICE 
+F3_SLICE -
 FXB_SLICE F43B11
 
 .mux F4
-F4_SLICE 
+F4_SLICE -
 F5C_SLICE F62B10
 
 .mux F5
-F5_SLICE 
+F5_SLICE -
 FXC_SLICE F62B11
 
 .mux F6
 F5D_SLICE F97B10
-F6_SLICE 
+F6_SLICE -
 
 .mux F7
-F7_SLICE 
+F7_SLICE -
 FXD_SLICE F97B11
 
 .mux H00L0000
@@ -1308,7 +1308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -1331,12 +1331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 F4 F58B5 F61B4
 F6 F58B5 F64B4
 H02E0401 F58B4 F60B4
@@ -1359,7 +1359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 F5 F58B3 F61B2
 F7 F58B3 F64B2
 H02E0501 F58B2 F60B2
@@ -2132,7 +2132,7 @@
 Q6 F63B5 F66B4
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2155,7 +2155,7 @@
 Q7 F63B3 F66B2
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2174,7 +2174,7 @@
 H02W0201 F63B9 F66B9
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 Q0 F60B9 F66B8
 Q2 F63B9 F66B8
 S1_V02N0401 F61B9 F65B9
@@ -2197,7 +2197,7 @@
 H02W0301 F63B7 F66B7
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 Q1 F60B7 F66B6
 Q3 F63B7 F66B6
 S1_V02N0501 F61B7 F65B7
@@ -2669,27 +2669,27 @@
 
 .config_enum SLICEA.A0MUX A0
 1 F2B3 F4B2
-A0 
+A0 -
 
 .config_enum SLICEA.A1MUX A1
 1 F5B3 F7B3
-A1 
+A1 -
 
 .config_enum SLICEA.B0MUX B0
 1 F2B7 F4B6
-B0 
+B0 -
 
 .config_enum SLICEA.B1MUX B1
 1 F5B7 F7B7
-B1 
+B1 -
 
 .config_enum SLICEA.C0MUX C0
 1 F2B5 F4B4
-C0 
+C0 -
 
 .config_enum SLICEA.C1MUX C1
 1 F5B5 F7B5
-C1 
+C1 -
 
 .config_enum SLICEA.CCU2.INJECT1_0 YES
 NO F8B10
@@ -2702,16 +2702,16 @@
 .config_enum SLICEA.CEMUX CE
 0 F5B10 F48B1 F54B0
 1 F48B1 F54B0
-CE 
+CE -
 INV F5B10
 
 .config_enum SLICEA.D0MUX D0
 1 F2B9 F4B8
-D0 
+D0 -
 
 .config_enum SLICEA.D1MUX D1
 1 F5B9 F7B9
-D1 
+D1 -
 
 .config_enum SLICEA.GSR ENABLED
 DISABLED F4B10
@@ -2719,16 +2719,16 @@
 
 .config_enum SLICEA.M0MUX M0
 1 F2B1 F4B0
-M0 
+M0 -
 
 .config_enum SLICEA.M1MUX M1
 1 F8B1 F10B0
-M1 
+M1 -
 
 .config_enum SLICEA.MODE LOGIC
 CCU2 F9B10 F9B11
 DPRAM F50B11
-LOGIC 
+LOGIC -
 
 .config_enum SLICEA.REG0.REGSET SET
 RESET F2B11
@@ -2750,31 +2750,31 @@
 0 F29B1 F32B1 F55B11
 1 F29B1 F32B1
 INV F55B11
-WRE 
+WRE -
 
 .config_enum SLICEB.A0MUX A0
 1 F21B3 F23B3
-A0 
+A0 -
 
 .config_enum SLICEB.A1MUX A1
 1 F24B2 F26B3
-A1 
+A1 -
 
 .config_enum SLICEB.B0MUX B0
 1 F21B7 F23B7
-B0 
+B0 -
 
 .config_enum SLICEB.B1MUX B1
 1 F24B6 F26B7
-B1 
+B1 -
 
 .config_enum SLICEB.C0MUX C0
 1 F21B5 F23B5
-C0 
+C0 -
 
 .config_enum SLICEB.C1MUX C1
 1 F24B4 F26B5
-C1 
+C1 -
 
 .config_enum SLICEB.CCU2.INJECT1_0 YES
 NO F43B10
@@ -2787,16 +2787,16 @@
 .config_enum SLICEB.CEMUX CE
 0 F46B10 F53B1 F56B1
 1 F53B1 F56B1
-CE 
+CE -
 INV F46B10
 
 .config_enum SLICEB.D0MUX D0
 1 F21B9 F23B9
-D0 
+D0 -
 
 .config_enum SLICEB.D1MUX D1
 1 F24B8 F26B9
-D1 
+D1 -
 
 .config_enum SLICEB.GSR ENABLED
 DISABLED F47B10
@@ -2804,16 +2804,16 @@
 
 .config_enum SLICEB.M0MUX M0
 1 F3B0 F5B1
-M0 
+M0 -
 
 .config_enum SLICEB.M1MUX M1
 1 F22B1 F24B0
-M1 
+M1 -
 
 .config_enum SLICEB.MODE LOGIC
 CCU2 F42B10 F42B11
 DPRAM F50B11
-LOGIC 
+LOGIC -
 
 .config_enum SLICEB.REG0.REGSET SET
 RESET F49B11
@@ -2833,27 +2833,27 @@
 
 .config_enum SLICEC.A0MUX A0
 1 F31B3 F33B2
-A0 
+A0 -
 
 .config_enum SLICEC.A1MUX A1
 1 F34B3 F36B3
-A1 
+A1 -
 
 .config_enum SLICEC.B0MUX B0
 1 F31B7 F33B6
-B0 
+B0 -
 
 .config_enum SLICEC.B1MUX B1
 1 F34B7 F36B7
-B1 
+B1 -
 
 .config_enum SLICEC.C0MUX C0
 1 F31B5 F33B4
-C0 
+C0 -
 
 .config_enum SLICEC.C1MUX C1
 1 F34B5 F36B5
-C1 
+C1 -
 
 .config_enum SLICEC.CCU2.INJECT1_0 YES
 NO F62B10
@@ -2866,16 +2866,16 @@
 .config_enum SLICEC.CEMUX CE
 0 F59B0 F59B10 F65B1
 1 F59B0 F65B1
-CE 
+CE -
 INV F59B10
 
 .config_enum SLICEC.D0MUX D0
 1 F31B9 F33B8
-D0 
+D0 -
 
 .config_enum SLICEC.D1MUX D1
 1 F34B9 F36B9
-D1 
+D1 -
 
 .config_enum SLICEC.GSR ENABLED
 DISABLED F58B10
@@ -2883,15 +2883,15 @@
 
 .config_enum SLICEC.M0MUX M0
 1 F16B1 F18B0
-M0 
+M0 -
 
 .config_enum SLICEC.M1MUX M1
 1 F9B0 F11B1
-M1 
+M1 -
 
 .config_enum SLICEC.MODE LOGIC
 CCU2 F63B10 F63B11
-LOGIC 
+LOGIC -
 RAMW F50B11
 
 .config_enum SLICEC.REG0.REGSET SET
@@ -2912,27 +2912,27 @@
 
 .config_enum SLICED.A0MUX A0
 1 F50B3 F52B3
-A0 
+A0 -
 
 .config_enum SLICED.A1MUX A1
 1 F53B2 F55B3
-A1 
+A1 -
 
 .config_enum SLICED.B0MUX B0
 1 F50B7 F52B7
-B0 
+B0 -
 
 .config_enum SLICED.B1MUX B1
 1 F53B6 F55B7
-B1 
+B1 -
 
 .config_enum SLICED.C0MUX C0
 1 F50B5 F52B5
-C0 
+C0 -
 
 .config_enum SLICED.C1MUX C1
 1 F53B4 F55B5
-C1 
+C1 -
 
 .config_enum SLICED.CCU2.INJECT1_0 YES
 NO F97B10
@@ -2945,16 +2945,16 @@
 .config_enum SLICED.CEMUX CE
 0 F57B1 F60B1 F100B10
 1 F57B1 F60B1
-CE 
+CE -
 INV F100B10
 
 .config_enum SLICED.D0MUX D0
 1 F50B9 F52B9
-D0 
+D0 -
 
 .config_enum SLICED.D1MUX D1
 1 F53B8 F55B9
-D1 
+D1 -
 
 .config_enum SLICED.GSR ENABLED
 DISABLED F101B10
@@ -2962,15 +2962,15 @@
 
 .config_enum SLICED.M0MUX M0
 1 F17B0 F19B1
-M0 
+M0 -
 
 .config_enum SLICED.M1MUX M1
 1 F23B0 F25B1
-M1 
+M1 -
 
 .config_enum SLICED.MODE LOGIC
 CCU2 F96B10 F96B11
-LOGIC 
+LOGIC -
 
 .config_enum SLICED.REG0.REGSET SET
 RESET F103B11
diff --git a/ECP5/tiledata/PLL0_LL/bits.db b/ECP5/tiledata/PLL0_LL/bits.db
index ede7340..54184fb 100644
--- a/ECP5/tiledata/PLL0_LL/bits.db
+++ b/ECP5/tiledata/PLL0_LL/bits.db
@@ -1,6 +1,6 @@
 # Routing Mux Bits
 .mux N1_CLKFB
-N1_CLKINTFB 
+N1_CLKINTFB -
 N1_JCLKFB1 F11B0
 N1_JCLKFB2 F12B0
 N1_JCLKFB3 F11B0 F12B0
@@ -18,13 +18,13 @@
 N1_CLKI_PLL F0B0
 
 .mux N1_REFCLK0
-N1_JREFCLK0_0 
+N1_JREFCLK0_0 -
 N1_JREFCLK0_1 F5B0
 N1_JREFCLK0_2 F6B0
 N1_JREFCLK0_3 F5B0 F6B0
 
 .mux N1_REFCLK1
-N1_JREFCLK1_0 
+N1_JREFCLK1_0 -
 N1_JREFCLK1_1 F8B0
 N1_JREFCLK1_2 F9B0
 N1_JREFCLK1_3 F8B0 F9B0
diff --git a/ECP5/tiledata/PLL0_LR/bits.db b/ECP5/tiledata/PLL0_LR/bits.db
index e2b484f..6788299 100644
--- a/ECP5/tiledata/PLL0_LR/bits.db
+++ b/ECP5/tiledata/PLL0_LR/bits.db
@@ -1,6 +1,6 @@
 # Routing Mux Bits
 .mux N1_CLKFB
-N1_CLKINTFB 
+N1_CLKINTFB -
 N1_JCLKFB1 F11B0
 N1_JCLKFB2 F12B0
 N1_JCLKFB3 F11B0 F12B0
@@ -18,13 +18,13 @@
 N1_CLKI_PLL F0B0
 
 .mux N1_REFCLK0
-N1_JREFCLK0_0 
+N1_JREFCLK0_0 -
 N1_JREFCLK0_1 F5B0
 N1_JREFCLK0_2 F6B0
 N1_JREFCLK0_3 F5B0 F6B0
 
 .mux N1_REFCLK1
-N1_JREFCLK1_0 
+N1_JREFCLK1_0 -
 N1_JREFCLK1_1 F8B0
 N1_JREFCLK1_2 F9B0
 N1_JREFCLK1_3 F8B0 F9B0
diff --git a/ECP5/tiledata/PLL0_UL/bits.db b/ECP5/tiledata/PLL0_UL/bits.db
index 6acd12b..5c5ecf3 100644
--- a/ECP5/tiledata/PLL0_UL/bits.db
+++ b/ECP5/tiledata/PLL0_UL/bits.db
@@ -1,12 +1,12 @@
 # Routing Mux Bits
 .mux E1_CLKFB
-E1_CLKINTFB 
+E1_CLKINTFB -
 E1_JCLKFB1 F1B1
 E1_JCLKFB2 F2B1
 E1_JCLKFB3 F1B1 F2B1
 
 .mux E1_REFCLK0
-E1_JREFCLK0_0 
+E1_JREFCLK0_0 -
 E1_JREFCLK0_1 F5B0
 E1_JREFCLK0_2 F6B0
 E1_JREFCLK0_3 F5B0 F6B0
@@ -15,7 +15,7 @@
 E1_JREFCLK0_6 F6B0 F7B0
 
 .mux E1_REFCLK1
-E1_JREFCLK1_0 
+E1_JREFCLK1_0 -
 E1_JREFCLK1_1 F8B0
 E1_JREFCLK1_2 F9B0
 E1_JREFCLK1_3 F8B0 F9B0
diff --git a/ECP5/tiledata/PLL0_UR/bits.db b/ECP5/tiledata/PLL0_UR/bits.db
index dbf1fde..5e2d083 100644
--- a/ECP5/tiledata/PLL0_UR/bits.db
+++ b/ECP5/tiledata/PLL0_UR/bits.db
@@ -1,6 +1,6 @@
 # Routing Mux Bits
 .mux W1_CLKFB
-W1_CLKINTFB 
+W1_CLKINTFB -
 W1_JCLKFB1 F8B1
 W1_JCLKFB2 F7B1
 W1_JCLKFB3 F7B1 F8B1
@@ -18,7 +18,7 @@
 W1_CLKI_PLL F9B0
 
 .mux W1_REFCLK0
-W1_JREFCLK0_0 
+W1_JREFCLK0_0 -
 W1_JREFCLK0_1 F4B0
 W1_JREFCLK0_2 F3B0
 W1_JREFCLK0_3 F3B0 F4B0
@@ -27,7 +27,7 @@
 W1_JREFCLK0_6 F2B0 F3B0
 
 .mux W1_REFCLK1
-W1_JREFCLK1_0 
+W1_JREFCLK1_0 -
 W1_JREFCLK1_1 F1B0
 W1_JREFCLK1_2 F0B0
 W1_JREFCLK1_3 F0B0 F1B0
diff --git a/ECP5/tiledata/VCIB_DCU0/bits.db b/ECP5/tiledata/VCIB_DCU0/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCU0/bits.db
+++ b/ECP5/tiledata/VCIB_DCU0/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCU1/bits.db b/ECP5/tiledata/VCIB_DCU1/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCU1/bits.db
+++ b/ECP5/tiledata/VCIB_DCU1/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCU2/bits.db b/ECP5/tiledata/VCIB_DCU2/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCU2/bits.db
+++ b/ECP5/tiledata/VCIB_DCU2/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCU3/bits.db b/ECP5/tiledata/VCIB_DCU3/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCU3/bits.db
+++ b/ECP5/tiledata/VCIB_DCU3/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCUA/bits.db b/ECP5/tiledata/VCIB_DCUA/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCUA/bits.db
+++ b/ECP5/tiledata/VCIB_DCUA/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCUB/bits.db b/ECP5/tiledata/VCIB_DCUB/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCUB/bits.db
+++ b/ECP5/tiledata/VCIB_DCUB/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCUC/bits.db b/ECP5/tiledata/VCIB_DCUC/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCUC/bits.db
+++ b/ECP5/tiledata/VCIB_DCUC/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCUD/bits.db b/ECP5/tiledata/VCIB_DCUD/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCUD/bits.db
+++ b/ECP5/tiledata/VCIB_DCUD/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCUF/bits.db b/ECP5/tiledata/VCIB_DCUF/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCUF/bits.db
+++ b/ECP5/tiledata/VCIB_DCUF/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCUG/bits.db b/ECP5/tiledata/VCIB_DCUG/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCUG/bits.db
+++ b/ECP5/tiledata/VCIB_DCUG/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCUH/bits.db b/ECP5/tiledata/VCIB_DCUH/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCUH/bits.db
+++ b/ECP5/tiledata/VCIB_DCUH/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections
diff --git a/ECP5/tiledata/VCIB_DCUI/bits.db b/ECP5/tiledata/VCIB_DCUI/bits.db
index 93d1428..918d75e 100644
--- a/ECP5/tiledata/VCIB_DCUI/bits.db
+++ b/ECP5/tiledata/VCIB_DCUI/bits.db
@@ -308,7 +308,7 @@
 V02S0201 F58B9 F62B8
 W1_H02E0001 F58B8 F61B8
 W1_H02E0201 F59B9 F61B8
-WBOUNCE 
+WBOUNCE -
 
 .mux H00L0100
 E1_H02W0101 F58B6 F64B6
@@ -331,12 +331,12 @@
 V02S0301 F58B7 F62B6
 W1_H02E0101 F58B6 F61B6
 W1_H02E0301 F59B7 F61B6
-WBOUNCE 
+WBOUNCE -
 
 .mux H00R0000
 E1_H02W0401 F58B4 F64B4
 E1_H02W0601 F59B5 F64B4
-EBOUNCE 
+EBOUNCE -
 H02E0401 F58B4 F60B4
 H02E0601 F59B5 F60B4
 H02W0401 F58B4 F63B4
@@ -359,7 +359,7 @@
 .mux H00R0100
 E1_H02W0501 F58B2 F64B2
 E1_H02W0701 F59B3 F64B2
-EBOUNCE 
+EBOUNCE -
 H02E0501 F58B2 F60B2
 H02E0701 F59B3 F60B2
 H02W0501 F58B2 F63B2
@@ -2068,7 +2068,7 @@
 N1_V02S0201 F62B5 F66B5
 S1_V02N0001 F61B5 F65B5
 S1_V02N0201 F62B5 F65B4
-SBOUNCE 
+SBOUNCE -
 V02N0001 F60B5 F65B5
 V02N0201 F64B5 F65B5
 V02S0001 F62B5 F65B5
@@ -2091,7 +2091,7 @@
 N1_V02S0301 F62B3 F66B3
 S1_V02N0101 F61B3 F65B3
 S1_V02N0301 F62B3 F65B2
-SBOUNCE 
+SBOUNCE -
 V02N0101 F60B3 F65B3
 V02N0301 F64B3 F65B3
 V02S0101 F62B3 F65B3
@@ -2112,7 +2112,7 @@
 JQ2 F63B9 F66B8
 N1_V02S0401 F63B9 F65B9
 N1_V02S0601 F62B9 F66B9
-NBOUNCE 
+NBOUNCE -
 S1_V02N0401 F61B9 F65B9
 S1_V02N0601 F62B9 F65B8
 V02N0401 F60B9 F65B9
@@ -2135,7 +2135,7 @@
 JQ3 F63B7 F66B6
 N1_V02S0501 F63B7 F65B7
 N1_V02S0701 F62B7 F66B7
-NBOUNCE 
+NBOUNCE -
 S1_V02N0501 F61B7 F65B7
 S1_V02N0701 F62B7 F65B6
 V02N0501 F60B7 F65B7
@@ -2438,194 +2438,194 @@
 .config_enum CIB.JA0MUX JA0
 0 F25B10
 1 F2B3 F4B2
-JA0 
+JA0 -
 
 .config_enum CIB.JA1MUX JA1
 0 F21B10
 1 F5B3 F7B3
-JA1 
+JA1 -
 
 .config_enum CIB.JA2MUX JA2
 0 F26B10
 1 F21B3 F23B3
-JA2 
+JA2 -
 
 .config_enum CIB.JA3MUX JA3
 0 F30B10
 1 F24B2 F26B3
-JA3 
+JA3 -
 
 .config_enum CIB.JA4MUX JA4
 0 F79B10
 1 F31B3 F33B2
-JA4 
+JA4 -
 
 .config_enum CIB.JA5MUX JA5
 0 F75B10
 1 F34B3 F36B3
-JA5 
+JA5 -
 
 .config_enum CIB.JA6MUX JA6
 0 F80B10
 1 F50B3 F52B3
-JA6 
+JA6 -
 
 .config_enum CIB.JA7MUX JA7
 0 F84B10
 1 F53B2 F55B3
-JA7 
+JA7 -
 
 .config_enum CIB.JB0MUX JB0
 0 F24B10
 1 F2B7 F4B6
-JB0 
+JB0 -
 
 .config_enum CIB.JB1MUX JB1
 0 F20B10
 1 F5B7 F7B7
-JB1 
+JB1 -
 
 .config_enum CIB.JB2MUX JB2
 0 F27B10
 1 F21B7 F23B7
-JB2 
+JB2 -
 
 .config_enum CIB.JB3MUX JB3
 0 F31B10
 1 F24B6 F26B7
-JB3 
+JB3 -
 
 .config_enum CIB.JB4MUX JB4
 0 F78B10
 1 F31B7 F33B6
-JB4 
+JB4 -
 
 .config_enum CIB.JB5MUX JB5
 0 F74B10
 1 F34B7 F36B7
-JB5 
+JB5 -
 
 .config_enum CIB.JB6MUX JB6
 0 F81B10
 1 F50B7 F52B7
-JB6 
+JB6 -
 
 .config_enum CIB.JB7MUX JB7
 0 F85B10
 1 F53B6 F55B7
-JB7 
+JB7 -
 
 .config_enum CIB.JC0MUX JC0
 0 F23B10
 1 F2B5 F4B4
-JC0 
+JC0 -
 
 .config_enum CIB.JC1MUX JC1
 0 F19B10
 1 F5B5 F7B5
-JC1 
+JC1 -
 
 .config_enum CIB.JC2MUX JC2
 0 F28B10
 1 F21B5 F23B5
-JC2 
+JC2 -
 
 .config_enum CIB.JC3MUX JC3
 0 F32B10
 1 F24B4 F26B5
-JC3 
+JC3 -
 
 .config_enum CIB.JC4MUX JC4
 0 F77B10
 1 F31B5 F33B4
-JC4 
+JC4 -
 
 .config_enum CIB.JC5MUX JC5
 0 F73B10
 1 F34B5 F36B5
-JC5 
+JC5 -
 
 .config_enum CIB.JC6MUX JC6
 0 F82B10
 1 F50B5 F52B5
-JC6 
+JC6 -
 
 .config_enum CIB.JC7MUX JC7
 0 F86B10
 1 F53B4 F55B5
-JC7 
+JC7 -
 
 .config_enum CIB.JCE0MUX JCE0
 1 F48B1 F54B0
-JCE0 
+JCE0 -
 
 .config_enum CIB.JCE1MUX JCE1
 1 F53B1 F56B1
-JCE1 
+JCE1 -
 
 .config_enum CIB.JCE2MUX JCE2
 1 F59B0 F65B1
-JCE2 
+JCE2 -
 
 .config_enum CIB.JCE3MUX JCE3
 1 F57B1 F60B1
-JCE3 
+JCE3 -
 
 .config_enum CIB.JCLK0MUX JCLK0
 0 F41B0 F46B1
-JCLK0 
+JCLK0 -
 
 .config_enum CIB.JCLK1MUX JCLK1
 0 F39B1 F40B0
-JCLK1 
+JCLK1 -
 
 .config_enum CIB.JD0MUX JD0
 0 F22B10
 1 F2B9 F4B8
-JD0 
+JD0 -
 
 .config_enum CIB.JD1MUX JD1
 0 F18B10
 1 F5B9 F7B9
-JD1 
+JD1 -
 
 .config_enum CIB.JD2MUX JD2
 0 F29B10
 1 F21B9 F23B9
-JD2 
+JD2 -
 
 .config_enum CIB.JD3MUX JD3
 0 F33B10
 1 F24B8 F26B9
-JD3 
+JD3 -
 
 .config_enum CIB.JD4MUX JD4
 0 F76B10
 1 F31B9 F33B8
-JD4 
+JD4 -
 
 .config_enum CIB.JD5MUX JD5
 0 F72B10
 1 F34B9 F36B9
-JD5 
+JD5 -
 
 .config_enum CIB.JD6MUX JD6
 0 F83B10
 1 F50B9 F52B9
-JD6 
+JD6 -
 
 .config_enum CIB.JD7MUX JD7
 0 F87B10
 1 F53B8 F55B9
-JD7 
+JD7 -
 
 .config_enum CIB.JLSR0MUX JLSR0
 0 F31B0 F37B1
-JLSR0 
+JLSR0 -
 
 .config_enum CIB.JLSR1MUX JLSR1
 0 F29B1 F32B1
-JLSR1 
+JLSR1 -
 
 
 # Fixed Connections