diff --git a/altgr-weur.keylayout b/altgr-weur.keylayout
index d72d1c0..ac7d595 100644
--- a/altgr-weur.keylayout
+++ b/altgr-weur.keylayout
@@ -1,16 +1,30 @@
 <?xml version="1.1" encoding="UTF-8"?>
 <!DOCTYPE keyboard SYSTEM "file://localhost/System/Library/DTDs/KeyboardLayout.dtd">
-<!--Last edited by Ukelele version 343 on 2021-04-18 at 16:16 (WEST)-->
+<!--Last edited by Ukelele version 359 on 2022-09-25 at 20:12 (WEST)-->
 <keyboard group="126" id="-19905" name="AltGr WEur v1.3" maxout="1">
     <layouts>
-        <layout first="0" last="17" mapSet="16c" modifiers="f4"/>
-        <layout first="18" last="18" mapSet="994" modifiers="f4"/>
-        <layout first="21" last="23" mapSet="994" modifiers="f4"/>
-        <layout first="30" last="30" mapSet="994" modifiers="f4"/>
-        <layout first="194" last="194" mapSet="994" modifiers="f4"/>
-        <layout first="197" last="197" mapSet="994" modifiers="f4"/>
-        <layout first="200" last="201" mapSet="994" modifiers="f4"/>
-        <layout first="206" last="207" mapSet="994" modifiers="f4"/>
+        <layout first="0" last="0" mapSet="ISO" modifiers="f4"/>
+        <layout first="1" last="6" mapSet="ANSI" modifiers="f4"/>
+        <layout first="10" last="10" mapSet="ANSI" modifiers="f4"/>
+        <layout first="12" last="12" mapSet="ANSI" modifiers="f4"/>
+        <layout first="14" last="15" mapSet="ANSI" modifiers="f4"/>
+        <layout first="18" last="18" mapSet="JIS" modifiers="f4"/>
+        <layout first="21" last="23" mapSet="JIS" modifiers="f4"/>
+        <layout first="24" last="24" mapSet="ANSI" modifiers="f4"/>
+        <layout first="27" last="28" mapSet="ANSI" modifiers="f4"/>
+        <layout first="30" last="30" mapSet="JIS" modifiers="f4"/>
+        <layout first="31" last="31" mapSet="ANSI" modifiers="f4"/>
+        <layout first="34" last="34" mapSet="ANSI" modifiers="f4"/>
+        <layout first="37" last="37" mapSet="ANSI" modifiers="f4"/>
+        <layout first="40" last="40" mapSet="ANSI" modifiers="f4"/>
+        <layout first="194" last="194" mapSet="JIS" modifiers="f4"/>
+        <layout first="195" last="195" mapSet="ANSI" modifiers="f4"/>
+        <layout first="197" last="197" mapSet="JIS" modifiers="f4"/>
+        <layout first="198" last="198" mapSet="ANSI" modifiers="f4"/>
+        <layout first="200" last="201" mapSet="JIS" modifiers="f4"/>
+        <layout first="202" last="202" mapSet="ANSI" modifiers="f4"/>
+        <layout first="204" last="204" mapSet="ANSI" modifiers="f4"/>
+        <layout first="206" last="207" mapSet="JIS" modifiers="f4"/>
     </layouts>
     <modifierMap id="f4" defaultIndex="7">
         <keyMapSelect mapIndex="0">
@@ -41,7 +55,7 @@
             <modifier keys="caps? anyOption? command? control"/>
         </keyMapSelect>
     </modifierMap>
-    <keyMapSet id="16c">
+    <keyMapSet id="ISO">
         <keyMap index="0">
             <key code="0" action="a"/>
             <key code="1" action="s"/>
@@ -210,7 +224,7 @@
             <key code="47" action="&#x003E;"/>
             <key code="48" output="&#x0009;"/>
             <key code="49" action="space"/>
-            <key code="50" action="~"/>
+            <key code="50" output="&#x003C;"/>
             <key code="51" output="&#x0008;"/>
             <key code="52" output="&#x0003;"/>
             <key code="53" output="&#x001B;"/>
@@ -951,8 +965,42 @@
             <key code="126" output="&#x001E;"/>
         </keyMap>
     </keyMapSet>
