diff --git a/neoqwertz.keylayout b/neoqwertz.keylayout
index bac5bcb..14f3fad 100644
--- a/neoqwertz.keylayout
+++ b/neoqwertz.keylayout
@@ -969,12 +969,10 @@
         </action>
         <action id="100">
             <when state="none" output=","/>
-            <when state="Bugfixes" output="&#x0022;"/>
             <when state="Ebene 3 T1 Drehen" output="&#x0027;"/>
         </action>
         <action id="101">
             <when state="none" output="ö"/>
-            <when state="Bugfixes" output=":"/>
             <when state="Ebene 4 T1 Punkt darüber" output="ḋ"/>
             <when state="Ebene 5 T1 Haken" output="ɗ"/>
             <when state="Ebene 6 T1 Punkt darunter" output="ḍ"/>
@@ -986,7 +984,6 @@
         </action>
         <action id="102">
             <when state="none" output="."/>
-            <when state="Bugfixes" output="&#x0027;"/>
             <when state="Ebene 3 T1 Drehen" output="˙"/>
             <!--<when state="compose" next="compose ."/>-->
             <!--<when state="compose . /" output="⁒"/>-->
@@ -997,7 +994,6 @@
         </action>
         <action id="103">
             <when state="none" output="o"/>
-            <when state="Bugfixes" output="="/>
             <when state="Ebene 1 T1 Zirkumflex" output="ô"/>
             <when state="Ebene 1 T2 Gravis" output="ò"/>
             <when state="Ebene 1 T3 Akut" output="ó"/>
@@ -1014,7 +1010,6 @@
         </action>
         <action id="104">
             <when state="none" output="i"/>
-            <when state="Bugfixes" output="&#x003E;"/>
             <when state="Ebene 1 T1 Zirkumflex" output="î"/>
             <when state="Ebene 1 T2 Gravis" output="ì"/>
             <when state="Ebene 1 T3 Akut" output="í"/>
@@ -1032,7 +1027,6 @@
         </action>
         <action id="105">
             <when state="none" output="u"/>
-            <when state="Bugfixes" output="&#x003C;"/>
             <when state="Ebene 1 T1 Zirkumflex" output="û"/>
             <when state="Ebene 1 T2 Gravis" output="ù"/>
             <when state="Ebene 1 T3 Akut" output="ú"/>
@@ -1059,7 +1053,6 @@
         </action>
         <action id="106">
             <when state="none" output="-"/>
-            <when state="Bugfixes" output=";"/>
             <when state="Ebene 3 T1 Drehen" output="ɾ"/>
             <when state="Ebene 3 T3 Schrägstrich" output="ɟ"/>
             <when state="Ebene 5 T1 Haken" output="ʝ"/>
@@ -1071,7 +1064,6 @@
         </action>
         <action id="107">
             <when state="none" output="z"/>
-            <when state="Bugfixes" output="!"/>
             <when state="Ebene 1 T3 Akut" output="ź"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ž"/>
             <when state="Ebene 3 T2 Ring" output="ʑ"/>
@@ -1082,7 +1074,6 @@
         </action>
         <action id="108">
             <when state="none" output="m"/>
-            <when state="Bugfixes" output="%"/>
             <when state="Ebene 3 T1 Drehen" output="ɯ"/>
             <when state="Ebene 4 T1 Punkt darüber" output="ṁ"/>
             <when state="Ebene 5 T1 Haken" output="ɱ"/>
@@ -1100,18 +1091,15 @@
         </action>
         <action id="11">
             <when state="none" output="ü"/>
-            <when state="Bugfixes" output="ſ"/>
             <when state="Ebene 1 T3 Akut" output="ǘ"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ǚ"/>
         </action>
         <action id="110">
             <when state="none" output="p"/>
-            <when state="Bugfixes" output="&#x0026;"/>
             <when state="Ebene 3 T1 Drehen" output="d"/>
         </action>
         <action id="111">
             <when state="none" output="k"/>
