diff --git a/symbols/gr b/symbols/gr
index 8542e64..0856186 100644
--- a/symbols/gr
+++ b/symbols/gr
@@ -11,46 +11,45 @@
 
 default partial alphanumeric_keys alternate_group
 xkb_symbols "basic" {
-	include "gr(simple)"
-
 	name[Group1] = "Greece";
 
 	include "eurosign(e)"
 	include "eurosign(5)"
+	include "gr(simple)"
 	include "kpdl(comma)"
 	include "level3(ralt_switch)"
 
-	key <AB01> { [       NoSymbol,       NoSymbol,          U037D,          U03FF ] };
-	key <AB02> { [       NoSymbol,       NoSymbol,     rightarrow,      leftarrow ] };
-	key <AB03> { [       NoSymbol,       NoSymbol,      copyright                 ] };
-	key <AB04> { [       NoSymbol,       NoSymbol,          U03D6                 ] };
-	key <AB05> { [       NoSymbol,       NoSymbol,          U03D0                 ] };
-	key <AB06> { [       NoSymbol,       NoSymbol,          U0374,          U0375 ] };
-	key <AB07> { [       NoSymbol,       NoSymbol,          U03FB,          U03FA ] };
-	key <AB08> { [       NoSymbol,       NoSymbol,  guillemotleft                 ] };
-	key <AB09> { [       NoSymbol,       NoSymbol, guillemotright, periodcentered ] };
-	key <AC03> { [       NoSymbol,       NoSymbol,      downarrow,        uparrow ] };
-	key <AC04> { [       NoSymbol,       NoSymbol,          U03D5                 ] };
-	key <AC05> { [       NoSymbol,       NoSymbol,          U03DD,          U03DC ] };
-	key <AC07> { [       NoSymbol,       NoSymbol,          U037C,          U03FE ] };
-	key <AC08> { [       NoSymbol,       NoSymbol,          U03DF,          U03DE ] };
-	key <AC09> { [       NoSymbol,       NoSymbol,          U03F2,          U03F9 ] };
-	key <AC10> { [       NoSymbol,       NoSymbol,     dead_acute,     dead_psili ] };
-	key <AC11> { [       NoSymbol,       NoSymbol,     dead_grave,     dead_dasia ] };
-	key <AD01> { [       NoSymbol,       NoSymbol, periodcentered                 ] };
-	key <AD02> { [       NoSymbol,       NoSymbol,          U03DB,          U03DA ] };
-	key <AD04> { [       NoSymbol,       NoSymbol,     registered,          U03F1 ] };
-	key <AD07> { [       NoSymbol,       NoSymbol,          U03D1,          U03F4 ] };
-	key <AD08> { [       NoSymbol,       NoSymbol,          U037B,          U03FD ] };
-	key <AD10> { [       NoSymbol,       NoSymbol,          U03E1,          U03E0 ] };
-	key <AD11> { [       NoSymbol,       NoSymbol,     dead_tilde,    dead_macron ] };
-	key <AD12> { [       NoSymbol,       NoSymbol,      dead_iota,     dead_breve ] };
-	key <AE01> { [       NoSymbol,       NoSymbol,       NoSymbol,    onesuperior ] };
-	key <AE02> { [       NoSymbol,       NoSymbol,        onehalf,    twosuperior ] };
-	key <AE03> { [       NoSymbol,       NoSymbol,       sterling,  threesuperior ] };
-	key <AE04> { [       NoSymbol,       NoSymbol,     onequarter,  threequarters ] };
-	key <AE07> { [       NoSymbol,       NoSymbol,          U03F0                 ] };
-	key <AE10> { [       NoSymbol,       NoSymbol,         degree                 ] };
+  key <AB01> { [ NoSymbol, NoSymbol,     U037D,         U03FF     ] };
+  key <AB02> { [ NoSymbol, NoSymbol,     rightarrow,    leftarrow ] };
+  key <AB03> { [ NoSymbol, NoSymbol,     copyright                ] };
+  key <AB04> { [ NoSymbol, NoSymbol,     U03D6                    ] };
+  key <AB05> { [ NoSymbol, NoSymbol,     U03D0                    ] };
+  key <AB06> { [ NoSymbol, NoSymbol,     U0374,         U0375     ] };
+  key <AB07> { [ NoSymbol, NoSymbol,     U03FB,         U03FA     ] };
+  key <AB08> { [ NoSymbol, NoSymbol,     guillemotleft            ] };
+  key <AB09> { [ NoSymbol, NoSymbol,     guillemotright, periodcentered ] };
+  key <AC03> { [ NoSymbol, NoSymbol,     downarrow,      uparrow  ] };
+  key <AC04> { [ NoSymbol, NoSymbol,     U03D5                    ] };
+  key <AC05> { [ NoSymbol, NoSymbol,     U03DD,          U03DC    ] };
+  key <AC07> { [ NoSymbol, NoSymbol,     U037C,          U03FE    ] };
+  key <AC08> { [ NoSymbol, NoSymbol,     U03DF,          U03DE    ] };
+  key <AC09> { [ NoSymbol, NoSymbol,     U03F2,          U03F9    ] };
+  key <AC10> { [ NoSymbol, NoSymbol,     dead_acute,     dead_psili ] };
+  key <AC11> { [ NoSymbol, NoSymbol,     dead_grave,     dead_dasia ] };
+  key <AD01> { [ NoSymbol, NoSymbol, periodcentered                 ] };
+  key <AD02> { [ NoSymbol, NoSymbol,          U03DB,          U03DA ] };
+  key <AD04> { [ NoSymbol, NoSymbol,     registered,          U03F1 ] };
+  key <AD07> { [ NoSymbol, NoSymbol,          U03D1,          U03F4 ] };
+  key <AD08> { [ NoSymbol, NoSymbol,          U037B,          U03FD ] };
+  key <AD10> { [ NoSymbol, NoSymbol,          U03E1,          U03E0 ] };
+  key <AD11> { [ NoSymbol, NoSymbol,     dead_tilde,    dead_macron ] };
+  key <AD12> { [ NoSymbol, NoSymbol,      dead_iota,     dead_breve ] };
+  key <AE01> { [ NoSymbol, NoSymbol,       NoSymbol,    onesuperior ] };
+  key <AE02> { [ NoSymbol, NoSymbol,        onehalf,    twosuperior ] };
+  key <AE03> { [ NoSymbol, NoSymbol,       sterling,  threesuperior ] };
+  key <AE04> { [ NoSymbol, NoSymbol,     onequarter,  threequarters ] };
+  key <AE07> { [ NoSymbol, NoSymbol,          U03F0                 ] };
+  key <AE10> { [ NoSymbol, NoSymbol,         degree                 ] };
 };
 
 partial alphanumeric_keys alternate_group