-    <keyMapSet id="994">
-        <keyMap index="0" baseMapSet="16c" baseIndex="0">
+    <keyMapSet id="ANSI">
+        <keyMap index="0" baseMapSet="ISO" baseIndex="0">
+            <key code="10" output=""/>
+            <key code="50" output="`"/>
+        </keyMap>
+        <keyMap index="1" baseMapSet="ISO" baseIndex="1">
+            <key code="10" output=""/>
+            <key code="50" action="~"/>
+        </keyMap>
+        <keyMap index="2" baseMapSet="ISO" baseIndex="2">
+            <key code="10" output=""/>
+            <key code="50" output="`"/>
+        </keyMap>
+        <keyMap index="3" baseMapSet="ISO" baseIndex="3">
+            <key code="10" output=""/>
+            <key code="50" action="`"/>
+        </keyMap>
+        <keyMap index="4" baseMapSet="ISO" baseIndex="4">
+            <key code="10" output=""/>
+            <key code="50" action="~ option"/>
+        </keyMap>
+        <keyMap index="5" baseMapSet="ISO" baseIndex="5">
+            <key code="10" output=""/>
+            <key code="50" action="`"/>
+        </keyMap>
+        <keyMap index="6" baseMapSet="ISO" baseIndex="6">
+            <key code="10" output=""/>
+            <key code="50" output="`"/>
+        </keyMap>
+        <keyMap index="7" baseMapSet="ISO" baseIndex="7">
+            <key code="10" output=""/>
+            <key code="50" output="`"/>
+        </keyMap>
+    </keyMapSet>
+    <keyMapSet id="JIS">
+        <keyMap index="0" baseMapSet="ISO" baseIndex="0">
             <key code="24" output="^"/>
             <key code="30" output="["/>
             <key code="33" output="@"/>
@@ -964,7 +1012,7 @@
             <key code="102" action="space"/>
             <key code="104" action="space"/>
         </keyMap>
-        <keyMap index="1" baseMapSet="16c" baseIndex="1">
+        <keyMap index="1" baseMapSet="ISO" baseIndex="1">
             <key code="19" output="&#x0022;"/>
             <key code="22" output="&#x0026;"/>
             <key code="24" output="~"/>
@@ -984,7 +1032,7 @@
             <key code="102" action="space"/>
             <key code="104" action="space"/>
         </keyMap>
-        <keyMap index="2" baseMapSet="16c" baseIndex="2">
+        <keyMap index="2" baseMapSet="ISO" baseIndex="2">
             <key code="24" output="^"/>
             <key code="30" output="["/>
             <key code="33" output="@"/>
@@ -996,35 +1044,35 @@
             <key code="102" action="space"/>
             <key code="104" action="space"/>
         </keyMap>
-        <keyMap index="3" baseMapSet="16c" baseIndex="3">
+        <keyMap index="3" baseMapSet="ISO" baseIndex="3">
             <key code="93" output="\"/>
             <key code="94" action="`"/>
             <key code="95" output=","/>
             <key code="102" action="space"/>
             <key code="104" action="space"/>
         </keyMap>
-        <keyMap index="4" baseMapSet="16c" baseIndex="4">
+        <keyMap index="4" baseMapSet="ISO" baseIndex="4">
             <key code="93" output="|"/>
             <key code="94" output="`"/>
             <key code="95" output=","/>
             <key code="102" action="space"/>
             <key code="104" action="space"/>
         </keyMap>
-        <keyMap index="5" baseMapSet="16c" baseIndex="5">
+        <keyMap index="5" baseMapSet="ISO" baseIndex="5">
             <key code="93" output="\"/>
             <key code="94" output="`"/>
             <key code="95" output=","/>
             <key code="102" action="space"/>
             <key code="104" action="space"/>
         </keyMap>
-        <keyMap index="6" baseMapSet="16c" baseIndex="6">
+        <keyMap index="6" baseMapSet="ISO" baseIndex="6">
             <key code="93" output="\"/>
             <key code="94" output="_"/>
             <key code="95" output=","/>
             <key code="102" action="space"/>
             <key code="104" action="space"/>
         </keyMap>
-        <keyMap index="7" baseMapSet="16c" baseIndex="7">
+        <keyMap index="7" baseMapSet="ISO" baseIndex="7">
             <key code="93" output="|"/>
             <key code="94" output="_"/>
             <key code="95" output=","/>
@@ -1679,7 +1727,7 @@
             <when state="dead: Ω" output="₎"/>
         </action>
         <action id="~">
-            <when state="none" output="&#x003C;"/>
+            <when state="none" output="~"/>
             <when state="dead: √" output="≈"/>
         </action>
         <action id="~ option">