diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/CZProgrammerMessagEase.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/CZProgrammerMessagEase.kt
index 12578ac9..49aa6a0a 100644
--- a/app/src/main/java/com/dessalines/thumbkey/keyboards/CZProgrammerMessagEase.kt
+++ b/app/src/main/java/com/dessalines/thumbkey/keyboards/CZProgrammerMessagEase.kt
@@ -172,13 +172,13 @@ val KB_CZ_PROG_MAIN =
                             SwipeDirection.TOP_RIGHT to
                                 KeyC(
                                     display = KeyDisplay.TextDisplay("¨"),
-                                    action = KeyAction.ComposeLastKey("¨"),
+                                    action = KeyAction.ComposeLastKey("\""),
                                     color = ColorVariant.MUTED,
                                 ),
                             SwipeDirection.BOTTOM_RIGHT to
                                 KeyC(
                                     display = KeyDisplay.TextDisplay("´"),
-                                    action = KeyAction.ComposeLastKey("´"),
+                                    action = KeyAction.ComposeLastKey("'"),
                                     color = ColorVariant.MUTED,
                                 ),
                         ),
@@ -349,12 +349,6 @@ val KB_CZ_PROG_MAIN =
                                     action = KeyAction.CommitText("@"),
                                     color = ColorVariant.MUTED,
                                 ),
-                            SwipeDirection.BOTTOM to
-                                KeyC(
-                                    display = KeyDisplay.TextDisplay("|"),
-                                    action = KeyAction.CommitText("|"),
-                                    color = ColorVariant.MUTED,
-                                ),
                         ),
                 ),
                 NUMERIC_KEY_ITEM,
@@ -399,6 +393,12 @@ val KB_CZ_PROG_MAIN =
                                     action = KeyAction.CommitText("*"),
                                     color = ColorVariant.MUTED,
                                 ),
+                            SwipeDirection.BOTTOM to
+                                KeyC(
+                                    display = KeyDisplay.TextDisplay("|"),
+                                    action = KeyAction.CommitText("|"),
+                                    color = ColorVariant.MUTED,
+                                ),
                         ),
                 ),
                 KeyItemC(
@@ -675,13 +675,13 @@ val KB_CZ_PROG_SHIFTED =
                             SwipeDirection.TOP_RIGHT to
                                 KeyC(
                                     display = KeyDisplay.TextDisplay("¨"),
-                                    action = KeyAction.ComposeLastKey("¨"),
+                                    action = KeyAction.ComposeLastKey("\""),
                                     color = ColorVariant.MUTED,
                                 ),
                             SwipeDirection.BOTTOM_RIGHT to
                                 KeyC(
                                     display = KeyDisplay.TextDisplay("´"),
-                                    action = KeyAction.ComposeLastKey("´"),
+                                    action = KeyAction.ComposeLastKey("'"),
                                     color = ColorVariant.MUTED,
                                 ),
                         ),
@@ -859,12 +859,6 @@ val KB_CZ_PROG_SHIFTED =
                                     action = KeyAction.CommitText("@"),
                                     color = ColorVariant.MUTED,
                                 ),
-                            SwipeDirection.BOTTOM to
-                                KeyC(
-                                    display = KeyDisplay.TextDisplay("|"),
-                                    action = KeyAction.CommitText("|"),
-                                    color = ColorVariant.MUTED,
-                                ),
                         ),
                 ),
                 NUMERIC_KEY_ITEM,
@@ -909,6 +903,12 @@ val KB_CZ_PROG_SHIFTED =
                                     action = KeyAction.CommitText("*"),
                                     color = ColorVariant.MUTED,
                                 ),
+                            SwipeDirection.BOTTOM to
+                                KeyC(
+                                    display = KeyDisplay.TextDisplay("|"),
+                                    action = KeyAction.CommitText("|"),
+                                    color = ColorVariant.MUTED,
+                                ),
                         ),
                 ),
                 KeyItemC(
diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt b/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt
index b06c2d61..ddad5999 100644
--- a/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt
+++ b/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt
@@ -800,6 +800,30 @@ fun performKeyAction(
                             else -> textBefore
                         }
 
+                    "ˇ" ->
+                        when (textBefore) {
+                            "c" -> "č"
+                            "d" -> "ď"
+                            "e" -> "ě"
+                            "l" -> "ľ"
+                            "n" -> "ň"
+                            "r" -> "ř"
+                            "s" -> "š"
+                            "t" -> "ť"
+                            "z" -> "ž"
+                            "C" -> "Č"
+                            "D" -> "Ď"
+                            "E" -> "Ě"
+                            "L" -> "Ľ"
+                            "N" -> "Ň"
+                            "R" -> "Ř"
+                            "S" -> "Š"
+                            "T" -> "Ť"
+                            "Z" -> "Ž"
+                            " " -> "ˇ"
+                            else -> textBefore
+                        }
+
                     else -> throw IllegalStateException("Invalid key modifier")
                 }