-            <when state="Bugfixes" output=")"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ǩ"/>
             <when state="Ebene 2 T2 Cedille" output="ķ"/>
             <when state="Ebene 3 T1 Drehen" output="ʞ"/>
@@ -1127,7 +1115,6 @@
         </action>
         <action id="112">
             <when state="none" output="h"/>
-            <when state="Bugfixes" output="?"/>
             <when state="Ebene 1 T1 Zirkumflex" output="ĥ"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ȟ"/>
             <when state="Ebene 2 T2 Cedille" output="ḩ"/>
@@ -1141,7 +1128,6 @@
         </action>
         <action id="113">
             <when state="none" output="l"/>
-            <when state="Bugfixes" output="-"/>
             <when state="Ebene 1 T3 Akut" output="ĺ"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ľ"/>
             <when state="Ebene 2 T2 Cedille" output="ļ"/>
@@ -1156,7 +1142,6 @@
         </action>
         <action id="114">
             <when state="none" output="w"/>
-            <when state="Bugfixes" output="_"/>
             <when state="Ebene 1 T1 Zirkumflex" output="ŵ"/>
             <when state="Ebene 1 T2 Gravis" output="ẁ"/>
             <when state="Ebene 1 T3 Akut" output="ẃ"/>
@@ -1167,7 +1152,6 @@
         </action>
         <action id="115">
             <when state="none" output="t"/>
-            <when state="Bugfixes" output="^"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ť"/>
             <when state="Ebene 2 T2 Cedille" output="ţ"/>
             <when state="Ebene 3 T1 Drehen" output="ʇ"/>
@@ -1181,7 +1165,6 @@
         </action>
         <action id="116">
             <when state="none" output="q"/>
-            <when state="Bugfixes" output="…"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ǯ"/>
             <when state="Ebene 3 T1 Drehen" output="q"/>
             <when state="Ebene 4 T1 Punkt darüber" output="ẋ"/>
@@ -1203,7 +1186,6 @@
         </action>
         <action id="12">
             <when state="none" output="c"/>
-            <when state="Bugfixes" output="|"/>
             <when state="Ebene 1 T1 Zirkumflex" output="ĉ"/>
             <when state="Ebene 1 T3 Akut" output="ć"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="č"/>
@@ -1231,12 +1213,10 @@
         </action>
         <action id="123">
             <when state="none" output="x"/>
-            <when state="Bugfixes" output="$"/>
             <when state="Ebene 4 T2 Trema Diaeresis" output="ö"/>
         </action>
         <action id="124">
             <when state="none" output="y"/>
-            <when state="Bugfixes" output="#"/>
             <when state="Ebene 1 T1 Zirkumflex" output="ŷ"/>
             <when state="Ebene 1 T2 Gravis" output="ỳ"/>
             <when state="Ebene 1 T3 Akut" output="ý"/>
@@ -1288,7 +1268,6 @@
         </action>
         <action id="135">
             <when state="none" output="v"/>
-            <when state="Bugfixes" output="~"/>
             <when state="Ebene 2 T3 Tilde" output="ṽ"/>
             <when state="Ebene 3 T1 Drehen" output="ʌ"/>
             <when state="Ebene 4 T1 Punkt darüber" output="ṗ"/>
@@ -2391,7 +2370,6 @@
         </action>
         <action id="62">
             <when state="none" output="g"/>
-            <when state="Bugfixes" output="*"/>
             <when state="Ebene 1 T1 Zirkumflex" output="ĝ"/>
             <when state="Ebene 1 T3 Akut" output="ǵ"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ǧ"/>
@@ -2467,7 +2445,6 @@
         </action>
         <action id="67">
             <when state="none" output="s"/>
-            <when state="Bugfixes" output="/"/>
             <when state="Ebene 1 T1 Zirkumflex" output="ŝ"/>
             <when state="Ebene 1 T3 Akut" output="ś"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="š"/>
@@ -2506,7 +2483,6 @@
         </action>
         <action id="69">
             <when state="none" output="f"/>