@@ -123,66 +122,52 @@ xkb_symbols "bare" {
     key <LSGT> { [         guillemotleft, guillemotright ] }; // « »
 };
 
-// ===========================================================================================
-// Greek - Extended                                                                          |
-// ===========================================================================================
-//
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━━┓
-// │ ~   │ !   │ @   │ #   │ $   │ %   │ ^   │ &   │ *   │ (   │ )   │ _   │ +   ┃Backspace  ┃
-// │ `   │ 1   │ 2   │ 3 £ │ 4   │ 5 € │ 6   │ 7   │ 8   │ 9   │ 0 ° │ - ± │ =   ┃           ┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━━━┫
-// ┃       ┃ :   │ Σ   │ Ε   │ Ρ   │ Τ   │ Υ   │ Θ   │ Ι   │ Ο   │ Π   │ {   │ }   ┃Enter    ┃
-// ┃Tab    ┃ ; · │ ς   │ ε € │ ρ ® │ τ   │ υ   │ θ   │ ι   │ ο   │ π   │ [   │ ]   ┃         ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓        ┃
-// ┃Caps    ┃ Α   │ Σ   │ Δ   │ Φ   │ Γ   │ Η   │ Ξ   │ Κ   │ Λ   │ ¨   │ "   │ |   ┃        ┃
-// ┃Lock    ┃ α   │ σ   │ δ   │ φ   │ γ   │ η   │ ξ   │ κ   │ λ   │ ´   │ '   │ \   ┃        ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━━━┫
-// ┃       ┃ »   │ Ζ   │ Χ   │ Ψ   │ Ω   │ Β   │ Ν   │ Μ   │ <   │ >   │ ?   ┃               ┃
-// ┃Shift  ┃ «   │ ζ   │ χ   │ ψ © │ ω   │ β   │ ν   │ μ   │ , « │ . » │ /   ┃Shift          ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴──┲━━┷━━━━┳┷━━━━━┻┳━━━━━━━┳━━━━━━┫
-// ┃       ┃       ┃       ┃                                  ┃       ┃       ┃       ┃      ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃              Space               ┃AltGr  ┃Meta   ┃Menu   ┃Ctrl  ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹──────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━┛
-
 partial alphanumeric_keys alternate_group
