diff --git a/EurKEY.keylayout b/EurKEY.keylayout
index 9381f31..22f6ac6 100644
--- a/EurKEY.keylayout
+++ b/EurKEY.keylayout
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE keyboard PUBLIC "" "file://localhost/System/Library/DTDs/KeyboardLayout.dtd">
-<!--Last edited by Ukelele version 2.2.4 on 2013-07-03 at 20:15 (MESZ)-->
-<!--Created by Ukelele version 2.2.4 on 2013-07-01 at 20:44 (MESZ)-->
-<keyboard group="0" id="14844" name="EurKEY" maxout="1">
+<keyboard group="0" id="14844" name="U.S." maxout="1">
     <layouts>
         <layout first="0" last="17" modifiers="f4" mapSet="16c"/>
         <layout first="18" last="18" modifiers="f4" mapSet="994"/>
@@ -206,7 +204,7 @@
             <key code="47" output="&#x003E;"/>
             <key code="48" output="&#x0009;"/>
             <key code="49" action="5"/>
-            <key code="50" action="~"/>
+            <key code="50" output="~"/>
             <key code="51" output="&#x0008;"/>
             <key code="52" output="&#x0003;"/>
             <key code="53" output="&#x001B;"/>
@@ -380,57 +378,57 @@
             <key code="126" output="&#x001E;"/>
         </keyMap>
         <keyMap index="3">
-            <key code="0" output="ä"/>
+            <key code="0" output="å"/>
             <key code="1" output="ß"/>
             <key code="2" output="∂"/>
-            <key code="3" output="è"/>
-            <key code="4" output="ù"/>
-            <key code="5" output="é"/>
-            <key code="6" output="à"/>
-            <key code="7" output="á"/>
+            <key code="3" output="ƒ"/>
+            <key code="4" output="˙"/>
+            <key code="5" output="©"/>
+            <key code="6" output="Ω"/>
+            <key code="7" output="≈"/>
             <key code="8" output="ç"/>
-            <key code="9" output="ì"/>
+            <key code="9" output="√"/>
             <key code="10" output="§"/>
-            <key code="11" output="í"/>
-            <key code="12" output="æ"/>
-            <key code="13" output="å"/>
-            <key code="14" output="ë"/>
-            <key code="15" output="ý"/>
-            <key code="16" output="ÿ"/>
-            <key code="17" output="þ"/>
+            <key code="11" output="∫"/>
+            <key code="12" output="œ"/>
+            <key code="13" output="∑"/>
+            <key code="14" action="0"/>
+            <key code="15" output="®"/>
+            <key code="16" output="¥"/>
+            <key code="17" output="†"/>
             <key code="18" output="¡"/>
-            <key code="19" output="ª"/>
-            <key code="20" output="˚"/>
-            <key code="21" output="€"/>
-            <key code="22" action="§"/>
-            <key code="23" output="£"/>
-            <key code="24" output="⨉"/>
-            <key code="25" output="“"/>
-            <key code="26" action="¶"/>
-            <key code="27" action="©"/>
-            <key code="28" output="„"/>
-            <key code="29" output="”"/>
-            <key code="30" output="≫"/>
-            <key code="31" output="ö"/>
-            <key code="32" output="ü"/>
-            <key code="33" output="≪"/>
-            <key code="34" output="ï"/>
-            <key code="35" output="œ"/>
+            <key code="19" output="™"/>
+            <key code="20" output="£"/>
+            <key code="21" output="¢"/>
+            <key code="22" output="§"/>
+            <key code="23" output="∞"/>
+            <key code="24" output="≠"/>
+            <key code="25" output="ª"/>
+            <key code="26" output="¶"/>
+            <key code="27" output="–"/>
+            <key code="28" output="•"/>
+            <key code="29" output="º"/>
+            <key code="30" output="‘"/>
+            <key code="31" output="ø"/>
+            <key code="32" action="3"/>
+            <key code="33" output="“"/>
+            <key code="34" action="2"/>
+            <key code="35" output="π"/>
             <key code="36" output="&#x000D;"/>
