diff --git a/data/keyboards/geometry/compact.xml b/data/keyboards/geometry/compact.xml
index 141aafe7..d2ef4914 100644
--- a/data/keyboards/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@@ -3,51 +3,51 @@
   <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
   <section angle="0">
     <row orientation="1">
-      <key name="AD01" keycode="24" oref="outline2" />
-      <key name="AD02" keycode="25" oref="outline2" />
-      <key name="AD03" keycode="26" oref="outline2" />
-      <key name="AD04" keycode="27" oref="outline2" />
-      <key name="AD05" keycode="28" oref="outline2" />
-      <key name="AD06" keycode="29" oref="outline2" />
-      <key name="AD07" keycode="30" oref="outline2" />
-      <key name="AD08" keycode="31" oref="outline2" />
-      <key name="AD09" keycode="32" oref="outline2" />
-      <key name="AD10" keycode="33" oref="outline2" />
+      <key keycode="24" name="AD01" oref="outline2" />
+      <key keycode="25" name="AD02" oref="outline2" />
+      <key keycode="26" name="AD03" oref="outline2" />
+      <key keycode="27" name="AD04" oref="outline2" />
+      <key keycode="28" name="AD05" oref="outline2" />
+      <key keycode="29" name="AD06" oref="outline2" />
+      <key keycode="30" name="AD07" oref="outline2" />
+      <key keycode="31" name="AD08" oref="outline2" />
+      <key keycode="32" name="AD09" oref="outline2" />
+      <key keycode="33" name="AD10" oref="outline2" />
     </row>
   </section>
   <section angle="0">
     <row orientation="1">
-      <key name="AC01" keycode="38" oref="outline2" />
-      <key name="AC02" keycode="39" oref="outline2" />
-      <key name="AC03" keycode="40" oref="outline2" />
-      <key name="AC04" keycode="41" oref="outline2" />
-      <key name="AC05" keycode="42" oref="outline2" />
-      <key name="AC06" keycode="43" oref="outline2" />
-      <key name="AC07" keycode="44" oref="outline2" />
-      <key name="AC08" keycode="45" oref="outline2" />
-      <key name="AC09" keycode="46" oref="outline2" />
+      <key keycode="38" name="AC01" oref="outline2" />
+      <key keycode="39" name="AC02" oref="outline2" />
+      <key keycode="40" name="AC03" oref="outline2" />
+      <key keycode="41" name="AC04" oref="outline2" />
+      <key keycode="42" name="AC05" oref="outline2" />
+      <key keycode="43" name="AC06" oref="outline2" />
+      <key keycode="44" name="AC07" oref="outline2" />
+      <key keycode="45" name="AC08" oref="outline2" />
+      <key keycode="46" name="AC09" oref="outline2" />
     </row>
   </section>
   <section angle="0">
     <row orientation="1">
-      <key name="LFSH" keycode="50" oref="altline" />
-      <key name="AB01" keycode="52" oref="outline2" />
-      <key name="AB02" keycode="53" oref="outline2" />
-      <key name="AB03" keycode="54" oref="outline2" />
-      <key name="AB04" keycode="55" oref="outline2" />
-      <key name="AB05" keycode="56" oref="outline2" />
-      <key name="AB06" keycode="57" oref="outline2" />
-      <key name="AB07" keycode="58" oref="outline2" />
-      <key name="BKSP" keycode="22" oref="altline" />
+      <key keycode="50" name="LFSH" oref="altline" />
+      <key keycode="52" name="AB01" oref="outline2" />
+      <key keycode="53" name="AB02" oref="outline2" />
+      <key keycode="54" name="AB03" oref="outline2" />
+      <key keycode="55" name="AB04" oref="outline2" />
+      <key keycode="56" name="AB05" oref="outline2" />
+      <key keycode="57" name="AB06" oref="outline2" />
+      <key keycode="58" name="AB07" oref="outline2" />
+      <key keycode="22" name="BKSP" oref="altline" />
     </row>
   </section>
   <section angle="0">
     <row orientation="1">
-      <key name="ABC123" keycode="0" oref="altline" />
-      <key name="I149" keycode="149" oref="altline" />
-      <key name="SPCE" keycode="65" oref="spaceline" />
-      <key name="AB08" keycode="59" oref="outline2" />
-      <key name="RTRN" keycode="36" oref="outline7" />
+      <key keycode="0" name="ABC123" oref="altline" />
+      <key keycode="149" name="I149" oref="altline" />
+      <key keycode="65" name="SPCE" oref="spaceline" />
+      <key keycode="59" name="AB08" oref="outline2" />
+      <key keycode="36" name="RTRN" oref="outline7" />
     </row>
   </section>
   <outline id="outline2" corner-radius="1.000000">
diff --git a/data/keyboards/geometry/extended.xml b/data/keyboards/geometry/extended.xml
index 50938efb..f855cebc 100644
--- a/data/keyboards/geometry/extended.xml
+++ b/data/keyboards/geometry/extended.xml
@@ -7,54 +7,54 @@
        values in the range from 8 to 255. -->
   <section angle="0">
     <row orientation="1">
