diff --git a/app/src/main/assets/layouts/functional_keys_tablet.json b/app/src/main/assets/layouts/functional_keys_tablet.json
index 17966185..5eb7fabc 100644
--- a/app/src/main/assets/layouts/functional_keys_tablet.json
+++ b/app/src/main/assets/layouts/functional_keys_tablet.json
@@ -22,9 +22,9 @@
       "email":    { "label": "@", "groupId": 1, "type": "function" },
       "uri":      { "label": "/", "groupId": 1, "type": "function" }
     },
-    { "label": "language_switch" },
-    { "label": "emoji" },
-    { "label": "numpad" },
+    { "$": "keyboard_state_selector", "languageKeyEnabled": { "$": "keyboard_state_selector", "alphabet": { "label": "language_switch" }}},
+    { "$": "keyboard_state_selector", "emojiKeyEnabled": { "$": "keyboard_state_selector", "alphabet": { "label": "emoji" }}},
+    { "$": "keyboard_state_selector", "symbols": { "label": "numpad" }},
     { "label": "space" },
     { "label": "period" },
     { "$": "variation_selector",