diff --git a/keyboards/canoe/info.json b/keyboards/canoe/info.json
index fec60338a..17bdacaa5 100644
--- a/keyboards/canoe/info.json
+++ b/keyboards/canoe/info.json
@@ -2,7 +2,7 @@
   "keyboard_name": "Canoe",
   "maintainer": "qmk",
   "url": "",
-  "height": 8,
+  "height": 6,
   "width": 15,
   "layouts": {
     "LAYOUT_iso": {
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json
index 86dbb4faa..8dfa03599 100644
--- a/keyboards/clueboard/card/info.json
+++ b/keyboards/clueboard/card/info.json
@@ -4,7 +4,7 @@
   "url": "",
   "maintainer": "skullydazed",
   "width": 10,
-  "height": 7,
+  "height": 8,
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json
index 45a0255c1..d7f630904 100644
--- a/keyboards/crkbd/info.json
+++ b/keyboards/crkbd/info.json
@@ -3,7 +3,7 @@
   "url": "",
   "maintainer": "qmk",
   "width": 15,
-  "height": 4.5,
+  "height": 4.7,
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/ergodone/info.json b/keyboards/ergodone/info.json
index 81c7e2afa..33128758a 100644
--- a/keyboards/ergodone/info.json
+++ b/keyboards/ergodone/info.json
@@ -1,8 +1,8 @@
 {
     "keyboard_name": "Ergodone",
     "maintainer": "Yu He",
-    "width": 19.5,
-    "height": 9.375,
+    "width": 17,
+    "height": 8,
 
     "layouts": {
       "LAYOUT_ergodox": {
diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json
index 7470ab906..6f7a94157 100644
--- a/keyboards/ergodox_ez/info.json
+++ b/keyboards/ergodox_ez/info.json
@@ -2,8 +2,8 @@
     "keyboard_name": "ErgoDox EZ",
     "url": "ergodox-ez.com",
     "maintainer": "erez",
-    "width": 19.5,
-    "height": 9.375,
+    "width": 17,
+    "height": 8,
 
     "layouts": {
         "LAYOUT_ergodox": {
diff --git a/keyboards/ergodox_infinity/info.json b/keyboards/ergodox_infinity/info.json
index a24c6b0a1..e70b2a19e 100644
--- a/keyboards/ergodox_infinity/info.json
+++ b/keyboards/ergodox_infinity/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Infinity Ergodox",
-    "width": 19.5,
-    "height": 9.375,
+    "width": 17,
+    "height": 8,
     "layouts": {
       "LAYOUT_ergodox": {
         "layout": [
diff --git a/keyboards/gergo/info.json b/keyboards/gergo/info.json
index 71dcca40f..cacbda423 100644
--- a/keyboards/gergo/info.json
+++ b/keyboards/gergo/info.json
@@ -1,6 +1,6 @@
 {
     "maintainer": "germ",
-    "height": 4.75,
+    "height": 5.75,
     "width": 19.5,
     "keyboard_name": "Gergo",
     "url": "http://gboards.ca",
diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json
index 0f3c0a94f..28f09a3aa 100644
--- a/keyboards/handwired/frenchdev/info.json
+++ b/keyboards/handwired/frenchdev/info.json
@@ -4,7 +4,7 @@
   "maintainer": "qmk",
   "bootloader": "",
   "width": 20,
-  "height": 8,
+  "height": 9.5,
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json
index 022209502..9c286eb1f 100644
--- a/keyboards/handwired/not_so_minidox/info.json
+++ b/keyboards/handwired/not_so_minidox/info.json
@@ -2,7 +2,7 @@
   "keyboard_name": "Not So MiniDox",
   "url": "",
   "maintainer": "qmk",
-  "width": 12,
+  "width": 14,
   "height": 5.75,
   "layouts": {
     "LAYOUT": {
diff --git a/keyboards/handwired/ortho5x13/info.json b/keyboards/handwired/ortho5x13/info.json
index 15a65081a..886bfe028 100644
--- a/keyboards/handwired/ortho5x13/info.json
+++ b/keyboards/handwired/ortho5x13/info.json
@@ -3,7 +3,7 @@
     "url": "",
     "maintainer": "qmk",
     "width": 13,
-    "height": 6,
+    "height": 5,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json
index edab78860..65b08d615 100644
--- a/keyboards/handwired/prime_exl/info.json
+++ b/keyboards/handwired/prime_exl/info.json
@@ -2,8 +2,8 @@
   "keyboard_name": "Prime_EXL",
   "url": "https://www.primekb.com",
   "maintainer": "holtenc",
-  "width": 18,
-  "height": 5,
+  "width": 20.75,
+  "height": 6,
   "layouts": {
       "LAYOUT": {
           "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":6.5,"y":0,"w":1,"h":1}, {"x":7.5,"y":0,"w":1,"h":1}, {"x":8.5,"y":0,"w":1,"h":1}, {"x":9.5,"y":0,"w":1,"h":1}, {"x":10.5,"y":0,"w":1,"h":1}, {"x":11.5,"y":0,"w":1,"h":1}, {"x":13.75,"y":0,"w":1,"h":1}, {"x":14.75,"y":0,"w":1,"h":1}, {"x":15.75,"y":0,"w":1,"h":1}, {"x":16.75,"y":0,"w":1,"h":1}, {"x":17.75,"y":0,"w":1,"h":1}, {"x":18.75,"y":0,"w":2,"h":1}, {"x":0,"y":1,"w":1,"h":1}, {"x":1,"y":1,"w":1,"h":1}, {"x":2,"y":1,"w":1,"h":1}, {"x":3,"y":1,"w":1,"h":1}, {"x":4,"y":1,"w":1,"h":1}, {"x":5,"y":1,"w":1,"h":1}, {"x":6.5,"y":1,"w":1.26,"h":1}, {"x":7.75,"y":1,"w":1,"h":1}, {"x":8.75,"y":1,"w":1,"h":1}, {"x":9.75,"y":1,"w":1,"h":1}, {"x":10.75,"y":1,"w":1,"h":1}, {"x":11.75,"y":1,"w":1,"h":1}, {"x":14,"y":1,"w":1,"h":1}, {"x":15,"y":1,"w":1,"h":1}, {"x":16,"y":1,"w":1,"h":1}, {"x":17,"y":1,"w":1,"h":1}, {"x":18,"y":1,"w":1,"h":1}, {"x":19,"y":1,"w":1.75,"h":1}, {"x":0,"y":2,"w":1,"h":1}, {"x":1,"y":2,"w":1,"h":1}, {"x":2,"y":2,"w":1,"h":1}, {"x":3,"y":2,"w":1,"h":1}, {"x":4,"y":2,"w":1,"h":1}, {"x":5,"y":2,"w":1,"h":1}, {"x":6.5,"y":2,"w":1.75,"h":1}, {"x":8.25,"y":2,"w":1,"h":1}, {"x":9.25,"y":2,"w":1,"h":1}, {"x":10.25,"y":2,"w":1,"h":1}, {"x":11.25,"y":2,"w":1,"h":1}, {"x":12.25,"y":2,"w":1,"h":1}, {"x":13.5,"y":2,"w":1,"h":1}, {"x":14.5,"y":2,"w":1,"h":1}, {"x":15.5,"y":2,"w":1,"h":1}, {"x":16.5,"y":2,"w":1,"h":1}, {"x":17.5,"y":2,"w":1,"h":1}, {"x":18.5,"y":2,"w":1,"h":1}, {"x":19.5,"y":2,"w":1.25,"h":1}, {"x":0,"y":3,"w":1,"h":1}, {"x":1,"y":3,"w":1,"h":1}, {"x":2,"y":3,"w":1,"h":1}, {"x":3,"y":3,"w":1,"h":1}, {"x":4,"y":3,"w":1,"h":1}, {"x":5,"y":3,"w":1,"h":1}, {"x":6.5,"y":3,"w":1.25,"h":1}, {"x":7.75,"y":3,"w":1.25,"h":1}, {"x":9,"y":3,"w":1,"h":1}, {"x":10,"y":3,"w":1,"h":1}, {"x":11,"y":3,"w":2,"h":1}, {"x":13.5,"y":3,"w":2,"h":1}, {"x":15.5,"y":3,"w":1,"h":1}, {"x":16.5,"y":3,"w":1,"h":1}, {"x":17.5,"y":3,"w":1.5,"h":1}, {"x":19,"y":3,"w":1.5,"h":1}, {"x":0,"y":4,"w":1,"h":1}, {"x":1,"y":4,"w":1,"h":1}, {"x":2,"y":4,"w":1,"h":1}, {"x":3,"y":4,"w":1,"h":1}, {"x":4,"y":4,"w":1,"h":1}, {"x":5,"y":4,"w":1,"h":1}]
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json
index 2742ffa64..7b2d43d61 100644
--- a/keyboards/handwired/promethium/info.json
+++ b/keyboards/handwired/promethium/info.json
@@ -3,7 +3,7 @@
   "url": "",
   "maintainer": "qmk",
   "width": 16,
-  "height": 5,
+  "height": 4.5,
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/handwired/tradestation/info.json b/keyboards/handwired/tradestation/info.json
index e59c217cb..233eb6282 100644
--- a/keyboards/handwired/tradestation/info.json
+++ b/keyboards/handwired/tradestation/info.json
@@ -3,7 +3,7 @@
     "url": "",
     "maintainer": "Flehrad",
     "width": 4.375,
-    "height": 4.375,
+    "height": 4.5,
     "layouts": {
         "LAYOUT_tradestation": {
             "layout": [{"x":0, "y":0},{"x":1.125, "y":0},{"x":2.25, "y":0},{"x":3.375, "y":0},{"x":0, "y":1.1},{"x":1.125, "y":1.1},{"x":2.25, "y":1.1},{"x":3.375, "y":1.1},{"x":0, "y":2.25, "w":2},{"x":2.25, "y":2.25, "w":2},{"x":0, "y":3.5, "w":2},{"x":2.25, "y":3.5, "w":2}]
diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json
index f9952e790..28883b265 100644
--- a/keyboards/kbdfans/kbd4x/info.json
+++ b/keyboards/kbdfans/kbd4x/info.json
@@ -2,7 +2,7 @@
     "keyboard_name": "kbd4x",
     "url": "",
     "maintainer": "qmk",
-    "width": 14,
+    "width": 12,
     "height": 4,
     "layouts": {
         "LAYOUT_planck_mit": {
diff --git a/keyboards/keebio/iris/info.json b/keyboards/keebio/iris/info.json
index f7b017b97..37806975f 100644
--- a/keyboards/keebio/iris/info.json
+++ b/keyboards/keebio/iris/info.json
@@ -2,8 +2,8 @@
     "keyboard_name": "Iris",
     "url": "https://keeb.io",
     "maintainer": "Keebio",
-    "width": 14.5,
-    "height": 5,
+    "width": 15,
+    "height": 5.75,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/orthodox/rev1/info.json b/keyboards/orthodox/rev1/info.json
index 0a8442cf4..83180aa15 100644
--- a/keyboards/orthodox/rev1/info.json
+++ b/keyboards/orthodox/rev1/info.json
@@ -1,8 +1,8 @@
 {
   "keyboard_name": "Monkeebs Orthodox Rev.1",
   "maintainer": "drashna",
-  "width": 17,
-  "height": 17.24,
+  "width": 19,
+  "height": 5,
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/orthodox/rev3/info.json b/keyboards/orthodox/rev3/info.json
index 289169d72..c98c9f232 100644
--- a/keyboards/orthodox/rev3/info.json
+++ b/keyboards/orthodox/rev3/info.json
@@ -1,8 +1,8 @@
 {
   "keyboard_name": "Monkeebs Orthodox Rev.3",
   "maintainer": "drashna",
-  "width": 17,
-  "height": 17.24,
+  "width": 19,
+  "height": 5,
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/orthodox/rev3_teensy/info.json b/keyboards/orthodox/rev3_teensy/info.json
index d578a4134..5781c08f8 100644
--- a/keyboards/orthodox/rev3_teensy/info.json
+++ b/keyboards/orthodox/rev3_teensy/info.json
@@ -1,8 +1,8 @@
 {
   "keyboard_name": "Monkeebs Orthodox Rev.3 (Teensy)",
   "maintainer": "drashna",
-  "width": 17,
-  "height": 17.24,
+  "width": 19,
+  "height": 5,
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json
index 0b762388e..3dd6b3ec7 100644
--- a/keyboards/qwertyydox/info.json
+++ b/keyboards/qwertyydox/info.json
@@ -5,8 +5,8 @@
   "url": "",
   "maintainer": "qmk",
   "processor": "atmega32u4",
-  "width": 14,
-  "height": 4,
+  "width": 16,
+  "height": 5,
   "layouts": {
     "LAYOUT": {
       "key_count": 53,
diff --git a/keyboards/speedo/info.json b/keyboards/speedo/info.json
index b0bb87b6e..3f4b7b279 100644
--- a/keyboards/speedo/info.json
+++ b/keyboards/speedo/info.json
@@ -4,7 +4,7 @@
   "maintainer": "qmk",
   "bootloader": "",
   "width": 15,
-  "height": 6,
+  "height": 6.5,
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"k00", "x":0, "y":0.375}, {"label":"k01", "x":1, "y":0.375}, {"label":"k02", "x":2, "y":0.25}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0.25}, {"label":"k05", "x":5, "y":0.5}, {"label":"k06", "x":9, "y":0.5}, {"label":"k07", "x":10, "y":0.25}, {"label":"k08", "x":11, "y":0}, {"label":"k09", "x":12, "y":0.25}, {"label":"k10", "x":13, "y":0.375}, {"label":"k11", "x":14, "y":0.375}, {"label":"k12", "x":0, "y":1.375}, {"label":"k13", "x":1, "y":1.375}, {"label":"k14", "x":2, "y":1.25}, {"label":"k15", "x":3, "y":1}, {"label":"k16", "x":4, "y":1.25}, {"label":"k17", "x":5, "y":1.5}, {"label":"k18", "x":7, "y":2}, {"label":"k19", "x":9, "y":1.5}, {"label":"k20", "x":10, "y":1.25}, {"label":"k21", "x":11, "y":1}, {"label":"k22", "x":12, "y":1.25}, {"label":"k23", "x":13, "y":1.375}, {"label":"k24", "x":14, "y":1.375}, {"label":"k25", "x":0, "y":2.375}, {"label":"k26", "x":1, "y":2.375}, {"label":"k27", "x":2, "y":2.25}, {"label":"k28", "x":3, "y":2}, {"label":"k29", "x":4, "y":2.25}, {"label":"k30", "x":5, "y":2.5}, {"label":"k31", "x":7, "y":3}, {"label":"k32", "x":9, "y":2.5}, {"label":"k33", "x":10, "y":2.25}, {"label":"k34", "x":11, "y":2}, {"label":"k35", "x":12, "y":2.25}, {"label":"k36", "x":13, "y":2.375}, {"label":"k37", "x":14, "y":2.375}, {"label":"k38", "x":0, "y":3.375}, {"label":"k39", "x":1, "y":3.375}, {"label":"k40", "x":2, "y":3.25}, {"label":"k41", "x":3, "y":3}, {"label":"k42", "x":4, "y":3.25}, {"label":"k43", "x":5, "y":3.5}, {"label":"k44", "x":6.5, "y":4}, {"label":"k45", "x":7.5, "y":4}, {"label":"k46", "x":9, "y":3.5}, {"label":"k47", "x":10, "y":3.25}, {"label":"k48", "x":11, "y":3}, {"label":"k49", "x":12, "y":3.25}, {"label":"k50", "x":13, "y":3.375}, {"label":"k51", "x":14, "y":3.375}, {"label":"k52", "x":0, "y":4.375}, {"label":"k53", "x":1, "y":4.375}, {"label":"k54", "x":2, "y":4.25}, {"label":"k55", "x":3, "y":4}, {"label":"k56", "x":4, "y":4.25}, {"label":"k57", "x":5.5, "y":5}, {"label":"k58", "x":6.5, "y":5.5}, {"label":"k59", "x":7.5, "y":5.5}, {"label":"k60", "x":8.5, "y":5}, {"label":"k61", "x":10, "y":4.25}, {"label":"k62", "x":11, "y":4}, {"label":"k63", "x":12, "y":4.25}, {"label":"k64", "x":13, "y":4.375}, {"label":"k65", "x":14, "y":4.375}]
diff --git a/keyboards/xd87/info.json b/keyboards/xd87/info.json
index 3837358cd..488f31927 100644
--- a/keyboards/xd87/info.json
+++ b/keyboards/xd87/info.json
@@ -3,7 +3,7 @@
   "url": "",
   "maintainer": "qmk",
   "width": 18.25,
-  "height": 7.25,
+  "height": 6.25,
   "layouts": {
     "LAYOUT_all": {
       "layout": [