-            <when state="Bugfixes" output="}"/>
             <when state="Ebene 4 T1 Punkt darüber" output="ė"/>
             <when state="Ebene 4 T2 Trema Diaeresis" output="ë"/>
             <when state="Ebene 4 T3 Doppelakut" output="e̋"/>
@@ -2585,7 +2561,6 @@
         </action>
         <action id="75">
             <when state="none" output="j"/>
-            <when state="Bugfixes" output="("/>
             <when state="Ebene 1 T1 Zirkumflex" output="ĵ"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ǰ"/>
             <when state="Ebene 4 T1 Punkt darüber" output="ṅ"/>
@@ -2655,7 +2630,6 @@
         </action>
         <action id="80">
             <when state="none" output="e"/>
-            <when state="Bugfixes" output="["/>
             <when state="Ebene 1 T1 Zirkumflex" output="ê"/>
             <when state="Ebene 1 T2 Gravis" output="è"/>
             <when state="Ebene 1 T3 Akut" output="é"/>
@@ -2681,7 +2655,6 @@
         </action>
         <action id="82">
             <when state="none" output="b"/>
-            <when state="Bugfixes" output="`"/>
             <when state="Ebene 3 T1 Drehen" output="q"/>
             <when state="Ebene 3 T3 Schrägstrich" output="ƀ"/>
             <when state="Ebene 4 T1 Punkt darüber" output="ż"/>
@@ -2697,7 +2670,6 @@
         </action>
         <action id="83">
             <when state="none" output="a"/>
-            <when state="Bugfixes" output="\"/>
             <when state="Ebene 1 T1 Zirkumflex" output="â"/>
             <when state="Ebene 1 T2 Gravis" output="à"/>
             <when state="Ebene 1 T3 Akut" output="á"/>
@@ -2730,7 +2702,6 @@
         </action>
         <action id="85">
             <when state="none" output="d"/>
-            <when state="Bugfixes" output="{"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ď"/>
             <when state="Ebene 2 T2 Cedille" output="ḑ"/>
             <when state="Ebene 3 T1 Drehen" output="p"/>
@@ -2830,7 +2801,6 @@
         </action>
         <action id="92">
             <when state="none" output="ä"/>
-            <when state="Bugfixes" output="@"/>
             <when state="Ebene 4 T1 Punkt darüber" output="ẏ"/>
             <when state="Ebene 4 T2 Trema Diaeresis" output="ÿ"/>
             <when state="Ebene 4 T3 Doppelakut" output="ӳ"/>
@@ -2879,7 +2849,6 @@
         </action>
         <action id="98">
             <when state="none" output="n"/>
-            <when state="Bugfixes" output="+"/>
             <when state="Ebene 1 T1 Zirkumflex" output="ⁿ"/>
             <when state="Ebene 1 T2 Gravis" output="ǹ"/>
             <when state="Ebene 1 T3 Akut" output="ń"/>
@@ -2894,7 +2863,6 @@
         </action>
         <action id="99">
             <when state="none" output="r"/>
-            <when state="Bugfixes" output="]"/>
             <when state="Ebene 1 T3 Akut" output="ŕ"/>
             <when state="Ebene 2 T1 Caron Hatschek" output="ř"/>
             <when state="Ebene 2 T2 Cedille" output="ŗ"/>
@@ -2941,7 +2909,7 @@
             <when state="none" next="Ebene 1 T2 Gravis"/>
         </action>
         <action id="action">
-            <when state="none" next="Bugfixes"/>
+            <when state="none" output=""/>
             <when state="Ebene 4 und 6" output="⊂"/>
         </action>
         <action id="action 1">
@@ -3159,7 +3127,6 @@
         </action>
     </actions>
     <terminators>
-        <when state="Bugfixes" output=""/>
         <when state="Ebene 1 T1 Zirkumflex" output="^"/>
         <when state="Ebene 1 T2 Gravis" output="`"/>
         <when state="Ebene 1 T3 Akut" output="´"/>