diff --git a/layout.mobintl.h b/layout.mobintl.h
index d28ea45..3f019d9 100644
--- a/layout.mobintl.h
+++ b/layout.mobintl.h
@@ -945,11 +945,7 @@ static struct key keys_compose_a[] = {
   {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -972,12 +968,8 @@ static struct key keys_compose_e[] = {
   {"", "", 7, Pad},
   {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE},
   {"", "", 0.0, EndRow},
-  {"Abc", "Abc", 1.0, BackLayer},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER},
+  {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -993,12 +985,8 @@ static struct key keys_compose_y[] = {
   {"", "", 7, Pad},
   {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
   {"", "", 0.0, EndRow},
-  {"Abc", "Abc", 1.0, BackLayer},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1021,12 +1009,8 @@ static struct key keys_compose_u[] = {
   {"", "", 7, Pad},
   {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
   {"", "", 0.0, EndRow},
-  {"Abc", "Abc", 1.0, BackLayer},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1050,12 +1034,8 @@ static struct key keys_compose_o[] = {
   {"", "", 7, Pad},
   {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
   {"", "", 0.0, EndRow},
-  {"Abc", "Abc", 1.0, BackLayer},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1079,12 +1059,8 @@ static struct key keys_compose_i[] = {
   {"", "", 7, Pad},
   {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
   {"", "", 0.0, EndRow},
-  {"Abc", "Abc", 1.0, BackLayer},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1305,15 +1281,10 @@ static struct key keys_compose_w[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1327,15 +1298,10 @@ static struct key keys_compose_r[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1351,15 +1317,10 @@ static struct key keys_compose_t[] = {
   {"", "", 8.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1370,15 +1331,10 @@ static struct key keys_compose_p[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1395,15 +1351,10 @@ static struct key keys_compose_s[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1417,15 +1368,10 @@ static struct key keys_compose_d[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1436,15 +1382,10 @@ static struct key keys_compose_f[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1457,15 +1398,10 @@ static struct key keys_compose_g[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1478,15 +1414,10 @@ static struct key keys_compose_h[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1497,15 +1428,10 @@ static struct key keys_compose_j[] = {
   {"", "", 10.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1518,15 +1444,10 @@ static struct key keys_compose_k[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1540,15 +1461,10 @@ static struct key keys_compose_l[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1562,15 +1478,10 @@ static struct key keys_compose_z[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1582,15 +1493,10 @@ static struct key keys_compose_x[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1606,15 +1512,10 @@ static struct key keys_compose_c[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1624,15 +1525,10 @@ static struct key keys_compose_v[] = {
   {"", "", 10.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1643,15 +1539,10 @@ static struct key keys_compose_b[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1667,15 +1558,10 @@ static struct key keys_compose_n[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1686,15 +1572,10 @@ static struct key keys_compose_m[] = {
   {"", "", 9.0, Pad},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1705,15 +1586,10 @@ static struct key keys_compose_cyr_i[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Абв", "Абв", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_EQUAL},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_SLASH},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1723,15 +1599,10 @@ static struct key keys_compose_cyr_j[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Абв", "Абв", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_EQUAL},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_SLASH},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1741,15 +1612,10 @@ static struct key keys_compose_cyr_e[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Абв", "Абв", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_EQUAL},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_SLASH},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1759,15 +1625,10 @@ static struct key keys_compose_cyr_u[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Абв", "Абв", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_EQUAL},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_SLASH},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1777,15 +1638,10 @@ static struct key keys_compose_cyr_l[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Абв", "Абв", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_EQUAL},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_SLASH},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1795,15 +1651,10 @@ static struct key keys_compose_cyr_n[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Абв", "Абв", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_EQUAL},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_SLASH},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1814,15 +1665,10 @@ static struct key keys_compose_cyr_che[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Абв", "Абв", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_EQUAL},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_SLASH},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1833,15 +1679,10 @@ static struct key keys_compose_cyr_tse[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Абв", "Абв", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_EQUAL},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_SLASH},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1851,15 +1692,10 @@ static struct key keys_compose_cyr_g[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Абв", "Абв", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_EQUAL},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_SLASH},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1869,15 +1705,10 @@ static struct key keys_compose_cyr_k[] = {
   {"", "", 0.0, EndRow},
   {"", "", 0.0, EndRow},
   {"⇧", "⇫", 1.5, Mod, Shift, .scheme = 1},
-  {"", "", 7, Pad},
-  {"⌫", "⌫", 1.5, Code, KEY_BACKSPACE, .scheme = 1},
+  {"", "", 8.5, Pad},
   {"", "", 0.0, EndRow},
   {"Абв", "Абв", 1.0, BackLayer, .scheme = 1},
-  {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_EQUAL},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_SLASH},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"", "", 9, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1900,17 +1731,17 @@ static struct key keys_compose_math[] = {
   {"+", "+", 1, Code, KEY_EQUAL, 0, Shift},
   {"/", "/", 1, Code, KEY_SLASH},
   {"*", "*", 1, Code, KEY_8, 0, Shift},
+  {"-", "-", 1, Code, KEY_MINUS},
   {"=", "=", 1, Code, KEY_EQUAL},
   {"_", "_", 1, Code, KEY_MINUS, 0, Shift},
   {"—", "—", 1, Copy, 0x2014, 0, 0x2014},
-  {"", "", 2, Pad},
+  {"", "", 1, Pad},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
   {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {"-", "-", 1, Code, KEY_MINUS},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT, &layouts[ComposePunctuation]},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"Alt", "Alt", 1.0, Mod, Alt, .scheme = 1},
+  {"Sup", "Sup", 1.0, Mod, Super, .scheme = 1},
+  {"", "", 6, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1941,10 +1772,9 @@ static struct key keys_compose_punctuation[] = {
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
   {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA, &layouts[ComposeMath]},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT, &layouts[ComposePunctuation]},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"Alt", "Alt", 1.0, Mod, Alt, .scheme = 1},
+  {"Sup", "Sup", 1.0, Mod, Super, .scheme = 1},
+  {"", "", 6, Pad},
   {"", "", 0.0, Last},
 };
 
@@ -1968,9 +1798,8 @@ static struct key keys_compose_bracket[] = {
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, BackLayer, .scheme = 1},
   {"Ctr", "Ctr", 1.0, Mod, Ctrl, .scheme = 1},
-  {",", "'", 1.0, Code, KEY_COMMA, &layouts[ComposeMath]},
-  {"", "", 4.0, Code, KEY_SPACE},
-  {".", "?", 1.0, Code, KEY_DOT, &layouts[ComposePunctuation]},
-  {"Enter", "Enter", 2.0, Code, KEY_ENTER, .scheme = 1},
+  {"Alt", "Alt", 1.0, Mod, Alt, .scheme = 1},
+  {"Sup", "Sup", 1.0, Mod, Super, .scheme = 1},
+  {"", "", 6, Pad},
   {"", "", 0.0, Last},
 };