-            <key code="37" output="ø"/>
-            <key code="38" output="ú"/>
-            <key code="39" action="æ"/>
-            <key code="40" output="ij"/>
-            <key code="41" action="…"/>
-            <key code="42" output="¬"/>
-            <key code="43" output="ò"/>
+            <key code="37" output="¬"/>
+            <key code="38" output="∆"/>
+            <key code="39" output="æ"/>
+            <key code="40" output="˚"/>
+            <key code="41" output="…"/>
+            <key code="42" output="«"/>
+            <key code="43" output="≤"/>
             <key code="44" output="÷"/>
-            <key code="45" output="ñ"/>
-            <key code="46" action="Ω"/>
-            <key code="47" output="ó"/>
+            <key code="45" action="4"/>
+            <key code="46" output="µ"/>
+            <key code="47" output="≥"/>
             <key code="48" output="&#x0009;"/>
             <key code="49" output=" "/>
-            <key code="50" action="`"/>
+            <key code="50" action="1"/>
             <key code="51" output="&#x0008;"/>
             <key code="52" output="&#x0003;"/>
             <key code="53" output="&#x001B;"/>
@@ -492,57 +490,57 @@
             <key code="126" output="&#x001E;"/>
         </keyMap>
         <keyMap index="4">
-            <key code="0" output="Ä"/>
+            <key code="0" output="Å"/>
             <key code="1" output="Í"/>
             <key code="2" output="Î"/>
-            <key code="3" output="È"/>
-            <key code="4" output="Ù"/>
-            <key code="5" output="É"/>
-            <key code="6" output="À"/>
-            <key code="7" output="Á"/>
+            <key code="3" output="Ï"/>
+            <key code="4" output="Ó"/>
+            <key code="5" output="˝"/>
+            <key code="6" output="¸"/>
+            <key code="7" output="˛"/>
             <key code="8" output="Ç"/>
-            <key code="9" output="Ì"/>
+            <key code="9" output="◊"/>
             <key code="10" output="±"/>
-            <key code="11" output="Í"/>
-            <key code="12" output="Æ"/>
-            <key code="13" output="Å"/>
-            <key code="14" output="Ë"/>
-            <key code="15" output="Ý"/>
-            <key code="16" output="Ÿ"/>
-            <key code="17" output="Þ"/>
-            <key code="18" output="¹"/>
-            <key code="19" output="²"/>
-            <key code="20" output="³"/>
-            <key code="21" output="¥"/>
-            <key code="22" output="˘"/>
-            <key code="23" output="¢"/>
-            <key code="24" output="÷"/>
-            <key code="25" output="‘"/>
+            <key code="11" output="ı"/>
+            <key code="12" output="Œ"/>
+            <key code="13" output="„"/>
+            <key code="14" output="´"/>
+            <key code="15" output="‰"/>
+            <key code="16" output="Á"/>
+            <key code="17" output="ˇ"/>
+            <key code="18" output="⁄"/>
+            <key code="19" output="€"/>
+            <key code="20" output="‹"/>
+            <key code="21" output="›"/>
+            <key code="22" output="fl"/>
+            <key code="23" output="fi"/>
+            <key code="24" output="±"/>
+            <key code="25" output="·"/>
             <key code="26" output="‡"/>
-            <key code="27" output="№"/>
-            <key code="28" output="‚"/>
-            <key code="29" output="’"/>
-            <key code="30" output="﹥"/>
-            <key code="31" output="Ö"/>
-            <key code="32" output="Ü"/>
-            <key code="33" output="﹤"/>
-            <key code="34" output="Ï"/>
-            <key code="35" output="Œ"/>
+            <key code="27" output="—"/>
+            <key code="28" output="°"/>
+            <key code="29" output="‚"/>
+            <key code="30" output="’"/>
+            <key code="31" output="Ø"/>
+            <key code="32" output="¨"/>
+            <key code="33" output="”"/>
+            <key code="34" output="ˆ"/>
+            <key code="35" output="∏"/>
             <key code="36" output="&#x000D;"/>
