--- ee
+++ ee
@@ -62,25 +62,18 @@
    include "us(dvorak)"
    name[Group1]= "Estonia - Dvorak";
    
-   key <AE03>  {        [              3, numbersign     ],
-                        [        sterling                ]     };
-   key <AE04>  {        [              4, dollar         ],
-                        [        section, currency       ]     };
-   key <AE05>  {        [              5, percent        ],
-                        [        EuroSign                ]     };
-   key <AE08>  {        [              8, asterix        ],
-                        [        onehalf                 ]     };
-   key <AC01>  {        [              a, A              ],
-                        [     adiaeresis, Adiaeresis     ]     };
-   key <AC02>  {        [              o, O              ],
-                        [        otilde,  Otilde         ]     };
-   key <AC03>  {        [              e, E              ],
-                        [     odiaeresis, Odiaeresis     ]     };
-   key <AC04>  {        [              u, U              ],
-                        [     udiaeresis, Udiaeresis     ]     };
-   key <AC10>  {        [              s, S              ],
-                        [         scaron,  Scaron        ]     };   
-   key <AB10>  {        [              z, Z              ],
-                        [        zcaron,  Zcaron         ]     };
-   key <RALT>  {        [   Mode_switch,  Multi_key      ]     };
+    key <AE03>	{ [         3, numbersign,   sterling ]	};
+    key <AE04>	{ [         4,     dollar,    section,   currency ]	};
+    key <AE05>	{ [         5,    percent,   EuroSign ]	};
+    key <AE08>	{ [         8,   asterisk,    onehalf ]	};
+
+    key <AC01>	{ [         a,          A, adiaeresis, Adiaeresis ]	};
+    key <AC02>	{ [         o,          O,     otilde,     Otilde ]	};
+    key <AC03>	{ [         e,          E, odiaeresis, Odiaeresis ]	};
+    key <AC04>	{ [         u,          U, udiaeresis, Udiaeresis ]	};
+    key <AC10>	{ [         s,          S,     scaron,     Scaron ]	};   
+    key <AB10>	{ [         z,          Z,     zcaron,     Zcaron ]	};
+
+    include "level3(ralt_switch)"
+    include "keypad(comma)"
 };