-xkb_symbols "extended" {
+xkb_symbols "polytonic" {
 
     include "gr(simple)"
-
-    name[Group1] = "Greece - Extended";
-
-    key.type[Group1] = "THREE_LEVEL";
-
-    key <AE03> { [ NoSymbol, NoSymbol,       sterling ] }; // £
-    key <AE10> { [ NoSymbol, NoSymbol,         degree ] }; // °
-    key <AE11> { [ NoSymbol, NoSymbol,      plusminus ] }; // ±
-
-    key <AD01> { [ NoSymbol, NoSymbol, periodcentered ] }; // ·
-    key <AD04> { [ NoSymbol, NoSymbol,     registered ] }; // ®
-
-    key <AB03> { [ NoSymbol, NoSymbol,      copyright ] }; // ©
-    key <AB08> { [ NoSymbol, NoSymbol,  guillemotleft ] }; // «
-    key <AB09> { [ NoSymbol, NoSymbol, guillemotright ] }; // »
-
     include "level3(ralt_switch)"
     include "eurosign(5)"
     include "eurosign(e)"
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "polytonic" {
-
-    include "gr(extended)"
 
     name[Group1] = "Greece - Polytonic";
 
-    key.type[Group1] = "THREE_LEVEL";
-
-    key <AD11> { [ dead_tilde, dead_diaeresis, dead_macron ] }; // ~ ¨ ¯
-    key <AD12> { [  dead_iota,     VoidSymbol,  dead_breve ] }; // ͺ   ˘
-
-    key <AC10> { [ dead_acute, dead_psili  ] }; // ´ ̓ 
-    key <AC11> { [ dead_grave, dead_dasia  ] }; // ` ̔
+    key.type = "FOUR_LEVEL";
+
+    key <AB01> { [ NoSymbol,       NoSymbol,          U037D,          U03FF ] };//ͽϿ
+    key <AB02> { [ NoSymbol,       NoSymbol,     rightarrow,      leftarrow ] };//→←
+    key <AB03> { [ NoSymbol,       NoSymbol,      copyright                 ] };//©
+    key <AB04> { [ NoSymbol,       NoSymbol,          U03D6                 ] };//ϖ
+    key <AB05> { [ NoSymbol,       NoSymbol,          U03D0                 ] };//ϐ
+    key <AB06> { [ NoSymbol,       NoSymbol,          U0374,          U0375 ] };//ʹ͵
+    key <AB07> { [ NoSymbol,       NoSymbol,          U03FB,          U03FA ] };//ϻϺ
+    key <AB08> { [ NoSymbol,       NoSymbol,  guillemotleft                 ] };//«
+    key <AB09> { [ NoSymbol,       NoSymbol, guillemotright, periodcentered ] };//»
+    key <AB10> { [ NoSymbol,       NoSymbol,          U03D9,          U03D8 ] };//ϙϘ
+    key <AC03> { [ NoSymbol,       NoSymbol,      downarrow,        uparrow ] };//↓↑
+    key <AC04> { [ NoSymbol,       NoSymbol,          U03D5                 ] };//ϕ
+    key <AC05> { [ NoSymbol,       NoSymbol,          U03DD,          U03DC ] };//ϝϜ
+    key <AC07> { [ NoSymbol,       NoSymbol,          U037C,          U03FE ] };//ͼϾ
+    key <AC08> { [ NoSymbol,       NoSymbol,          U03DF,          U03DE ] };//ϟϞ
+    key <AC09> { [ NoSymbol,       NoSymbol,          U03F2,          U03F9 ] };//ϲϹ
+    key <AC10> { [ dead_acute,	dead_psili, 	dead_acute, dead_diaeresis  ] };
+    key <AC11> { [ dead_grave,	dead_dasia,	apostrophe,	quotedbl    ] };//'"
+    key <AD01> { [ NoSymbol,       NoSymbol,          periodcentered        ] };//·
+    key <AD02> { [ NoSymbol,       NoSymbol,          U03DB,          U03DA ] };//ϛϚ
+    key <AD04> { [ NoSymbol,       NoSymbol,          U03F1,     registered ] };//ϱ®
+    key <AD07> { [ NoSymbol,       NoSymbol,          U03D1,          U03F4 ] };//ϑϴ
+    key <AD08> { [ NoSymbol,       NoSymbol,          U037B,          U03FD ] };//ͻϽ
+    key <AD10> { [ NoSymbol,       NoSymbol,          U03E1,          U03E0 ] };//ϡϠ
+    key <AD11> { [ dead_tilde,	dead_diaeresis,	bracketleft,  braceleft	    ] };//[{
+    key <AD12> { [ dead_iota,	VoidSymbol,	bracketright, braceright    ] };//]}
+    key <AD13> { [ NoSymbol,       NoSymbol,         endash,         emdash ] };
+    key <AE01> { [ NoSymbol,       NoSymbol,       NoSymbol,    onesuperior ] };// ¹
+    key <AE02> { [ NoSymbol,       NoSymbol,        onehalf,    twosuperior ] };//½²
+    key <AE03> { [ NoSymbol,       NoSymbol,       sterling,  threesuperior ] };//£³
+    key <AE04> { [ NoSymbol,       NoSymbol,     onequarter,  threequarters ] };//¼¾
+    key <AE07> { [ NoSymbol,       NoSymbol,          U03F0,  U03CF         ] };//ϰϏ
+    key <AE10> { [ NoSymbol,       NoSymbol,         degree                 ] };//°
+    key <AE11> { [ NoSymbol,       NoSymbol,      plusminus                 ] };//±
 };
 
 partial alphanumeric_keys alternate_group