diff --git a/data/keyboards/es.yaml b/data/keyboards/es.yaml
index 57d68738..db400f31 100644
--- a/data/keyboards/es.yaml
+++ b/data/keyboards/es.yaml
@@ -21,27 +21,27 @@ views:
         - "q w e r t y u i o p"
         - "a s d f g h j k l ñ"
         - "Shift_L   z x c v b n m  BackSpace"
-        - "show_numbers show_eschar preferences         space        ? period Return"
+        - "show_numbers show_eschars preferences         space        ? period Return"
     upper:
         - "Q W E R T Y U I O P"
         - "A S D F G H J K L Ñ"
         - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_numbers show_eschar preferences         space        ¿ period Return"
+        - "show_numbers show_eschars preferences         space        ¿ period Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
-        - "show_letters show_eschar preferences         space        ? period Return"
+        - "show_symbols   , \" ' colon ; ! = BackSpace"
+        - "show_letters show_eschars preferences         space        ? period Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_eschar preferences         space        ? period Return"
-    eschar:
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters show_eschars preferences         space        ? period Return"
+    eschars:
         - "á é í ó ú Á É Í Ó Ú"
-        - "ñ Ñ ç Ç « » ¡ ! { }"
-        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
-        - "show_letters show_symbols preferences         space        ? period Return"
+        - "à è ì ò ù À È Ì Ò Ù"
+        - "show_numbers ü ç ï Ü Ç Ï ¡  BackSpace"
+        - "show_letters show_eschars preferences         space        « » Return"
 
 buttons:
     Shift_L:
@@ -63,26 +63,24 @@ buttons:
             set_view: "numbers"
         outline: "altline"
         label: "123"
-    show_numbers_from_symbols:
-        action:
-            set_view: "numbers"
-        outline: "altline"
-        label: "123"
     show_letters:
         action:
             set_view: "base"
         outline: "altline"
-        label: "ABC"
+        label: "abc"
     show_symbols:
         action:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    show_eschar:
+    show_eschars:
         action:
-            set_view: "eschar"
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
         outline: "altline"
-        label: "áÇ"
+        label: "áÁ"
+
     period:
         outline: "default"
         label: "."