diff --git a/packages/keybr-keyboard-io/lib/parser/diacritics.ts b/packages/keybr-keyboard-io/lib/parser/diacritics.ts
index e13bba8f..9d8823ea 100644
--- a/packages/keybr-keyboard-io/lib/parser/diacritics.ts
+++ b/packages/keybr-keyboard-io/lib/parser/diacritics.ts
@@ -19,6 +19,7 @@ const forwardMap = new Map([
   [/* CEDILLA */ 0x00b8, /* COMBINING CEDILLA */ 0x0327],
   [/* OGONEK */ 0x02db, /* COMBINING OGONEK */ 0x0328],
   [/* GREEK TONOS */ 0x0384, /* COMBINING ACUTE ACCENT */ 0x0301],
+  [/* GREEK DIALYTIKA TONOS */ 0x0385, /* COMBINING GREEK DIALYTIKA TONOS */ 0x0344],
 ]);
 
 const reverseMap = new Map([...forwardMap].map(([key, value]) => [value, key]));
diff --git a/packages/keybr-keyboard/lib/language.ts b/packages/keybr-keyboard/lib/language.ts
index 4c21b89f..206a3545 100644
--- a/packages/keybr-keyboard/lib/language.ts
+++ b/packages/keybr-keyboard/lib/language.ts
@@ -30,7 +30,7 @@ export class Language implements EnumItem {
     /* id= */ "el",
     /* script= */ "greek",
     /* direction= */ "ltr",
-    /* alphabet= */ "αάβγδεέζηήθιίκλμνξοόπρσςτυύφχψωώ",
+    /* alphabet= */ "αάβγδεέζηήθιίϊΐκλμνξοόπρσςτυύϋΰφχψωώ",
   );
   static readonly EN = new Language(
     /* id= */ "en",
diff --git a/packages/keybr-keyboard/lib/layout/el_gr.ts b/packages/keybr-keyboard/lib/layout/el_gr.ts
index 3b5a120f..03881a75 100644
--- a/packages/keybr-keyboard/lib/layout/el_gr.ts
+++ b/packages/keybr-keyboard/lib/layout/el_gr.ts
@@ -18,7 +18,7 @@ export const LAYOUT_EL_GR: CharacterDict = {
   Minus: [/* HYPHEN-MINUS */ 0x002d, /* LOW LINE */ 0x005f, /* PLUS-MINUS SIGN */ 0x00b1],
   Equal: [/* EQUALS SIGN */ 0x003d, /* PLUS SIGN */ 0x002b, /* VULGAR FRACTION ONE HALF */ 0x00bd],
   KeyQ: [/* SEMICOLON */ 0x003b, /* COLON */ 0x003a],
-  KeyW: [/* GREEK SMALL LETTER FINAL SIGMA */ 0x03c2],
+  KeyW: [/* GREEK SMALL LETTER FINAL SIGMA */ 0x03c2, { dead: /* COMBINING GREEK DIALYTIKA TONOS */ 0x0344 }],
   KeyE: [/* GREEK SMALL LETTER EPSILON */ 0x03b5, /* GREEK CAPITAL LETTER EPSILON */ 0x0395, /* EURO SIGN */ 0x20ac],
   KeyR: [/* GREEK SMALL LETTER RHO */ 0x03c1, /* GREEK CAPITAL LETTER RHO */ 0x03a1, /* REGISTERED SIGN */ 0x00ae],
   KeyT: [/* GREEK SMALL LETTER TAU */ 0x03c4, /* GREEK CAPITAL LETTER TAU */ 0x03a4],
@@ -39,7 +39,7 @@ export const LAYOUT_EL_GR: CharacterDict = {
   KeyJ: [/* GREEK SMALL LETTER XI */ 0x03be, /* GREEK CAPITAL LETTER XI */ 0x039e],
   KeyK: [/* GREEK SMALL LETTER KAPPA */ 0x03ba, /* GREEK CAPITAL LETTER KAPPA */ 0x039a],
   KeyL: [/* GREEK SMALL LETTER LAMDA */ 0x03bb, /* GREEK CAPITAL LETTER LAMDA */ 0x039b],
-  Semicolon: [{ dead: /* COMBINING ACUTE ACCENT */ 0x0301 }, { dead: /* COMBINING DIAERESIS */ 0x0308 }],
+  Semicolon: [{ dead: /* COMBINING ACUTE ACCENT */ 0x0301 }, { dead: /* COMBINING DIAERESIS */ 0x0308 }, { dead: /* COMBINING GREEK DIALYTIKA TONOS */ 0x0344 }],
   Quote: [/* APOSTROPHE */ 0x0027, /* QUOTATION MARK */ 0x0022],
   IntlBackslash: [/* LESS-THAN SIGN */ 0x003c, /* GREATER-THAN SIGN */ 0x003e],
   KeyZ: [/* GREEK SMALL LETTER ZETA */ 0x03b6, /* GREEK CAPITAL LETTER ZETA */ 0x0396],
diff --git a/packages/keybr-phonetic-model/assets/model-el.data b/packages/keybr-phonetic-model/assets/model-el.data
index e79b3695..63a5bdfc 100644
Binary files a/packages/keybr-phonetic-model/assets/model-el.data and b/packages/keybr-phonetic-model/assets/model-el.data differ