diff --git a/EurKEY.keylayout b/EurKEY.keylayout
index aa3df94..8a36c71 100644
--- a/EurKEY.keylayout
+++ b/EurKEY.keylayout
@@ -43,22 +43,22 @@
     <keyMapSet id="16c">
         <keyMap index="0">
             <key code="0" action="a"/>
-            <key code="1" output="s"/>
+            <key code="1" action="s"/>
             <key code="2" output="d"/>
             <key code="3" output="f"/>
-            <key code="4" output="h"/>
-            <key code="5" output="g"/>
+            <key code="4" action="h"/>
+            <key code="5" action="g"/>
             <key code="6" output="z"/>
             <key code="7" output="x"/>
-            <key code="8" output="c"/>
+            <key code="8" action="c"/>
             <key code="9" output="v"/>
             <key code="10" output="§"/>
             <key code="11" output="b"/>
             <key code="12" output="q"/>
-            <key code="13" output="w"/>
+            <key code="13" action="w"/>
             <key code="14" action="e"/>
             <key code="15" output="r"/>
-            <key code="16" action="19"/>
+            <key code="16" action="y"/>
             <key code="17" output="t"/>
             <key code="18" output="1"/>
             <key code="19" output="2"/>
@@ -80,7 +80,7 @@
             <key code="35" output="p"/>
             <key code="36" output="&#x000D;"/>
             <key code="37" output="l"/>
-            <key code="38" output="j"/>
+            <key code="38" action="j"/>
             <key code="39" output="&#x0027;"/>
             <key code="40" output="k"/>
             <key code="41" output=";"/>
@@ -155,22 +155,22 @@
         </keyMap>
         <keyMap index="1">
             <key code="0" action="A"/>
-            <key code="1" output="S"/>
+            <key code="1" action="S"/>
             <key code="2" output="D"/>
             <key code="3" output="F"/>
-            <key code="4" output="H"/>
-            <key code="5" output="G"/>
+            <key code="4" action="H"/>
+            <key code="5" action="G"/>
             <key code="6" output="Z"/>
             <key code="7" output="X"/>
-            <key code="8" output="C"/>
+            <key code="8" action="C"/>
             <key code="9" output="V"/>
             <key code="10" output="±"/>
             <key code="11" output="B"/>
             <key code="12" output="Q"/>
-            <key code="13" output="W"/>
+            <key code="13" action="W"/>
             <key code="14" action="E"/>
             <key code="15" output="R"/>
-            <key code="16" action="12"/>
+            <key code="16" action="Y"/>
             <key code="17" output="T"/>
             <key code="18" output="!"/>
             <key code="19" output="@"/>
@@ -192,7 +192,7 @@
             <key code="35" output="P"/>
             <key code="36" output="&#x000D;"/>
             <key code="37" output="L"/>
-            <key code="38" output="J"/>
+            <key code="38" action="J"/>
             <key code="39" output="&#x0022;"/>
             <key code="40" output="K"/>
             <key code="41" output=":"/>
@@ -267,22 +267,22 @@
         </keyMap>
         <keyMap index="2">
             <key code="0" action="A"/>
-            <key code="1" output="S"/>
+            <key code="1" action="S"/>
             <key code="2" output="D"/>
             <key code="3" output="F"/>
-            <key code="4" output="H"/>
-            <key code="5" output="G"/>
+            <key code="4" action="H"/>
+            <key code="5" action="G"/>
             <key code="6" output="Z"/>
             <key code="7" output="X"/>
-            <key code="8" output="C"/>
+            <key code="8" action="C"/>
             <key code="9" output="V"/>
             <key code="10" output="§"/>
             <key code="11" output="B"/>
             <key code="12" output="Q"/>
-            <key code="13" output="W"/>
+            <key code="13" action="W"/>
             <key code="14" action="E"/>
             <key code="15" output="R"/>
-            <key code="16" action="12"/>
+            <key code="16" action="Y"/>
             <key code="17" output="T"/>
             <key code="18" output="1"/>
             <key code="19" output="2"/>
@@ -304,7 +304,7 @@
             <key code="35" output="P"/>
             <key code="36" output="&#x000D;"/>
             <key code="37" output="L"/>
-            <key code="38" output="J"/>
+            <key code="38" action="J"/>
             <key code="39" output="&#x0027;"/>
             <key code="40" output="K"/>
             <key code="41" output=";"/>
