fix port positions

5 files changed, 280 insertions, 249 deletions

diff --git a/blocks/blocks/xcosblocks/fixtures/xcosblocks.yaml b/blocks/blocks/xcosblocks/fixtures/xcosblocks.yaml
index 30f6a6e6..f733081e 100644
--- a/blocks/blocks/xcosblocks/fixtures/xcosblocks.yaml
+++ b/blocks/blocks/xcosblocks/fixtures/xcosblocks.yaml
@@ -9500,7 +9500,7 @@
     port_name: '4'
     port_number: '4'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -9786,7 +9786,7 @@
     port_name: '5'
     port_number: '5'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -9863,12 +9863,12 @@
     port_order: 4
     port_name: '4'
     port_number: '4'
-    port_x: -15
+    port_x: 0
     port_y: -20
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 58
   fields:
@@ -9876,8 +9876,8 @@
     port_order: 5
     port_name: '5'
     port_number: '5'
-    port_x: 15
-    port_y: -20
+    port_x: -15
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -9889,12 +9889,12 @@
     port_order: 6
     port_name: '6'
     port_number: '6'
-    port_x: 0
+    port_x: 15
     port_y: 20
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 60
   fields:
@@ -9929,7 +9929,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -9981,7 +9981,7 @@
     port_name: '4'
     port_number: '4'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10020,7 +10020,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10059,7 +10059,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10098,7 +10098,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10137,7 +10137,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10176,7 +10176,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10215,7 +10215,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10318,12 +10318,12 @@
     port_order: 1
     port_name: '1'
     port_number: '1'
-    port_x: 0
+    port_x: -10
     port_y: -20
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 93
   fields:
@@ -10331,8 +10331,8 @@
     port_order: 2
     port_name: '2'
     port_number: '2'
-    port_x: -10
-    port_y: 20
+    port_x: 10
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10344,12 +10344,12 @@
     port_order: 3
     port_name: '3'
     port_number: '3'
-    port_x: 10
+    port_x: 0
     port_y: 20
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 95
   fields:
@@ -10371,7 +10371,7 @@
     port_name: '2'
     port_number: '2'
     port_x: -15
-    port_y: 30
+    port_y: -30
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10384,7 +10384,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 15
-    port_y: 30
+    port_y: -30
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10397,7 +10397,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10409,12 +10409,12 @@
     port_order: 1
     port_name: '1'
     port_number: '1'
-    port_x: 0
+    port_x: -13
     port_y: -20
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 100
   fields:
@@ -10422,8 +10422,8 @@
     port_order: 2
     port_name: '2'
     port_number: '2'
-    port_x: -13
-    port_y: 20
+    port_x: 0
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10435,8 +10435,8 @@
     port_order: 3
     port_name: '3'
     port_number: '3'
-    port_x: 0
-    port_y: 20
+    port_x: 13
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10448,12 +10448,12 @@
     port_order: 4
     port_name: '4'
     port_number: '4'
-    port_x: 13
+    port_x: 0
     port_y: 20
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 103
   fields:
@@ -10475,7 +10475,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -10489,10 +10489,10 @@
     port_number: '1'
     port_x: 0
     port_y: -20
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 106
   fields:
@@ -10502,10 +10502,10 @@
     port_number: '2'
     port_x: 0
     port_y: 20
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 107
   fields:
@@ -10526,12 +10526,12 @@
     port_order: 2
     port_name: '2'
     port_number: '2'
-    port_x: -20
+    port_x: 0
     port_y: -20
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 109
   fields:
@@ -10539,8 +10539,8 @@
     port_order: 3
     port_name: '3'
     port_number: '3'
-    port_x: 20
-    port_y: -20
+    port_x: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -10552,12 +10552,12 @@
     port_order: 4
     port_name: '4'
     port_number: '4'
-    port_x: 0
+    port_x: 20
     port_y: 20
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 111
   fields:
@@ -10567,10 +10567,10 @@
     port_number: '1'
     port_x: 0
     port_y: -20
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 112
   fields:
@@ -10580,10 +10580,10 @@
     port_number: '2'
     port_x: 0
     port_y: 20
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 113
   fields:
@@ -10592,7 +10592,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -10619,10 +10619,10 @@
     port_number: '2'
     port_x: 0
     port_y: -20
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 116
   fields:
@@ -10632,10 +10632,10 @@
     port_number: '3'
     port_x: 0
     port_y: 20
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 117
   fields:
@@ -10657,7 +10657,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -10671,10 +10671,10 @@
     port_number: '1'
     port_x: 0
     port_y: -20
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 120
   fields:
@@ -10684,10 +10684,10 @@
     port_number: '2'
     port_x: 0
     port_y: 20
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 121
   fields:
@@ -10696,7 +10696,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -10721,12 +10721,12 @@
     port_order: 2
     port_name: '2'
     port_number: '2'
-    port_x: -15
+    port_x: 0
     port_y: -30
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 124
   fields:
@@ -10734,8 +10734,8 @@
     port_order: 3
     port_name: '3'
     port_number: '3'
-    port_x: 15
-    port_y: -30
+    port_x: -15
+    port_y: 30
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -10747,12 +10747,12 @@
     port_order: 4
     port_name: '4'
     port_number: '4'
-    port_x: 0
+    port_x: 15
     port_y: 30
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 126
   fields:
@@ -10760,12 +10760,12 @@
     port_order: 1
     port_name: '1'
     port_number: '1'
-    port_x: -20
+    port_x: 0
     port_y: -20
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 127
   fields:
@@ -10773,8 +10773,8 @@
     port_order: 2
     port_name: '2'
     port_number: '2'
-    port_x: 0
-    port_y: -20
+    port_x: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -10786,8 +10786,8 @@
     port_order: 3
     port_name: '3'
     port_number: '3'
-    port_x: 20
-    port_y: -20
+    port_x: 0
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -10799,12 +10799,12 @@
     port_order: 4
     port_name: '4'
     port_number: '4'
-    port_x: 0
+    port_x: 20
     port_y: 20
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 130
   fields:
