diff --git a/openfpga_flow/tasks/template_tasks/yosys_vpr_template/arch/openfpga_arch.xml b/openfpga_flow/tasks/template_tasks/yosys_vpr_template/arch/openfpga_arch.xml
index 0ff0edfd3..db45d6d42 100644
--- a/openfpga_flow/tasks/template_tasks/yosys_vpr_template/arch/openfpga_arch.xml
+++ b/openfpga_flow/tasks/template_tasks/yosys_vpr_template/arch/openfpga_arch.xml
@@ -1,11 +1,3 @@
-
@@ -157,21 +149,18 @@
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
diff --git a/openfpga_flow/tasks/template_tasks/yosys_vpr_template/arch/vpr_arch.xml b/openfpga_flow/tasks/template_tasks/yosys_vpr_template/arch/vpr_arch.xml
index 6d875aa50..c60b48336 100644
--- a/openfpga_flow/tasks/template_tasks/yosys_vpr_template/arch/vpr_arch.xml
+++ b/openfpga_flow/tasks/template_tasks/yosys_vpr_template/arch/vpr_arch.xml
@@ -1,199 +1,226 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- io.outpad io.inpad
- io.outpad io.inpad
- io.outpad io.inpad
- io.outpad io.inpad
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1 1 1 1 1
- 1 1 1 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 261e-12
- 261e-12
- 261e-12
- 261e-12
- 261e-12
- 261e-12
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ io.outpad io.inpad
+ io.outpad io.inpad
+ io.outpad io.inpad
+ io.outpad io.inpad
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1 1 1 1 1
+ 1 1 1 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 261e-12
+ 261e-12
+ 261e-12
+ 261e-12
+ 261e-12
+ 261e-12
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 261e-12
+ 261e-12
+ 261e-12
+ 261e-12
+ 261e-12
+ 261e-12
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file