diff --git a/keyboards/id80/config.h b/keyboards/id80/config.h
index 12ee5400c..936fd5b2e 100644
--- a/keyboards/id80/config.h
+++ b/keyboards/id80/config.h
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DESCRIPTION     A 75% hotswap keyboard
 
 /* key matrix size */
-#define MATRIX_ROWS 11
-#define MATRIX_COLS 9
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 11
 
 /*
  * Keyboard Matrix Assignments
@@ -41,16 +41,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  * The matrix description in the vendor-supplied JSON file for kbfirmware.com
- * had 12 rows:
+ * had 9 columns:
+ *     { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+ * and 12 rows:
  *     { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
  * However, the row 6 was completely empty, and the pin F0 was not actually
  * routed anywhere on the PCB, therefore this row was removed to save some
  * resources (the EEPROM space for dynamic keymaps is especially scarce).
+ *
+ * After doing the above change, the matrix was transposed (rows and columns
+ * were swapped), because a matrix with the COL2ROW layout can be scanned much
+ * more efficiently than a matrix with the ROW2COL layout (depending on various
+ * optimizations, the difference in scan rate can be over 2 times).  Because of
+ * this, the "columns" in the matrix layout now mostly correspond to physical
+ * rows, and the "rows" have mostly vertical physical orientation.
  */
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, E6, F1, F4, F5, F6, F7 }
 
-#define DIODE_DIRECTION ROW2COL
+#define DIODE_DIRECTION COL2ROW
 
 #define BACKLIGHT_PIN B6
 // #define BACKLIGHT_BREATHING
@@ -81,8 +90,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 /* Bootmagic Lite key configuration: use the Esc key */
-#define BOOTMAGIC_LITE_ROW      5
-#define BOOTMAGIC_LITE_COLUMN   0
-
-// partially generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
+#define BOOTMAGIC_LITE_ROW      0
+#define BOOTMAGIC_LITE_COLUMN   5
diff --git a/keyboards/id80/id80.h b/keyboards/id80/id80.h
index 2f2cab71b..94626fe4f 100644
--- a/keyboards/id80/id80.h
+++ b/keyboards/id80/id80.h
@@ -25,18 +25,13 @@
     K10,       K12, K13, K14, K15, K16, K17, K18, K68, K67, K65, K64,      K63,       \
     K00,  K01,  K02,              K06,                K08,   K07,     K05, K04, K03   \
 ) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
-    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58   }, \
-    { KC_NO, KC_NO, KC_NO, K63,   K64,   K65,   KC_NO, K67,   K68   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K74,   K75,   KC_NO, K77,   K78   }, \
-    { KC_NO, KC_NO, K82,   K83,   K84,   K85,   KC_NO, K87,   K88   }, \
-    { KC_NO, KC_NO, K92,   KC_NO, K94,   K95,   K96,   K97,   K98   }, \
-    { KC_NO, KC_NO, KA2,   KA3,   KA4,   KA5,   KA6,   KA7,   KC_NO }, \
+    { K00,   K10,   K20,   K30,   K40,   K50,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { K01,   KC_NO, K21,   K31,   K41,   K51,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { K02,   K12,   K22,   K32,   K42,   K52,   KC_NO, KC_NO, K82,   K92,   KA2   }, \
+    { K03,   K13,   K23,   K33,   K43,   K53,   K63,   KC_NO, K83,   KC_NO, KA3   }, \
+    { K04,   K14,   K24,   K34,   K44,   K54,   K64,   K74,   K84,   K94,   KA4   }, \
+    { K05,   K15,   K25,   K35,   K45,   K55,   K65,   K75,   K85,   K95,   KA5   }, \
+    { K06,   K16,   K26,   K36,   K46,   K56,   KC_NO, KC_NO, KC_NO, K96,   KA6   }, \
+    { K07,   K17,   K27,   K37,   K47,   K57,   K67,   K77,   K87,   K97,   KA7   }, \
+    { K08,   K18,   K28,   K38,   K48,   K58,   K68,   K78,   K88,   K98,   KC_NO }, \
 }
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/