@@ -1022,40 +1022,68 @@
     <actions>
         <action id="5">
             <when state="none" output=" "/>
+            <when state="dead: ^" output="^"/>
             <when state="dead: `" output="`"/>
         </action>
         <action id="9">
             <when state="none" output="N"/>
         </action>
-        <action id="12">
-            <when state="none" output="Y"/>
-        </action>
         <action id="16">
             <when state="none" output="n"/>
         </action>
-        <action id="19">
-            <when state="none" output="y"/>
-        </action>
         <action id="A">
             <when state="none" output="A"/>
+            <when state="dead: ^" output="Â"/>
             <when state="dead: `" output="À"/>
         </action>
+        <action id="C">
+            <when state="none" output="C"/>
+            <when state="dead: ^" output="Ĉ"/>
+        </action>
         <action id="E">
             <when state="none" output="E"/>
+            <when state="dead: ^" output="Ê"/>
             <when state="dead: `" output="È"/>
         </action>
+        <action id="G">
+            <when state="none" output="G"/>
+            <when state="dead: ^" output="Ĝ"/>
+        </action>
+        <action id="H">
+            <when state="none" output="H"/>
+            <when state="dead: ^" output="Ĥ"/>
+        </action>
         <action id="I">
             <when state="none" output="I"/>
+            <when state="dead: ^" output="Î"/>
             <when state="dead: `" output="Ì"/>
         </action>
+        <action id="J">
+            <when state="none" output="J"/>
+            <when state="dead: ^" output="Ĵ"/>
+        </action>
         <action id="O">
             <when state="none" output="O"/>
+            <when state="dead: ^" output="Ô"/>
             <when state="dead: `" output="Ò"/>
         </action>
+        <action id="S">
+            <when state="none" output="S"/>
+            <when state="dead: ^" output="Ŝ"/>
+        </action>
         <action id="U">
             <when state="none" output="U"/>
+            <when state="dead: ^" output="Û"/>
             <when state="dead: `" output="Ù"/>
         </action>
+        <action id="W">
+            <when state="none" output="W"/>
+            <when state="dead: ^" output="Ŵ"/>
+        </action>
+        <action id="Y">
+            <when state="none" output="Y"/>
+            <when state="dead: ^" output="Ŷ"/>
+        </action>
         <action id="^">
             <when state="none" next="dead: ^"/>
         </action>
@@ -1064,24 +1092,57 @@
         </action>
         <action id="a">
             <when state="none" output="a"/>
+            <when state="dead: ^" output="â"/>
             <when state="dead: `" output="à"/>
         </action>
+        <action id="c">
+            <when state="none" output="c"/>
+            <when state="dead: ^" output="ĉ"/>
+        </action>
         <action id="e">
             <when state="none" output="e"/>
+            <when state="dead: ^" output="ê"/>
             <when state="dead: `" output="è"/>
         </action>
+        <action id="g">
+            <when state="none" output="g"/>
+            <when state="dead: ^" output="ĝ"/>
+        </action>
+        <action id="h">
+            <when state="none" output="h"/>
+            <when state="dead: ^" output="ĥ"/>
+        </action>
         <action id="i">
             <when state="none" output="i"/>
+            <when state="dead: ^" output="î"/>
             <when state="dead: `" output="ì"/>
         </action>
+        <action id="j">
+            <when state="none" output="j"/>
+            <when state="dead: ^" output="ĵ"/>
+        </action>
         <action id="o">
             <when state="none" output="o"/>
+            <when state="dead: ^" output="ô"/>
             <when state="dead: `" output="ò"/>
         </action>
+        <action id="s">
+            <when state="none" output="s"/>
+            <when state="dead: ^" output="ŝ"/>
+        </action>
         <action id="u">
             <when state="none" output="u"/>
+            <when state="dead: ^" output="û"/>
             <when state="dead: `" output="ù"/>
         </action>
+        <action id="w">
+            <when state="none" output="w"/>
+            <when state="dead: ^" output="ŵ"/>
+        </action>
+        <action id="y">
+            <when state="none" output="y"/>
+            <when state="dead: ^" output="ŷ"/>
+        </action>
         <action id="~">
             <when state="none" next="dead: ~"/>
         </action>