@@ -10813,7 +10813,7 @@
     port_name: '1'
     port_number: '1'
     port_x: -15
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -10826,7 +10826,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 15
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -10838,12 +10838,12 @@
     port_order: 1
     port_name: '1'
     port_number: '1'
-    port_x: -15
+    port_x: 0
     port_y: -20
-    port_orientation: CommandPort
+    port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
-    port_type: CommandPort
+    port_type: ControlPort
 - model: xcosblocks.newblockport
   pk: 133
   fields:
@@ -10851,8 +10851,8 @@
     port_order: 2
     port_name: '2'
     port_number: '2'
-    port_x: 15
-    port_y: -20
+    port_x: -15
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -10864,12 +10864,12 @@
     port_order: 3
     port_name: '3'
     port_number: '3'
-    port_x: 0
+    port_x: 15
     port_y: 20
-    port_orientation: ControlPort
+    port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
-    port_type: ControlPort
+    port_type: CommandPort
 - model: xcosblocks.newblockport
   pk: 135
   fields:
@@ -10878,7 +10878,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -13556,7 +13556,7 @@
     port_name: '4'
     port_number: '4'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -13660,7 +13660,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -13686,7 +13686,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -13712,7 +13712,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -13738,7 +13738,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -13751,7 +13751,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: -10
+    port_y: 10
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -13764,7 +13764,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: 10
+    port_y: -10
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -13972,7 +13972,7 @@
     port_name: '4'
     port_number: '4'
     port_x: -15
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -13985,7 +13985,7 @@
     port_name: '5'
     port_number: '5'
     port_x: 15
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14206,7 +14206,7 @@
     port_name: '4'
     port_number: '4'
     port_x: -10
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14219,7 +14219,7 @@
     port_name: '5'
     port_number: '5'
     port_x: 10
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14297,7 +14297,7 @@
     port_name: '4'
     port_number: '4'
     port_x: -15
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14310,7 +14310,7 @@
     port_name: '5'
     port_number: '5'
     port_x: 15
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14544,7 +14544,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14583,7 +14583,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14622,7 +14622,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14674,7 +14674,7 @@
     port_name: '4'
     port_number: '4'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14687,7 +14687,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14700,7 +14700,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: 10
+    port_y: -10
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14726,7 +14726,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14752,7 +14752,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14791,7 +14791,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14817,7 +14817,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14856,7 +14856,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14908,7 +14908,7 @@
     port_name: '4'
     port_number: '4'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14960,7 +14960,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -14986,7 +14986,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15012,7 +15012,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15038,7 +15038,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15051,7 +15051,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: -10
+    port_y: 10
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -15064,7 +15064,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -15129,7 +15129,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15194,7 +15194,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15246,7 +15246,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15298,7 +15298,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15324,7 +15324,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15350,7 +15350,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15376,7 +15376,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15389,7 +15389,7 @@
     port_name: '1'
     port_number: '1'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -15415,7 +15415,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15441,7 +15441,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: -20
+    port_y: 20
     port_orientation: CommandPort
     port_part: 1
     port_dmg: 1
@@ -15493,7 +15493,7 @@
     port_name: '2'
     port_number: '2'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15753,7 +15753,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
@@ -15792,7 +15792,7 @@
     port_name: '3'
     port_number: '3'
     port_x: 0
-    port_y: 20
+    port_y: -20
     port_orientation: ControlPort
     port_part: 1
     port_dmg: 1