-      <key name="AD01" keycode="24" oref="outline2" />
-      <key name="AD02" keycode="25" oref="outline2" />
-      <key name="AD03" keycode="26" oref="outline2" />
-      <key name="AD04" keycode="27" oref="outline2" />
-      <key name="AD05" keycode="28" oref="outline2" />
-      <key name="AD06" keycode="29" oref="outline2" />
-      <key name="AD07" keycode="30" oref="outline2" />
-      <key name="AD08" keycode="31" oref="outline2" />
-      <key name="AD09" keycode="32" oref="outline2" />
-      <key name="AD10" keycode="33" oref="outline2" />
-      <key name="AD11" keycode="34" oref="outline2" />
+      <key keycode="24" name="AD01" oref="outline2" />
+      <key keycode="25" name="AD02" oref="outline2" />
+      <key keycode="26" name="AD03" oref="outline2" />
+      <key keycode="27" name="AD04" oref="outline2" />
+      <key keycode="28" name="AD05" oref="outline2" />
+      <key keycode="29" name="AD06" oref="outline2" />
+      <key keycode="30" name="AD07" oref="outline2" />
+      <key keycode="31" name="AD08" oref="outline2" />
+      <key keycode="32" name="AD09" oref="outline2" />
+      <key keycode="33" name="AD10" oref="outline2" />
+      <key keycode="34" name="AD11" oref="outline2" />
     </row>
   </section>
   <section angle="0">
     <row orientation="1">
-      <key name="AC01" keycode="38" oref="outline2" />
-      <key name="AC02" keycode="39" oref="outline2" />
-      <key name="AC03" keycode="40" oref="outline2" />
-      <key name="AC04" keycode="41" oref="outline2" />
-      <key name="AC05" keycode="42" oref="outline2" />
-      <key name="AC06" keycode="43" oref="outline2" />
-      <key name="AC07" keycode="44" oref="outline2" />
-      <key name="AC08" keycode="45" oref="outline2" />
-      <key name="AC09" keycode="46" oref="outline2" />
-      <key name="AC10" keycode="47" oref="outline2" />
-      <key name="AC11" keycode="48" oref="outline2" />
+      <key keycode="38" name="AC01" oref="outline2" />
+      <key keycode="39" name="AC02" oref="outline2" />
+      <key keycode="40" name="AC03" oref="outline2" />
+      <key keycode="41" name="AC04" oref="outline2" />
+      <key keycode="42" name="AC05" oref="outline2" />
+      <key keycode="43" name="AC06" oref="outline2" />
+      <key keycode="44" name="AC07" oref="outline2" />
+      <key keycode="45" name="AC08" oref="outline2" />
+      <key keycode="46" name="AC09" oref="outline2" />
+      <key keycode="47" name="AC10" oref="outline2" />
+      <key keycode="48" name="AC11" oref="outline2" />
     </row>
   </section>
   <section angle="0">
     <row orientation="1">
-      <key name="LFSH" keycode="50" oref="altline" />
-      <key name="AB01" keycode="52" oref="outline2" />
-      <key name="AB02" keycode="53" oref="outline2" />
-      <key name="AB03" keycode="54" oref="outline2" />
-      <key name="AB04" keycode="55" oref="outline2" />
-      <key name="AB05" keycode="56" oref="outline2" />
-      <key name="AB06" keycode="57" oref="outline2" />
-      <key name="AB07" keycode="58" oref="outline2" />
-      <key name="BKSP" keycode="22" oref="altline" />
+      <key keycode="50" name="LFSH" oref="altline" />
+      <key keycode="52" name="AB01" oref="outline2" />
+      <key keycode="53" name="AB02" oref="outline2" />
+      <key keycode="54" name="AB03" oref="outline2" />
+      <key keycode="55" name="AB04" oref="outline2" />
+      <key keycode="56" name="AB05" oref="outline2" />
+      <key keycode="57" name="AB06" oref="outline2" />
+      <key keycode="58" name="AB07" oref="outline2" />
+      <key keycode="22" name="BKSP" oref="altline" />
     </row>
   </section>
   <section angle="0">
     <row orientation="1">
-      <key name="ABC123" keycode="0" oref="altline" />
-      <key name="I149" keycode="149" oref="altline" />
-      <key name="SPCE" keycode="65" oref="spaceline" />
-      <key name="AB08" keycode="59" oref="outline2" />
-      <key name="RTRN" keycode="36" oref="outline7" />
+      <key keycode="0" name="ABC123" oref="altline" />
+      <key keycode="149" name="I149" oref="altline" />
+      <key keycode="65" name="SPCE" oref="spaceline" />
+      <key keycode="59" name="AB08" oref="outline2" />
+      <key keycode="36" name="RTRN" oref="outline7" />
     </row>
   </section>
   <outline id="outline2" corner-radius="1.000000">