-            <key code="37" output="Ø"/>
-            <key code="38" output="Ú"/>
-            <key code="39" output="✝"/>
-            <key code="40" output="IJ"/>
-            <key code="41" output="·"/>
-            <key code="42" output="╎"/>
-            <key code="43" output="Ò"/>
-            <key code="44" output="…"/>
-            <key code="45" output="Ñ"/>
-            <key code="46" action="Â"/>
-            <key code="47" output="Ó"/>
+            <key code="37" output="Ò"/>
+            <key code="38" output="Ô"/>
+            <key code="39" output="Æ"/>
+            <key code="40" output=""/>
+            <key code="41" output="Ú"/>
+            <key code="42" output="»"/>
+            <key code="43" output="¯"/>
+            <key code="44" output="¿"/>
+            <key code="45" output="˜"/>
+            <key code="46" output="Â"/>
+            <key code="47" output="˘"/>
             <key code="48" output="&#x0009;"/>
             <key code="49" output=" "/>
-            <key code="50" action="` 1"/>
+            <key code="50" output="`"/>
             <key code="51" output="&#x0008;"/>
             <key code="52" output="&#x0003;"/>
             <key code="53" output="&#x001B;"/>
@@ -1022,168 +1020,125 @@
         </keyMap>
     </keyMapSet>
     <actions>
+        <action id="0">
+            <when state="none" next="s1"/>
+        </action>
         <action id="1">
             <when state="none" next="s2"/>
         </action>
+        <action id="2">
+            <when state="none" next="s3"/>
+        </action>
+        <action id="3">
+            <when state="none" next="s4"/>
+        </action>
+        <action id="4">
+            <when state="none" next="s5"/>
+        </action>
         <action id="5">
             <when state="none" output=" "/>
-            <when state="^" output="ˆ"/>
+            <when state="s1" output="´"/>
             <when state="s2" output="`"/>
-            <when state="~" output="˜"/>
-            <when state="¨" output="¨"/>
-            <when state="´" output="´"/>
+            <when state="s3" output="ˆ"/>
+            <when state="s4" output="¨"/>
+            <when state="s5" output="˜"/>
         </action>
         <action id="6">
             <when state="none" output="A"/>
-            <when state="^" output="Â"/>
-            <when state="`" output="À"/>
+            <when state="s1" output="Á"/>
             <when state="s2" output="À"/>
-            <when state="~" output="Ã"/>
-            <when state="¨" output="Ä"/>
-            <when state="´" output="Á"/>
+            <when state="s3" output="Â"/>
+            <when state="s4" output="Ä"/>
+            <when state="s5" output="Ã"/>
         </action>
         <action id="7">
             <when state="none" output="E"/>
-            <when state="^" output="Ê"/>
-            <when state="`" output="È"/>
+            <when state="s1" output="É"/>
             <when state="s2" output="È"/>
-            <when state="¨" output="Ë"/>
-            <when state="´" output="É"/>
+            <when state="s3" output="Ê"/>
+            <when state="s4" output="Ë"/>
         </action>
         <action id="8">
             <when state="none" output="I"/>
-            <when state="^" output="Î"/>
-            <when state="`" output="Ì"/>
+            <when state="s1" output="Í"/>
             <when state="s2" output="Ì"/>
-            <when state="¨" output="Ï"/>
-            <when state="´" output="Í"/>
+            <when state="s3" output="Î"/>
+            <when state="s4" output="Ï"/>
         </action>
         <action id="9">
             <when state="none" output="N"/>
-            <when state="~" output="Ñ"/>
+            <when state="s5" output="Ñ"/>
         </action>
         <action id="10">
             <when state="none" output="O"/>
-            <when state="^" output="Ô"/>
-            <when state="`" output="Ò"/>
+            <when state="s1" output="Ó"/>
             <when state="s2" output="Ò"/>
-            <when state="~" output="Õ"/>
-            <when state="¨" output="Ö"/>
-            <when state="´" output="Ó"/>
+            <when state="s3" output="Ô"/>
+            <when state="s4" output="Ö"/>
+            <when state="s5" output="Õ"/>
         </action>
         <action id="11">
             <when state="none" output="U"/>
-            <when state="^" output="Û"/>
-            <when state="`" output="Ù"/>
+            <when state="s1" output="Ú"/>
             <when state="s2" output="Ù"/>
-            <when state="¨" output="Ü"/>
-            <when state="´" output="Ú"/>
+            <when state="s3" output="Û"/>
+            <when state="s4" output="Ü"/>
         </action>
         <action id="12">
             <when state="none" output="Y"/>
-            <when state="`" output="Ỳ"/>
-            <when state="¨" output="Ÿ"/>
+            <when state="s4" output="Ÿ"/>
         </action>
         <action id="13">
             <when state="none" output="a"/>