diff --git a/blocks/eda-frontend/src/components/SchematicEditor/Helper/SvgParser.js b/blocks/eda-frontend/src/components/SchematicEditor/Helper/SvgParser.js
index 7cbeae88..354c6031 100644
--- a/blocks/eda-frontend/src/components/SchematicEditor/Helper/SvgParser.js
+++ b/blocks/eda-frontend/src/components/SchematicEditor/Helper/SvgParser.js
@@ -69,7 +69,7 @@ export function getSvgMetadata (graph, parent, evt, target, x, y, component) {
     if (blockport.port_name === 'NC') { continue }
 
     const xPos = 1 / 2 + blockport.port_x / defaultScale / width
-    const yPos = 1 / 2 - blockport.port_y / defaultScale / height
+    const yPos = 1 / 2 + blockport.port_y / defaultScale / height
 
     const portOrientation = blockport.port_orientation
     let pointX
diff --git a/data/blocks-ports.tsv b/data/blocks-ports.tsv
index 12976639..e84348cd 100644
--- a/data/blocks-ports.tsv
+++ b/data/blocks-ports.tsv
@@ -26,7 +26,7 @@
 26	Continuous time systems	TCLSS	1	1	1	-30	-10	ExplicitInputPort	1	1	ExplicitInputPort
 27	Continuous time systems	TCLSS	2	2	2	-30	10	ExplicitInputPort	1	1	ExplicitInputPort
 28	Continuous time systems	TCLSS	3	3	3	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-29	Continuous time systems	TCLSS	4	4	4	0	20	ControlPort	1	1	ControlPort
+29	Continuous time systems	TCLSS	4	4	4	0	-20	ControlPort	1	1	ControlPort
 30	Continuous time systems	TIME_DELAY	1	1	1	-35	0	ExplicitInputPort	1	1	ExplicitInputPort
 31	Continuous time systems	TIME_DELAY	2	2	2	35	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 32	Continuous time systems	VARIABLE_DELAY	1	1	1	-30	-10	ExplicitInputPort	1	1	ExplicitInputPort
@@ -48,40 +48,40 @@
 48	Discrete time systems	AUTOMAT	2	2	2	-40	10	ExplicitInputPort	1	1	ExplicitInputPort
 49	Discrete time systems	AUTOMAT	3	3	3	40	-10	ExplicitOutputPort	1	1	ExplicitOutputPort
 50	Discrete time systems	AUTOMAT	4	4	4	40	10	ExplicitOutputPort	1	1	ExplicitOutputPort
-51	Discrete time systems	AUTOMAT	5	5	5	0	-20	CommandPort	1	1	CommandPort
+51	Discrete time systems	AUTOMAT	5	5	5	0	20	CommandPort	1	1	CommandPort
 52	Discrete time systems	DELAY_f	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 53	Discrete time systems	DELAY_f	2	2	2	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 54	Discontinuities	DELAYV_f	1	1	1	-30	-10	ExplicitInputPort	1	1	ExplicitInputPort
 55	Discontinuities	DELAYV_f	2	2	2	-30	10	ExplicitInputPort	1	1	ExplicitInputPort
 56	Discontinuities	DELAYV_f	3	3	3	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-57	Discontinuities	DELAYV_f	4	4	4	-15	-20	CommandPort	1	1	CommandPort
-58	Discontinuities	DELAYV_f	5	5	5	15	-20	CommandPort	1	1	CommandPort
-59	Discontinuities	DELAYV_f	6	6	6	0	20	ControlPort	1	1	ControlPort
+57	Discontinuities	DELAYV_f	4	4	4	0	-20	ControlPort	1	1	ControlPort
+58	Discontinuities	DELAYV_f	5	5	5	-15	20	CommandPort	1	1	CommandPort
+59	Discontinuities	DELAYV_f	6	6	6	15	20	CommandPort	1	1	CommandPort
 60	Discrete time systems	DLR	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
 61	Discrete time systems	DLR	2	2	2	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-62	Discrete time systems	DLR	3	3	3	0	20	ControlPort	1	1	ControlPort
+62	Discrete time systems	DLR	3	3	3	0	-20	ControlPort	1	1	ControlPort
 63	Discrete time systems	DLRADAPT_f	1	1	1	-20	-10	ExplicitInputPort	1	1	ExplicitInputPort
 64	Discrete time systems	DLRADAPT_f	2	2	2	-20	10	ExplicitInputPort	1	1	ExplicitInputPort
 65	Discrete time systems	DLRADAPT_f	3	3	3	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-66	Discrete time systems	DLRADAPT_f	4	4	4	0	20	ControlPort	1	1	ControlPort
+66	Discrete time systems	DLRADAPT_f	4	4	4	0	-20	ControlPort	1	1	ControlPort
 67	Discrete time systems	DLSS	1	1	1	-40	0	ExplicitInputPort	1	1	ExplicitInputPort
 68	Discrete time systems	DLSS	2	2	2	40	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-69	Discrete time systems	DLSS	3	3	3	0	20	ControlPort	1	1	ControlPort
+69	Discrete time systems	DLSS	3	3	3	0	-20	ControlPort	1	1	ControlPort
 70	Discrete time systems	DOLLAR	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 71	Discrete time systems	DOLLAR	2	2	2	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-72	Discrete time systems	DOLLAR	3	3	3	0	20	ControlPort	1	1	ControlPort
+72	Discrete time systems	DOLLAR	3	3	3	0	-20	ControlPort	1	1	ControlPort
 73	Discrete time systems	DOLLAR_f	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 74	Discrete time systems	DOLLAR_f	2	2	2	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-75	Discrete time systems	DOLLAR_f	3	3	3	0	20	ControlPort	1	1	ControlPort
+75	Discrete time systems	DOLLAR_f	3	3	3	0	-20	ControlPort	1	1	ControlPort
 76	Discrete time systems	DOLLAR_m	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 77	Discrete time systems	DOLLAR_m	2	2	2	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-78	Discrete time systems	DOLLAR_m	3	3	3	0	20	ControlPort	1	1	ControlPort
+78	Discrete time systems	DOLLAR_m	3	3	3	0	-20	ControlPort	1	1	ControlPort
 79	Discrete time systems	REGISTER	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
 80	Discrete time systems	REGISTER	2	2	2	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-81	Discrete time systems	REGISTER	3	3	3	0	20	ControlPort	1	1	ControlPort
+81	Discrete time systems	REGISTER	3	3	3	0	-20	ControlPort	1	1	ControlPort
 82	Discrete time systems	SAMPHOLD_m	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 83	Discrete time systems	SAMPHOLD_m	2	2	2	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-84	Discrete time systems	SAMPHOLD_m	3	3	3	0	20	ControlPort	1	1	ControlPort
+84	Discrete time systems	SAMPHOLD_m	3	3	3	0	-20	ControlPort	1	1	ControlPort
 85	Lookup tables	INTRP2BLK_f	1	1	1	-30	-10	ExplicitInputPort	1	1	ExplicitInputPort
 86	Lookup tables	INTRP2BLK_f	2	2	2	-30	10	ExplicitInputPort	1	1	ExplicitInputPort
 87	Lookup tables	INTRP2BLK_f	3	3	3	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
@@ -89,50 +89,50 @@
 89	Lookup tables	INTRPLBLK_f	2	2	2	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 90	Lookup tables	LOOKUP_f	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 91	Lookup tables	LOOKUP_f	2	2	2	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-92	Event handling	ANDBLK	1	1	1	0	-20	CommandPort	1	1	CommandPort
-93	Event handling	ANDBLK	2	2	2	-10	20	ControlPort	1	1	ControlPort
-94	Event handling	ANDBLK	3	3	3	10	20	ControlPort	1	1	ControlPort
+92	Event handling	ANDBLK	1	1	1	-10	-20	ControlPort	1	1	ControlPort
+93	Event handling	ANDBLK	2	2	2	10	-20	ControlPort	1	1	ControlPort
+94	Event handling	ANDBLK	3	3	3	0	20	CommandPort	1	1	CommandPort
 95	Event handling	ANDLOG_f	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-96	Event handling	ANDLOG_f	2	2	2	-15	30	ControlPort	1	1	ControlPort
-97	Event handling	ANDLOG_f	3	3	3	15	30	ControlPort	1	1	ControlPort
-98	Event handling	CEVENTSCOPE	1	1	1	0	20	ControlPort	1	1	ControlPort
-99	Event handling	CLKSOMV_f	1	1	1	0	-20	CommandPort	1	1	CommandPort
-100	Event handling	CLKSOMV_f	2	2	2	-13	20	ControlPort	1	1	ControlPort
-101	Event handling	CLKSOMV_f	3	3	3	0	20	ControlPort	1	1	ControlPort
-102	Event handling	CLKSOMV_f	4	4	4	13	20	ControlPort	1	1	ControlPort
+96	Event handling	ANDLOG_f	2	2	2	-15	-30	ControlPort	1	1	ControlPort
+97	Event handling	ANDLOG_f	3	3	3	15	-30	ControlPort	1	1	ControlPort
+98	Event handling	CEVENTSCOPE	1	1	1	0	-20	ControlPort	1	1	ControlPort
+99	Event handling	CLKSOMV_f	1	1	1	-13	-20	ControlPort	1	1	ControlPort
+100	Event handling	CLKSOMV_f	2	2	2	0	-20	ControlPort	1	1	ControlPort
+101	Event handling	CLKSOMV_f	3	3	3	13	-20	ControlPort	1	1	ControlPort
+102	Event handling	CLKSOMV_f	4	4	4	0	20	CommandPort	1	1	CommandPort
 103	Event handling	EDGE_TRIGGER	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
-104	Event handling	EDGE_TRIGGER	2	2	2	0	-20	CommandPort	1	1	CommandPort
-105	Event handling	END_c	1	1	1	0	-20	CommandPort	1	1	CommandPort
-106	Event handling	END_c	2	2	2	0	20	ControlPort	1	1	ControlPort
+104	Event handling	EDGE_TRIGGER	2	2	2	0	20	CommandPort	1	1	CommandPort
+105	Event handling	END_c	1	1	1	0	-20	ControlPort	1	1	ControlPort
+106	Event handling	END_c	2	2	2	0	20	CommandPort	1	1	CommandPort
 107	Event handling	ESELECT_f	1	1	1	-40	0	ExplicitInputPort	1	1	ExplicitInputPort
-108	Event handling	ESELECT_f	2	2	2	-20	-20	CommandPort	1	1	CommandPort
-109	Event handling	ESELECT_f	3	3	3	20	-20	CommandPort	1	1	CommandPort
-110	Event handling	ESELECT_f	4	4	4	0	20	ControlPort	1	1	ControlPort
-111	Event handling	EVTDLY_c	1	1	1	0	-20	CommandPort	1	1	CommandPort
-112	Event handling	EVTDLY_c	2	2	2	0	20	ControlPort	1	1	ControlPort
-113	Event handling	EVTGEN_f	1	1	1	0	-20	CommandPort	1	1	CommandPort
+108	Event handling	ESELECT_f	2	2	2	0	-20	ControlPort	1	1	ControlPort
+109	Event handling	ESELECT_f	3	3	3	-20	20	CommandPort	1	1	CommandPort
+110	Event handling	ESELECT_f	4	4	4	20	20	CommandPort	1	1	CommandPort
+111	Event handling	EVTDLY_c	1	1	1	0	-20	ControlPort	1	1	ControlPort
+112	Event handling	EVTDLY_c	2	2	2	0	20	CommandPort	1	1	CommandPort
+113	Event handling	EVTGEN_f	1	1	1	0	20	CommandPort	1	1	CommandPort
 114	Event handling	EVTVARDLY	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
-115	Event handling	EVTVARDLY	2	2	2	0	-20	CommandPort	1	1	CommandPort
-116	Event handling	EVTVARDLY	3	3	3	0	20	ControlPort	1	1	ControlPort
+115	Event handling	EVTVARDLY	2	2	2	0	-20	ControlPort	1	1	ControlPort
+116	Event handling	EVTVARDLY	3	3	3	0	20	CommandPort	1	1	CommandPort
 117	Event handling	Extract_Activation	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
-118	Event handling	Extract_Activation	2	2	2	0	-20	CommandPort	1	1	CommandPort
-119	Event handling	freq_div	1	1	1	0	-20	CommandPort	1	1	CommandPort
-120	Event handling	freq_div	2	2	2	0	20	ControlPort	1	1	ControlPort
-121	Event handling	HALT_f	1	1	1	0	20	ControlPort	1	1	ControlPort
+118	Event handling	Extract_Activation	2	2	2	0	20	CommandPort	1	1	CommandPort
+119	Event handling	freq_div	1	1	1	0	-20	ControlPort	1	1	ControlPort
+120	Event handling	freq_div	2	2	2	0	20	CommandPort	1	1	CommandPort
+121	Event handling	HALT_f	1	1	1	0	-20	ControlPort	1	1	ControlPort
 122	Event handling	IFTHEL_f	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
-123	Event handling	IFTHEL_f	2	2	2	-15	-30	CommandPort	1	1	CommandPort
-124	Event handling	IFTHEL_f	3	3	3	15	-30	CommandPort	1	1	CommandPort
-125	Event handling	IFTHEL_f	4	4	4	0	30	ControlPort	1	1	ControlPort
-126	Event handling	M_freq	1	1	1	-20	-20	CommandPort	1	1	CommandPort
-127	Event handling	M_freq	2	2	2	0	-20	CommandPort	1	1	CommandPort
-128	Event handling	M_freq	3	3	3	20	-20	CommandPort	1	1	CommandPort
-129	Event handling	M_freq	4	4	4	0	20	ControlPort	1	1	ControlPort
-130	Event handling	MCLOCK_f	1	1	1	-15	-20	CommandPort	1	1	CommandPort
-131	Event handling	MCLOCK_f	2	2	2	15	-20	CommandPort	1	1	CommandPort
-132	Event handling	MFCLCK_f	1	1	1	-15	-20	CommandPort	1	1	CommandPort
-133	Event handling	MFCLCK_f	2	2	2	15	-20	CommandPort	1	1	CommandPort
-134	Event handling	MFCLCK_f	3	3	3	0	20	ControlPort	1	1	ControlPort
-135	Event handling	VirtualCLK0	1	1	1	0	20	ControlPort	1	1	ControlPort
+123	Event handling	IFTHEL_f	2	2	2	0	-30	ControlPort	1	1	ControlPort
+124	Event handling	IFTHEL_f	3	3	3	-15	30	CommandPort	1	1	CommandPort
+125	Event handling	IFTHEL_f	4	4	4	15	30	CommandPort	1	1	CommandPort
+126	Event handling	M_freq	1	1	1	0	-20	ControlPort	1	1	ControlPort
+127	Event handling	M_freq	2	2	2	-20	20	CommandPort	1	1	CommandPort
+128	Event handling	M_freq	3	3	3	0	20	CommandPort	1	1	CommandPort
+129	Event handling	M_freq	4	4	4	20	20	CommandPort	1	1	CommandPort
+130	Event handling	MCLOCK_f	1	1	1	-15	20	CommandPort	1	1	CommandPort
+131	Event handling	MCLOCK_f	2	2	2	15	20	CommandPort	1	1	CommandPort
+132	Event handling	MFCLCK_f	1	1	1	0	-20	ControlPort	1	1	ControlPort
+133	Event handling	MFCLCK_f	2	2	2	-15	20	CommandPort	1	1	CommandPort
+134	Event handling	MFCLCK_f	3	3	3	15	20	CommandPort	1	1	CommandPort
+135	Event handling	VirtualCLK0	1	1	1	0	-20	ControlPort	1	1	ControlPort
 136	Mathematical Operations	ABS_VALUE	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 137	Mathematical Operations	ABS_VALUE	2	2	2	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 138	Mathematical Operations	BIGSOM_f	1	1	1	-20	-15	ExplicitInputPort	1	1	ExplicitInputPort
@@ -338,7 +338,7 @@
 338	Integer	LOGIC	1	1	1	-20	-10	ExplicitInputPort	1	1	ExplicitInputPort
 339	Integer	LOGIC	2	2	2	-20	10	ExplicitInputPort	1	1	ExplicitInputPort
 340	Integer	LOGIC	3	3	3	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-341	Integer	LOGIC	4	4	4	0	20	ControlPort	1	1	ControlPort
+341	Integer	LOGIC	4	4	4	0	-20	ControlPort	1	1	ControlPort
 342	Integer	SHIFT	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
 343	Integer	SHIFT	2	2	2	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 344	Integer	SRFLIPFLOP	1	1	1	-20	-15	ExplicitInputPort	1	1	ExplicitInputPort
@@ -346,15 +346,15 @@
 346	Integer	SRFLIPFLOP	3	3	3	20	-15	ExplicitOutputPort	1	1	ExplicitOutputPort
 347	Integer	SRFLIPFLOP	4	4	4	20	15	ExplicitOutputPort	1	1	ExplicitOutputPort
 348	Zero crossing detection	GENERAL_f	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
-349	Zero crossing detection	GENERAL_f	2	2	2	0	-20	CommandPort	1	1	CommandPort
+349	Zero crossing detection	GENERAL_f	2	2	2	0	20	CommandPort	1	1	CommandPort
 350	Zero crossing detection	NEGTOPOS_f	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
-351	Zero crossing detection	NEGTOPOS_f	2	2	2	0	-20	CommandPort	1	1	CommandPort
+351	Zero crossing detection	NEGTOPOS_f	2	2	2	0	20	CommandPort	1	1	CommandPort
 352	Zero crossing detection	POSTONEG_f	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
-353	Zero crossing detection	POSTONEG_f	2	2	2	0	-20	CommandPort	1	1	CommandPort
+353	Zero crossing detection	POSTONEG_f	2	2	2	0	20	CommandPort	1	1	CommandPort
 354	Zero crossing detection	ZCROSS_f	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
-355	Zero crossing detection	ZCROSS_f	2	2	2	0	-20	CommandPort	1	1	CommandPort
-356	Event handling	CLKFROM	1	1	1	0	-10	CommandPort	1	1	CommandPort
-357	Event handling	CLKGOTO	1	1	1	0	10	ControlPort	1	1	ControlPort
+355	Zero crossing detection	ZCROSS_f	2	2	2	0	20	CommandPort	1	1	CommandPort
+356	Event handling	CLKFROM	1	1	1	0	10	CommandPort	1	1	CommandPort
+357	Event handling	CLKGOTO	1	1	1	0	-10	ControlPort	1	1	ControlPort
 358	Signal Routing	DEMUX	1	1	1	-5	0	ExplicitInputPort	1	1	ExplicitInputPort
 359	Signal Routing	DEMUX	2	2	2	5	-10	ExplicitOutputPort	1	1	ExplicitOutputPort
 360	Signal Routing	DEMUX	3	3	3	5	10	ExplicitOutputPort	1	1	ExplicitOutputPort
@@ -370,8 +370,8 @@
 370	Signal Routing	ISELECT_m	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
 371	Signal Routing	ISELECT_m	2	2	2	30	-10	ExplicitOutputPort	1	1	ExplicitOutputPort
 372	Signal Routing	ISELECT_m	3	3	3	30	10	ExplicitOutputPort	1	1	ExplicitOutputPort
-373	Signal Routing	ISELECT_m	4	4	4	-15	20	ControlPort	1	1	ControlPort
-374	Signal Routing	ISELECT_m	5	5	5	15	20	ControlPort	1	1	ControlPort
+373	Signal Routing	ISELECT_m	4	4	4	-15	-20	ControlPort	1	1	ControlPort
+374	Signal Routing	ISELECT_m	5	5	5	15	-20	ControlPort	1	1	ControlPort
 375	Signal Routing	M_SWITCH	1	1	1	-25	-13	ExplicitInputPort	1	1	ExplicitInputPort
 376	Signal Routing	M_SWITCH	2	2	2	-25	0	ExplicitInputPort	1	1	ExplicitInputPort
 377	Signal Routing	M_SWITCH	3	3	3	-25	13	ExplicitInputPort	1	1	ExplicitInputPort
@@ -388,15 +388,15 @@
 388	Signal Routing	RELAY_f	1	1	1	-20	-10	ExplicitInputPort	1	1	ExplicitInputPort
 389	Signal Routing	RELAY_f	2	2	2	-20	10	ExplicitInputPort	1	1	ExplicitInputPort
 390	Signal Routing	RELAY_f	3	3	3	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-391	Signal Routing	RELAY_f	4	4	4	-10	20	ControlPort	1	1	ControlPort
-392	Signal Routing	RELAY_f	5	5	5	10	20	ControlPort	1	1	ControlPort
+391	Signal Routing	RELAY_f	4	4	4	-10	-20	ControlPort	1	1	ControlPort
+392	Signal Routing	RELAY_f	5	5	5	10	-20	ControlPort	1	1	ControlPort
 393	Signal Routing	SCALAR2VECTOR	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
 394	Signal Routing	SCALAR2VECTOR	2	2	2	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 395	Signal Routing	SELECT_m	1	1	1	-30	-10	ExplicitInputPort	1	1	ExplicitInputPort
 396	Signal Routing	SELECT_m	2	2	2	-30	10	ExplicitInputPort	1	1	ExplicitInputPort
 397	Signal Routing	SELECT_m	3	3	3	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-398	Signal Routing	SELECT_m	4	4	4	-15	20	ControlPort	1	1	ControlPort
-399	Signal Routing	SELECT_m	5	5	5	15	20	ControlPort	1	1	ControlPort
+398	Signal Routing	SELECT_m	4	4	4	-15	-20	ControlPort	1	1	ControlPort
+399	Signal Routing	SELECT_m	5	5	5	15	-20	ControlPort	1	1	ControlPort
 400	Signal Routing	SELF_SWITCH	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 401	Signal Routing	SELF_SWITCH	2	2	2	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 402	Signal Routing	SWITCH_f	1	1	1	-20	-10	ExplicitInputPort	1	1	ExplicitInputPort
@@ -414,80 +414,80 @@
 414	Implicit	DIFF_f	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 415	Implicit	DIFF_f	2	2	2	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 416	Sinks	AFFICH_m	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
-417	Sinks	AFFICH_m	2	2	2	0	20	ControlPort	1	1	ControlPort
+417	Sinks	AFFICH_m	2	2	2	0	-20	ControlPort	1	1	ControlPort
 418	Sinks	BARXY	1	1	1	-20	-10	ExplicitInputPort	1	1	ExplicitInputPort
 419	Sinks	BARXY	2	2	2	-20	10	ExplicitInputPort	1	1	ExplicitInputPort
-420	Sinks	BARXY	3	3	3	0	20	ControlPort	1	1	ControlPort
+420	Sinks	BARXY	3	3	3	0	-20	ControlPort	1	1	ControlPort
 421	Sinks	CANIMXY	1	1	1	-20	-10	ExplicitInputPort	1	1	ExplicitInputPort
 422	Sinks	CANIMXY	2	2	2	-20	10	ExplicitInputPort	1	1	ExplicitInputPort
-423	Sinks	CANIMXY	3	3	3	0	20	ControlPort	1	1	ControlPort
+423	Sinks	CANIMXY	3	3	3	0	-20	ControlPort	1	1	ControlPort
 424	Sinks	CANIMXY3D	1	1	1	-20	-13	ExplicitInputPort	1	1	ExplicitInputPort
 425	Sinks	CANIMXY3D	2	2	2	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 426	Sinks	CANIMXY3D	3	3	3	-20	13	ExplicitInputPort	1	1	ExplicitInputPort
-427	Sinks	CANIMXY3D	4	4	4	0	20	ControlPort	1	1	ControlPort
-428	Sinks	CFSCOPE	1	1	1	0	20	ControlPort	1	1	ControlPort
-429	Event handling	CLKOUTV_f	1	1	1	0	10	ControlPort	1	1	ControlPort
+427	Sinks	CANIMXY3D	4	4	4	0	-20	ControlPort	1	1	ControlPort
+428	Sinks	CFSCOPE	1	1	1	0	-20	ControlPort	1	1	ControlPort
+429	Event handling	CLKOUTV_f	1	1	1	0	-10	ControlPort	1	1	ControlPort
 430	Sinks	CMAT3D	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
-431	Sinks	CMAT3D	2	2	2	0	20	ControlPort	1	1	ControlPort
+431	Sinks	CMAT3D	2	2	2	0	-20	ControlPort	1	1	ControlPort
 432	Sinks	CMATVIEW	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
-433	Sinks	CMATVIEW	2	2	2	0	20	ControlPort	1	1	ControlPort
+433	Sinks	CMATVIEW	2	2	2	0	-20	ControlPort	1	1	ControlPort
 434	Sinks	CMSCOPE	1	1	1	-20	-10	ExplicitInputPort	1	1	ExplicitInputPort
 435	Sinks	CMSCOPE	2	2	2	-20	10	ExplicitInputPort	1	1	ExplicitInputPort
-436	Sinks	CMSCOPE	3	3	3	0	20	ControlPort	1	1	ControlPort
+436	Sinks	CMSCOPE	3	3	3	0	-20	ControlPort	1	1	ControlPort
 437	Sinks	CSCOPE	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
-438	Sinks	CSCOPE	2	2	2	0	20	ControlPort	1	1	ControlPort
+438	Sinks	CSCOPE	2	2	2	0	-20	ControlPort	1	1	ControlPort
 439	Sinks	CSCOPXY	1	1	1	-20	-10	ExplicitInputPort	1	1	ExplicitInputPort
 440	Sinks	CSCOPXY	2	2	2	-20	10	ExplicitInputPort	1	1	ExplicitInputPort
-441	Sinks	CSCOPXY	3	3	3	0	20	ControlPort	1	1	ControlPort
+441	Sinks	CSCOPXY	3	3	3	0	-20	ControlPort	1	1	ControlPort
 442	Sinks	CSCOPXY3D	1	1	1	-20	-13	ExplicitInputPort	1	1	ExplicitInputPort
 443	Sinks	CSCOPXY3D	2	2	2	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
 444	Sinks	CSCOPXY3D	3	3	3	-20	13	ExplicitInputPort	1	1	ExplicitInputPort
-445	Sinks	CSCOPXY3D	4	4	4	0	20	ControlPort	1	1	ControlPort
+445	Sinks	CSCOPXY3D	4	4	4	0	-20	ControlPort	1	1	ControlPort
 446	Port & Subsystem	OUT_f	1	1	1	-10	0	ExplicitInputPort	1	1	ExplicitInputPort
 447	Port & Subsystem	OUTIMPL_f	1	1	1	-10	0	ImplicitInputPort	1	1	ImplicitInputPort
 448	Sinks	TOWS_c	1	1	1	-40	0	ExplicitInputPort	1	1	ExplicitInputPort
-449	Sinks	TOWS_c	2	2	2	0	20	ControlPort	1	1	ControlPort
+449	Sinks	TOWS_c	2	2	2	0	-20	ControlPort	1	1	ControlPort
 450	Sinks	TRASH_f	1	1	1	-20	0	ExplicitInputPort	1	1	ExplicitInputPort
-451	Sinks	TRASH_f	2	2	2	0	20	ControlPort	1	1	ControlPort
+451	Sinks	TRASH_f	2	2	2	0	-20	ControlPort	1	1	ControlPort
 452	Sinks	WRITEAU_f	1	1	1	-40	0	ExplicitInputPort	1	1	ExplicitInputPort
-453	Sinks	WRITEAU_f	2	2	2	0	20	ControlPort	1	1	ControlPort
+453	Sinks	WRITEAU_f	2	2	2	0	-20	ControlPort	1	1	ControlPort
 454	Sinks	WRITEC_f	1	1	1	-40	0	ExplicitInputPort	1	1	ExplicitInputPort
-455	Sinks	WRITEC_f	2	2	2	0	20	ControlPort	1	1	ControlPort
-456	Port & Subsystem	CLKINV_f	1	1	1	0	-10	CommandPort	1	1	CommandPort
-457	Event handling	CLOCK_c	1	1	1	0	-20	CommandPort	1	1	CommandPort
+455	Sinks	WRITEC_f	2	2	2	0	-20	ControlPort	1	1	ControlPort
+456	Port & Subsystem	CLKINV_f	1	1	1	0	10	CommandPort	1	1	CommandPort
+457	Event handling	CLOCK_c	1	1	1	0	20	CommandPort	1	1	CommandPort
 458	Sources	CONST	1	1	1	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 459	Sources	CONST_f	1	1	1	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 460	Sources	CONST_m	1	1	1	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 461	Sources	Counter	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-462	Sources	Counter	2	2	2	0	20	ControlPort	1	1	ControlPort
+462	Sources	Counter	2	2	2	0	-20	ControlPort	1	1	ControlPort
 463	Sources	CURV_f	1	1	1	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 464	Sources	FROMWSB	1	1	1	50	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 465	Sources	GENSIN_f	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 466	Sources	GENSQR_f	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-467	Sources	GENSQR_f	2	2	2	0	20	ControlPort	1	1	ControlPort
+467	Sources	GENSQR_f	2	2	2	0	-20	ControlPort	1	1	ControlPort
 468	Port & Subsystem	IN_f	1	1	1	10	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 469	Port & Subsystem	INIMPL_f	1	1	1	10	0	ImplicitOutputPort	1	1	ImplicitOutputPort
 470	Sources	Modulo_Count	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-471	Sources	Modulo_Count	2	2	2	0	20	ControlPort	1	1	ControlPort
+471	Sources	Modulo_Count	2	2	2	0	-20	ControlPort	1	1	ControlPort
 472	Sources	PULSE_SC	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 473	Sources	RAMP	1	1	1	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 474	Sources	RAND_m	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-475	Sources	RAND_m	2	2	2	0	20	ControlPort	1	1	ControlPort
+475	Sources	RAND_m	2	2	2	0	-20	ControlPort	1	1	ControlPort
 476	Sources	READAU_f	1	1	1	50	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-477	Sources	READAU_f	2	2	2	0	20	ControlPort	1	1	ControlPort
+477	Sources	READAU_f	2	2	2	0	-20	ControlPort	1	1	ControlPort
 478	Sources	READC_f	1	1	1	40	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-479	Sources	READC_f	2	2	2	0	20	ControlPort	1	1	ControlPort
+479	Sources	READC_f	2	2	2	0	-20	ControlPort	1	1	ControlPort
 480	Sources	RFILE_f	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-481	Sources	RFILE_f	2	2	2	0	20	ControlPort	1	1	ControlPort
-482	Event handling	SampleCLK	1	1	1	0	-20	CommandPort	1	1	CommandPort
+481	Sources	RFILE_f	2	2	2	0	-20	ControlPort	1	1	ControlPort
+482	Event handling	SampleCLK	1	1	1	0	20	CommandPort	1	1	CommandPort
 483	Sources	SAWTOOTH_f	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-484	Sources	SAWTOOTH_f	2	2	2	0	20	ControlPort	1	1	ControlPort
+484	Sources	SAWTOOTH_f	2	2	2	0	-20	ControlPort	1	1	ControlPort
 485	Sources	Sigbuilder	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-486	Sources	Sigbuilder	2	2	2	0	-20	CommandPort	1	1	CommandPort
+486	Sources	Sigbuilder	2	2	2	0	20	CommandPort	1	1	CommandPort
 487	Sources	STEP_FUNCTION	1	1	1	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 488	Sources	TIME_f	1	1	1	20	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 489	Sources	TKSCALE	1	1	1	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
-490	Sources	TKSCALE	2	2	2	0	20	ControlPort	1	1	ControlPort
+490	Sources	TKSCALE	2	2	2	0	-20	ControlPort	1	1	ControlPort
 491	Thermo-Hydraulics	Bache	1	1	1	-20	-10	ImplicitInputPort	1	1	ImplicitInputPort
 492	Thermo-Hydraulics	Bache	2	2	2	-20	10	ImplicitInputPort	1	1	ImplicitInputPort
 493	Thermo-Hydraulics	Bache	3	3	3	20	-13	ExplicitOutputPort	1	1	ExplicitOutputPort
@@ -507,10 +507,10 @@
 507	Demonstration Blocks	BOUNCE	2	2	2	30	10	ExplicitOutputPort	1	1	ExplicitOutputPort
 508	Demonstration Blocks	BOUNCEXY	1	1	1	-20	-10	ExplicitInputPort	1	1	ExplicitInputPort
 509	Demonstration Blocks	BOUNCEXY	2	2	2	-20	10	ExplicitInputPort	1	1	ExplicitInputPort
-510	Demonstration Blocks	BOUNCEXY	3	3	3	0	20	ControlPort	1	1	ControlPort
+510	Demonstration Blocks	BOUNCEXY	3	3	3	0	-20	ControlPort	1	1	ControlPort
 511	Demonstration Blocks	BPLATFORM	1	1	1	-20	-10	ExplicitInputPort	1	1	ExplicitInputPort
 512	Demonstration Blocks	BPLATFORM	2	2	2	-20	10	ExplicitInputPort	1	1	ExplicitInputPort
-513	Demonstration Blocks	BPLATFORM	3	3	3	0	20	ControlPort	1	1	ControlPort
+513	Demonstration Blocks	BPLATFORM	3	3	3	0	-20	ControlPort	1	1	ControlPort
 514	User-Defined Functions	c_block	1	1	1	-30	0	ExplicitInputPort	1	1	ExplicitInputPort
 515	User-Defined Functions	c_block	2	2	2	30	0	ExplicitOutputPort	1	1	ExplicitOutputPort
 516	User-Defined Functions	CBLOCK	1	1	1	-40	0	ExplicitInputPort	1	1	ExplicitInputPort
diff --git a/inittable-port.sql b/inittable-port.sql
new file mode 100644
index 00000000..5d1698f3
--- /dev/null
+++ b/inittable-port.sql
@@ -0,0 +1,31 @@
+DROP TABLE IF EXISTS xcosblocks_newblockport_tmp;
+
+CREATE TABLE xcosblocks_newblockport_tmp (
+    "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "category_name" varchar(100) NOT NULL,
+    "block_name" varchar(100) NOT NULL,
+    "port_order" integer NOT NULL,
+    "port_name" varchar(100) NOT NULL,
+    "port_number" varchar(10) NOT NULL,
+    "port_x" integer NOT NULL,
+    "port_y" integer NOT NULL,
+    "port_orientation" varchar(100) NOT NULL,
+    "port_part" integer NOT NULL,
+    "port_dmg" integer NOT NULL,
+    "port_type" varchar(100) NOT NULL,
+    CONSTRAINT "unique_blocktemp_port_order" UNIQUE ("block_name", "port_order")
+);
+
+.mode csv
+.separator "\t"
+.import ../data/blocks-ports.tsv xcosblocks_newblockport_tmp
+
+DELETE FROM xcosblocks_newblockport;
+
+INSERT INTO xcosblocks_newblockport
+    (id, block_id, port_order, port_name, port_number, port_x, port_y, port_orientation, port_part, port_dmg, port_type)
+    SELECT xcosblocks_newblockport_tmp.id, xcosblocks_newblock.id, port_order, port_name, port_number, port_x, port_y, port_orientation, port_part, port_dmg, port_type
+    FROM xcosblocks_newblockport_tmp
+    JOIN xcosblocks_newblock ON xcosblocks_newblock.name = xcosblocks_newblockport_tmp.block_name;
+
+DROP TABLE xcosblocks_newblockport_tmp;
diff --git a/scripts/pinscript.awk b/scripts/pinscript.awk
index f7daff54..3cc2dfe5 100755
--- a/scripts/pinscript.awk
+++ b/scripts/pinscript.awk
@@ -20,8 +20,8 @@ BEGIN {
     implicit_input_ports = $4;
     explicit_output_ports = $5;
     implicit_output_ports = $6;
-    command_ports = $7;
     control_ports = $8;
+    command_ports = $7;
     block_width = $9;
     block_height = $10;
 
@@ -81,27 +81,27 @@ BEGIN {
         printf BLOCKPORTSCSVFORMAT, ++blockportid, category, block, port_order, port_order, port_order, port_x, port_y, port_orientation, port_part, port_dmg, port_type > BLOCKPORTSCSV;
     }
 
-    for (i = 0; i < command_ports; i++) {
+    for (i = 0; i < control_ports; i++) {
         ++port_order;
-        if (2 * i < command_ports)
-            port_x = int(block_width * ((i + 0.5) / command_ports - 0.5) - 0.5);
+        if (2 * i < control_ports)
+            port_x = int(block_width * ((i + 0.5) / control_ports - 0.5) - 0.5);
         else
-            port_x = int(block_width * ((i + 0.5) / command_ports - 0.5) + 0.5);
+            port_x = int(block_width * ((i + 0.5) / control_ports - 0.5) + 0.5);
         port_y = int(block_height * -0.5 - 0.5);
-        port_orientation = "CommandPort";
-        port_type = "CommandPort";
+        port_orientation = "ControlPort";
+        port_type = "ControlPort";
         printf BLOCKPORTSCSVFORMAT, ++blockportid, category, block, port_order, port_order, port_order, port_x, port_y, port_orientation, port_part, port_dmg, port_type > BLOCKPORTSCSV;
     }
 
-    for (i = 0; i < control_ports; i++) {
+    for (i = 0; i < command_ports; i++) {
         ++port_order;
-        if (2 * i < control_ports)
-            port_x = int(block_width * ((i + 0.5) / control_ports - 0.5) - 0.5);
+        if (2 * i < command_ports)
+            port_x = int(block_width * ((i + 0.5) / command_ports - 0.5) - 0.5);
         else
-            port_x = int(block_width * ((i + 0.5) / control_ports - 0.5) + 0.5);
+            port_x = int(block_width * ((i + 0.5) / command_ports - 0.5) + 0.5);
         port_y = int(block_height * 0.5 + 0.5);
-        port_orientation = "ControlPort";
-        port_type = "ControlPort";
+        port_orientation = "CommandPort";
+        port_type = "CommandPort";
         printf BLOCKPORTSCSVFORMAT, ++blockportid, category, block, port_order, port_order, port_order, port_x, port_y, port_orientation, port_part, port_dmg, port_type > BLOCKPORTSCSV;
     }
 }