diff --git a/keyboards/xd96/info.json b/keyboards/xd96/info.json
index f18068273..2d678414c 100644
--- a/keyboards/xd96/info.json
+++ b/keyboards/xd96/info.json
@@ -7,11 +7,231 @@
   "layouts": {  
     "LAYOUT_96_ansi": {
       "key_count": 99,
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Insert", "x":13, "y":0}, {"label":"Delete", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"End", "x":16, "y":0}, {"label":"PgUp", "x":17, "y":0}, {"label":"PgDn", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"+", "x":18, "y":2, "h":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}]
+      "layout": [
+        {"label":"Esc", "x":0, "y":0},
+        {"label":"F1", "x":1, "y":0},
+        {"label":"F2", "x":2, "y":0},
+        {"label":"F3", "x":3, "y":0},
+        {"label":"F4", "x":4, "y":0},
+        {"label":"F5", "x":5, "y":0},
+        {"label":"F6", "x":6, "y":0},
+        {"label":"F7", "x":7, "y":0},
+        {"label":"F8", "x":8, "y":0},
+        {"label":"F9", "x":9, "y":0},
+        {"label":"F10", "x":10, "y":0},
+        {"label":"F11", "x":11, "y":0},
+        {"label":"F12", "x":12, "y":0},
+        {"label":"Insert", "x":13, "y":0},
+        {"label":"Delete", "x":14, "y":0},
+        {"label":"Home", "x":15, "y":0},
+        {"label":"End", "x":16, "y":0},
+        {"label":"PgUp", "x":17, "y":0},
+        {"label":"PgDn", "x":18, "y":0},
+
+        {"label":"~", "x":0, "y":1},
+        {"label":"!", "x":1, "y":1},
+        {"label":"@", "x":2, "y":1},
+        {"label":"#", "x":3, "y":1},
+        {"label":"$", "x":4, "y":1},
+        {"label":"%", "x":5, "y":1},
+        {"label":"^", "x":6, "y":1},
+        {"label":"&", "x":7, "y":1},
+        {"label":"*", "x":8, "y":1},
+        {"label":"(", "x":9, "y":1},
+        {"label":")", "x":10, "y":1},
+        {"label":"_", "x":11, "y":1},
+        {"label":"+", "x":12, "y":1},
+        {"label":"Backspace", "x":13, "y":1, "w":2},
+
+        {"label":"Num Lock", "x":15, "y":1},
+        {"label":"/", "x":16, "y":1},
+        {"label":"*", "x":17, "y":1},
+        {"label":"-", "x":18, "y":1},
+
+        {"label":"Tab", "x":0, "y":2, "w":1.5},
+        {"label":"Q", "x":1.5, "y":2},
+        {"label":"W", "x":2.5, "y":2},
+        {"label":"E", "x":3.5, "y":2},
+        {"label":"R", "x":4.5, "y":2},
+        {"label":"T", "x":5.5, "y":2},
+        {"label":"Y", "x":6.5, "y":2},
+        {"label":"U", "x":7.5, "y":2},
+        {"label":"I", "x":8.5, "y":2},
+        {"label":"O", "x":9.5, "y":2},
+        {"label":"P", "x":10.5, "y":2},
+        {"label":"{", "x":11.5, "y":2},
+        {"label":"}", "x":12.5, "y":2},
+        {"label":"|", "x":13.5, "y":2, "w":1.5},
+        {"label":"7", "x":15, "y":2},
+        {"label":"8", "x":16, "y":2},
+        {"label":"9", "x":17, "y":2},
+
+        {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
+        {"label":"A", "x":1.75, "y":3},
+        {"label":"S", "x":2.75, "y":3},
+        {"label":"D", "x":3.75, "y":3},
+        {"label":"F", "x":4.75, "y":3},
+        {"label":"G", "x":5.75, "y":3},
+        {"label":"H", "x":6.75, "y":3},
+        {"label":"J", "x":7.75, "y":3},
+        {"label":"K", "x":8.75, "y":3},
+        {"label":"L", "x":9.75, "y":3},
+        {"label":":", "x":10.75, "y":3},
+        {"label":"\"", "x":11.75, "y":3},
+        {"label":"Enter", "x":12.75, "y":3, "w":2.25},
+
+        {"label":"4", "x":15, "y":3},
+        {"label":"5", "x":16, "y":3},
+        {"label":"6", "x":17, "y":3},
+        {"label":"+", "x":18, "y":2, "h":2},
+
+        {"label":"Shift", "x":0, "y":4, "w":2.25},
+        {"label":"Z", "x":2.25, "y":4},
+        {"label":"X", "x":3.25, "y":4},
+        {"label":"C", "x":4.25, "y":4},
+        {"label":"V", "x":5.25, "y":4},
+        {"label":"B", "x":6.25, "y":4},
+        {"label":"N", "x":7.25, "y":4},
+        {"label":"M", "x":8.25, "y":4},
+        {"label":"<", "x":9.25, "y":4},
+        {"label":">", "x":10.25, "y":4},
+        {"label":"?", "x":11.25, "y":4},
+        {"label":"Shift", "x":12.25, "y":4, "w":1.75},
+        {"label":"\u2191", "x":14, "y":4},
+
+        {"label":"1", "x":15, "y":4},
+        {"label":"2", "x":16, "y":4},
+        {"label":"3", "x":17, "y":4},
+
+        {"label":"Ctrl", "x":0, "y":5, "w":1.25},
+        {"label":"Win", "x":1.25, "y":5, "w":1.25},
+        {"label":"Alt", "x":2.5, "y":5, "w":1.25},
+        {"x":3.75, "y":5, "w":6.25},
+        {"label":"Alt", "x":10, "y":5, "w":1.5},
+        {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
+        {"label":"\u2190", "x":13, "y":5},
+        {"label":"\u2193", "x":14, "y":5},
+        {"label":"\u2192", "x":15, "y":5},
+
+        {"label":"0", "x":16, "y":5},
+        {"label":".", "x":17, "y":5},
+        {"label":"Enter", "x":18, "y":4, "h":2}
+      ]
     },
     "LAYOUT_96_iso": {
       "key_count": 100,
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Insert", "x":13, "y":0}, {"label":"Delete", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"End", "x":16, "y":0}, {"label":"PgUp", "x":17, "y":0}, {"label":"PgDn", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"\"", "x":2, "y":1}, {"label":"\u00a3", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"+", "x":18, "y":2, "h":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"@", "x":11.75, "y":3}, {"label":"~", "x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"|", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}]
+      "layout": [
+        {"label":"Esc", "x":0, "y":0},
+        {"label":"F1", "x":1, "y":0},
+        {"label":"F2", "x":2, "y":0},
+        {"label":"F3", "x":3, "y":0},
+        {"label":"F4", "x":4, "y":0},
+        {"label":"F5", "x":5, "y":0},
+        {"label":"F6", "x":6, "y":0},
+        {"label":"F7", "x":7, "y":0},
+        {"label":"F8", "x":8, "y":0},
+        {"label":"F9", "x":9, "y":0},
+        {"label":"F10", "x":10, "y":0},
+        {"label":"F11", "x":11, "y":0},
+        {"label":"F12", "x":12, "y":0},
+        {"label":"Insert", "x":13, "y":0},
+        {"label":"Delete", "x":14, "y":0},
+        {"label":"Home", "x":15, "y":0},
+        {"label":"End", "x":16, "y":0},
+        {"label":"PgUp", "x":17, "y":0},
+        {"label":"PgDn", "x":18, "y":0},
+
+        {"label":"~", "x":0, "y":1},
+        {"label":"!", "x":1, "y":1},
+        {"label":"\"", "x":2, "y":1},
+        {"label":"\u00a3", "x":3, "y":1},
+        {"label":"$", "x":4, "y":1},
+        {"label":"%", "x":5, "y":1},
+        {"label":"^", "x":6, "y":1},
+        {"label":"&", "x":7, "y":1},
+        {"label":"*", "x":8, "y":1},
+        {"label":"(", "x":9, "y":1},
+        {"label":")", "x":10, "y":1},
+        {"label":"_", "x":11, "y":1},
+        {"label":"+", "x":12, "y":1},
+        {"label":"Backspace", "x":13, "y":1, "w":2},
+
+        {"label":"Num Lock", "x":15, "y":1},
+        {"label":"/", "x":16, "y":1},
+        {"label":"*", "x":17, "y":1},
+        {"label":"-", "x":18, "y":1},
+
+        {"label":"Tab", "x":0, "y":2, "w":1.5},
+        {"label":"Q", "x":1.5, "y":2},
+        {"label":"W", "x":2.5, "y":2},
+        {"label":"E", "x":3.5, "y":2},
+        {"label":"R", "x":4.5, "y":2},
+        {"label":"T", "x":5.5, "y":2},
+        {"label":"Y", "x":6.5, "y":2},
+        {"label":"U", "x":7.5, "y":2},
+        {"label":"I", "x":8.5, "y":2},
+        {"label":"O", "x":9.5, "y":2},
+        {"label":"P", "x":10.5, "y":2},
+        {"label":"{", "x":11.5, "y":2},
+        {"label":"}", "x":12.5, "y":2},
+
+        {"label":"7", "x":15, "y":2},
+        {"label":"8", "x":16, "y":2},
+        {"label":"9", "x":17, "y":2},
+
+        {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
+        {"label":"A", "x":1.75, "y":3},
+        {"label":"S", "x":2.75, "y":3},
+        {"label":"D", "x":3.75, "y":3},
+        {"label":"F", "x":4.75, "y":3},
+        {"label":"G", "x":5.75, "y":3},
+        {"label":"H", "x":6.75, "y":3},
+        {"label":"J", "x":7.75, "y":3},
+        {"label":"K", "x":8.75, "y":3},
+        {"label":"L", "x":9.75, "y":3},
+        {"label":":", "x":10.75, "y":3},
+        {"label":"@", "x":11.75, "y":3},
+        {"label":"~", "x":12.75, "y":3},
+        {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
+
+        {"label":"4", "x":15, "y":3},
+        {"label":"5", "x":16, "y":3},
+        {"label":"6", "x":17, "y":3},
+        {"label":"+", "x":18, "y":2, "h":2},
+
+        {"label":"Shift", "x":0, "y":4, "w":1.25},
+        {"label":"|", "x":1.25, "y":4},
+        {"label":"Z", "x":2.25, "y":4},
+        {"label":"X", "x":3.25, "y":4},
+        {"label":"C", "x":4.25, "y":4},
+        {"label":"V", "x":5.25, "y":4},
+        {"label":"B", "x":6.25, "y":4},
+        {"label":"N", "x":7.25, "y":4},
+        {"label":"M", "x":8.25, "y":4},
+        {"label":"<", "x":9.25, "y":4},
+        {"label":">", "x":10.25, "y":4},
+        {"label":"?", "x":11.25, "y":4},
+        {"label":"Shift", "x":12.25, "y":4, "w":1.75},
+        {"label":"\u2191", "x":14, "y":4},
+
+        {"label":"1", "x":15, "y":4},
+        {"label":"2", "x":16, "y":4},
+        {"label":"3", "x":17, "y":4},
+
+        {"label":"Ctrl", "x":0, "y":5, "w":1.25},
+        {"label":"Win", "x":1.25, "y":5, "w":1.25},
+        {"label":"Alt", "x":2.5, "y":5, "w":1.25},
+        {"x":3.75, "y":5, "w":6.25},
+        {"label":"Alt", "x":10, "y":5, "w":1.5},
+        {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
+        {"label":"\u2190", "x":13, "y":5},
+        {"label":"\u2193", "x":14, "y":5},
+        {"label":"\u2192", "x":15, "y":5},
+
+        {"label":"0", "x":16, "y":5},
+        {"label":".", "x":17, "y":5},
+        {"label":"Enter", "x":18, "y":4, "h":2}
+      ]
     }
   }
 }