-            <when state="^" output="â"/>
-            <when state="`" output="à"/>
+            <when state="s1" output="á"/>
             <when state="s2" output="à"/>
-            <when state="~" output="ã"/>
-            <when state="¨" output="ä"/>
-            <when state="´" output="á"/>
-            <when state="óld" output="á"/>
-            <when state="öld" output="ä"/>
-            <when state="˚" output="å"/>
+            <when state="s3" output="â"/>
+            <when state="s4" output="ä"/>
+            <when state="s5" output="ã"/>
         </action>
         <action id="14">
             <when state="none" output="e"/>
-            <when state="^" output="ê"/>
-            <when state="`" output="è"/>
+            <when state="s1" output="é"/>
             <when state="s2" output="è"/>
-            <when state="¨" output="ë"/>
-            <when state="´" output="é"/>
+            <when state="s3" output="ê"/>
+            <when state="s4" output="ë"/>
         </action>
         <action id="15">
             <when state="none" output="i"/>
-            <when state="^" output="î"/>
-            <when state="`" output="ì"/>
+            <when state="s1" output="í"/>
             <when state="s2" output="ì"/>
-            <when state="¨" output="ï"/>
-            <when state="´" output="í"/>
+            <when state="s3" output="î"/>
+            <when state="s4" output="ï"/>
         </action>
         <action id="16">
             <when state="none" output="n"/>
-            <when state="~" output="ñ"/>
+            <when state="s5" output="ñ"/>
         </action>
         <action id="17">
             <when state="none" output="o"/>
-            <when state="^" output="ô"/>
-            <when state="`" output="ò"/>
+            <when state="s1" output="ó"/>
             <when state="s2" output="ò"/>
-            <when state="~" output="õ"/>
-            <when state="¨" output="ö"/>
-            <when state="´" output="ó"/>
+            <when state="s3" output="ô"/>
+            <when state="s4" output="ö"/>
+            <when state="s5" output="õ"/>
         </action>
         <action id="18">
             <when state="none" output="u"/>
-            <when state="^" output="û"/>
-            <when state="`" output="ù"/>
+            <when state="s1" output="ú"/>
             <when state="s2" output="ù"/>
-            <when state="¨" output="ü"/>
-            <when state="´" output="ú"/>
+            <when state="s3" output="û"/>
+            <when state="s4" output="ü"/>
         </action>
         <action id="19">
             <when state="none" output="y"/>
-            <when state="`" output="ỳ"/>
-            <when state="¨" output="ÿ"/>
-        </action>
-        <action id="`">
-            <when state="none" next="`"/>
-        </action>
-        <action id="` 1">
-            <when state="none" next="old~"/>
-        </action>
-        <action id="~">
-            <when state="none" output="~"/>
-            <when state="`" output="`"/>
-        </action>
-        <action id="§">
-            <when state="none" next="old^"/>
-        </action>
-        <action id="©">
-            <when state="none" next="©"/>
-        </action>
-        <action id="¶">
-            <when state="none" next="˚"/>
-        </action>
-        <action id="Â">
-            <when state="none" next="±"/>
-        </action>
-        <action id="æ">
-            <when state="none" next="óld"/>
-        </action>
-        <action id="Ω">
-            <when state="none" next="Ω"/>
-        </action>
-        <action id="…">
-            <when state="none" next="öld"/>
+            <when state="s4" output="ÿ"/>
         </action>
     </actions>
     <terminators>
-        <when state="^" output="ˆ"/>
-        <when state="`" output="`"/>
-        <when state="old^" output="^"/>
-        <when state="old~" output="~"/>
+        <when state="s1" output="´"/>
         <when state="s2" output="`"/>
-        <when state="~" output="˜"/>
-        <when state="¨" output="¨"/>
-        <when state="©" output="©"/>
-        <when state="±" output="±"/>
-        <when state="´" output="´"/>
-        <when state="óld" output="´"/>
-        <when state="öld" output="¨"/>
-        <when state="˚" output="˚"/>
-        <when state="Ω" output="Ω"/>
+        <when state="s3" output="ˆ"/>
+        <when state="s4" output="¨"/>
+        <when state="s5" output="˜"/>
     </terminators>
 </keyboard>