diff --git a/cisco-ios-xr.sublime-syntax b/cisco-ios-xr.sublime-syntax
index d1a9abe..e3003e6 100644
--- a/cisco-ios-xr.sublime-syntax
+++ b/cisco-ios-xr.sublime-syntax
@@ -8540,14 +8540,17 @@ contexts:
     - match: |
         (?xi)
         ^\s*
-        (arp\s+learning)\s+(
-          (?:local)|
-          (?:disable)
+        (arp\s+learning)\s+(?:
+          (local)|
+          (disable)|
+          (\S+)
         )
         \s*$
       captures:
         1: support.constant
         2: entity.other.attribute-name
+        3: entity.other.attribute-name
+        4: invalid.illegal
 
   interface_host_routing:
     - match: |
diff --git a/cisco/ios_xr/ios-xr.l2vpn.bridge_group.bridge_domain.interface.sublime-completions b/cisco/ios_xr/ios-xr.l2vpn.bridge_group.bridge_domain.interface.sublime-completions
new file mode 100644
index 0000000..4aa9983
--- /dev/null
+++ b/cisco/ios_xr/ios-xr.l2vpn.bridge_group.bridge_domain.interface.sublime-completions
@@ -0,0 +1,9 @@
+{
+    "scope": "text.network.cisco.ios_xr text.network.cisco.l2_vpn.bridge_group.bridge_domain.interface",
+    "completions": [
+        {
+            "trigger": "evi\t1-65534",
+            "contents": "evi ${1:65534}"
+        },
+    ]
+}
diff --git a/messages/head.md b/messages/head.md
index 17c99ea..63d8c30 100644
--- a/messages/head.md
+++ b/messages/head.md
@@ -1,2 +1,9 @@
 # [{{version}}] - {{date}}
 
+✨ Cisco IOS-XR
+
+* interface → arp learning: highlight invalid values
+
+* l2vpn → bridge group → bridge domain → interface → evi: Autocomplete
+
+
diff --git a/tests/syntax_test_cisco_ios_xr.cisco-ios-xr b/tests/syntax_test_cisco_ios_xr.cisco-ios-xr
index 3232f2a..15c1e28 100644
--- a/tests/syntax_test_cisco_ios_xr.cisco-ios-xr
+++ b/tests/syntax_test_cisco_ios_xr.cisco-ios-xr
@@ -220,15 +220,12 @@ interface BVI34
  ipv4 address 10.0.0.5 255.0.0.0
  arp learning local
  arp learning disable
+ arp learning invalid
  local-proxy-arp
  mac-address 0123.4567.89ab
  mac-address invalid
 !
 !
-evpn
-  interface Bundle-Ether1
-    ethernet-segment
-
 
 evpn
  interface Bundle-Ether1
@@ -247,10 +244,8 @@ evpn
     load-balancing-mode per-service
     load-balancing-mode invalid
 
-    # Illegal values
     bgp route-target 0000.0000.0000
     bgp route-target invalid
-    # Valid value
     bgp route-target 4000.0000.0001
  !
  evi 65535
@@ -265,6 +260,7 @@ evpn
     route-target export invalid
 !
 !
+
 interface bundle-ether1.2 l2transport
   no shutdown
   encapsulation dot1q 1