@react-spectrum/s2 3.0.0-nightly-e7053dd8f-250108 → 3.0.0-nightly-d87cc4422-250109

package/dist/Disclosure.css

@@ -43,7 +43,7 @@
     margin-inline-end: 0;
   }
 
-  ._8-3t1y {
+  ._9-3t1y {
     flex-shrink: 1;
   }
 
@@ -51,11 +51,11 @@
     min-width: 0;
   }
 
-  ._La {
+  ._Ma {
     outline-style: none;
   }
 
-  ._Lb {
+  ._Mb {
     outline-style: solid;
   }
 
@@ -63,37 +63,37 @@
     outline-color: var(--lightningcss-light, #4b75ff) var(--lightningcss-dark, #4069fd);
   }
 
-  ._Nc {
+  ._Oc {
     outline-width: 2px;
   }
 
-  ._M-3hmpw {
+  ._N-3hmpw {
     outline-offset: -2px;
   }
 
-  ._di {
+  ._ei {
     font-size: 1.125rem;
   }
 
-  ._dk {
+  ._ek {
     font-size: 1.25rem;
   }
 
-  ._dj {
+  ._ej {
     font-size: 1.375rem;
   }
 
-  ._dn {
+  ._en {
     font-size: 1.75rem;
   }
 
-  ._ed {
+  ._fd {
     font-variation-settings: "wght" 700;
     font-synthesis-weight: none;
     font-weight: 700;
   }
 
-  ._fa {
+  ._ga {
     line-height: 1.3;
   }
 
@@ -105,11 +105,11 @@
     color: var(--lightningcss-light, #c6c6c6) var(--lightningcss-dark, #444);
   }
 
-  ._9-3t1y {
+  .__a-3t1y {
     flex-grow: 1;
   }
 
-  ._1d {
+  ._2d {
     align-items: baseline;
   }
 
@@ -173,43 +173,43 @@
     border-inline-end-width: 0;
   }
 
-  ._va {
+  ._wa {
     border-start-start-radius: 0;
   }
 
-  ._vh {
+  ._wh {
     border-start-start-radius: .571429em;
   }
 
-  ._wa {
+  ._xa {
     border-start-end-radius: 0;
   }
 
-  ._wh {
+  ._xh {
     border-start-end-radius: .571429em;
   }
 
-  ._xa {
+  ._ya {
     border-end-start-radius: 0;
   }
 
-  ._xh {
+  ._yh {
     border-end-start-radius: .571429em;
   }
 
-  ._ya {
+  ._za {
     border-end-end-radius: 0;
   }
 
-  ._yh {
+  ._zh {
     border-end-end-radius: .571429em;
   }
 
-  ._ja {
+  ._ka {
     text-align: start;
   }
 
-  .__R-yksgrp {
+  .__S-yksgrp {
     -webkit-tap-highlight-color: #0000;
   }
 
@@ -253,15 +253,15 @@
     rotate: 90deg;
   }
 
-  ._Oa {
+  ._Pa {
     transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter;
   }
 
-  ._Q-375x7f {
+  ._R-375x7f {
     transition-duration: .15s;
   }
 
-  ._Ra {
+  ._Sa {
     transition-timing-function: cubic-bezier(.45, 0, .4, 1);
   }
 
@@ -269,15 +269,15 @@
     --iconPrimary: currentColor;
   }
 
-  ._8-3t1x {
+  ._9-3t1x {
     flex-shrink: 0;
   }
 
-  ._Zd {
+  ._0d {
     display: flex;
   }
 
-  ._1c {
+  ._2c {
     align-items: center;
   }
 
@@ -289,21 +289,21 @@
     column-gap: .25rem;
   }
 
-  ._ca {
+  ._da {
     font-family: adobe-clean-variable, adobe-clean, ui-sans-serif, system-ui, sans-serif;
   }
 
-  ._dg {
+  ._eg {
     font-size: 1rem;
   }
 
-  ._eb {
+  ._fb {
     font-variation-settings: "wght" 400;
     font-synthesis-weight: none;
     font-weight: 400;
   }
 
-  ._fb {
+  ._gb {
     line-height: 1.5;
   }
 
@@ -345,15 +345,15 @@
     border-bottom-width: 0;
   }
 
-  ._f-1x99dlob:is(:lang(ja), :lang(ko), :lang(zh), :lang(zh-Hant), :lang(zh-Hans)) {
+  ._g-1x99dlob:is(:lang(ja), :lang(ko), :lang(zh), :lang(zh-Hant), :lang(zh-Hans)) {
     line-height: 1.5;
   }
 
-  ._c-enzrfpb:lang(ar) {
+  ._d-enzrfpb:lang(ar) {
     font-family: myriad-arabic, ui-sans-serif, system-ui, sans-serif;
   }
 
-  ._f-1x99dloc:is(:lang(ja), :lang(ko), :lang(zh), :lang(zh-Hant), :lang(zh-Hans)) {
+  ._g-1x99dloc:is(:lang(ja), :lang(ko), :lang(zh), :lang(zh-Hant), :lang(zh-Hans)) {
     line-height: 1.7;
   }
 }
@@ -361,37 +361,37 @@
 @layer UNSAFE_overrides;
 
 @layer _.c {
-  ._c-enzwzjc:lang(he) {
+  ._d-enzwzjc:lang(he) {
     font-family: myriad-hebrew, ui-sans-serif, system-ui, sans-serif;
   }
 }
 
 @layer _.d {
-  ._c-enzykdd:lang(ja) {
+  ._d-enzykdd:lang(ja) {
     font-family: adobe-clean-han-japanese, Hiragino Kaku Gothic ProN, ヒラギノ角ゴ ProN W3, Osaka, YuGothic, Yu Gothic, メイリオ, Meiryo, ＭＳ Ｐゴシック, MS PGothic, sans-serif;
   }
 }
 
 @layer _.e {
-  ._c-enzzrge:lang(ko) {
+  ._d-enzzrge:lang(ko) {
     font-family: adobe-clean-han-korean, source-han-korean, Malgun Gothic, Apple Gothic, sans-serif;
   }
 }
 
 @layer _.f {
-  ._c-eo0c6sf:lang(zh) {
+  ._d-eo0c6sf:lang(zh) {
     font-family: adobe-clean-han-traditional, source-han-traditional, MingLiu, Heiti TC Light, sans-serif;
   }
 }
 
 @layer _.g {
-  ._c-1uotwbwg:lang(zh-hant) {
+  ._d-1uotwbwg:lang(zh-hant) {
     font-family: adobe-clean-han-traditional, source-han-traditional, MingLiu, Microsoft JhengHei UI, Microsoft JhengHei, Heiti TC Light, sans-serif;
   }
 }
 
 @layer _.h {
-  ._c-bc1l9oh:is(:lang(zh-Hans), :lang(zh-CN), :lang(zh-SG)) {
+  ._d-bc1l9oh:is(:lang(zh-Hans), :lang(zh-CN), :lang(zh-SG)) {
     font-family: adobe-clean-han-simplified-c, source-han-simplified-c, SimSun, Heiti SC Light, sans-serif;
   }
 }
@@ -406,23 +406,23 @@
 
 @layer _.b.b {
   @media not ((hover: hover) and (pointer: fine)) {
-    ._dbj {
+    ._ebj {
       font-size: 1.375rem;
     }
 
-    ._dbl {
+    ._ebl {
       font-size: 1.5rem;
     }
 
-    ._dbm {
+    ._ebm {
       font-size: 1.6875rem;
     }
 
-    ._dbo {
+    ._ebo {
       font-size: 2.125rem;
     }
 
-    ._dbh {
+    ._ebh {
       font-size: 1.1875rem;
     }
   }

package/dist/Disclosure.mjs

@@ -31,7 +31,7 @@ import {useDOMRef as $7VHtn$useDOMRef} from "@react-spectrum/utils";
 const $cf1d656285911959$export$d665dd135a51b28a = /*#__PURE__*/ (0, $7VHtn$createContext)(null);
 const $cf1d656285911959$var$disclosure = function anonymous(props, overrides) {
     let rules = " .";
-    let matches = (overrides || '').match(/(?:^|\s)(?:y|z|A|B|_9|_8|h|_5|_4|__A|__c|__d|__a|__b|U|__Q|X|Z|V|W|l|q|r)[^\s]+/g) || [];
+    let matches = (overrides || '').match(/(?:^|\s)(?:y|z|A|B|__a|_9|h|_6|_5|__B|__d|__e|__b|__c|V|__R|Y|_a|W|X|l|q|r)[^\s]+/g) || [];
     rules += matches.join('');
     let $q = false;
     for (let p of matches)if (/^\s*q/.test(p)) $q = true;
@@ -79,39 +79,39 @@ const $cf1d656285911959$export$74a362b31437ec83 = /*#__PURE__*/ (0, $7VHtn$forwa
         })
     });
 });
-const $cf1d656285911959$var$headingStyle = " . Aa Ba ya za _9-3t1y _Zd _8-3t1y qo";
+const $cf1d656285911959$var$headingStyle = " . Aa Ba ya za __a-3t1y _0d _9-3t1y qo";
 const $cf1d656285911959$var$buttonStyles = function anonymous(props) {
     let rules = " .";
-    if (props.isFocusVisible) rules += ' _Lb';
-    else rules += ' _La';
+    if (props.isFocusVisible) rules += ' _Mb';
+    else rules += ' _Ma';
     rules += ' da_____M';
     rules += ' dx';
-    rules += ' _Nc';
-    rules += ' _M-3hmpw';
-    rules += ' _c-bc1l9oh';
-    rules += ' _c-1uotwbwg';
-    rules += ' _c-eo0c6sf';
-    rules += ' _c-enzzrge';
-    rules += ' _c-enzykdd';
-    rules += ' _c-enzwzjc';
-    rules += ' _c-enzrfpb';
-    rules += ' _ca';
+    rules += ' _Oc';
+    rules += ' _N-3hmpw';
+    rules += ' _d-bc1l9oh';
+    rules += ' _d-1uotwbwg';
+    rules += ' _d-eo0c6sf';
+    rules += ' _d-enzzrge';
+    rules += ' _d-enzykdd';
+    rules += ' _d-enzwzjc';
+    rules += ' _d-enzrfpb';
+    rules += ' _da';
     if (props.size === "XL") {
-        rules += ' _dbo';
-        rules += ' _dn';
+        rules += ' _ebo';
+        rules += ' _en';
     } else if (props.size === "L") {
-        rules += ' _dbm';
-        rules += ' _dj';
+        rules += ' _ebm';
+        rules += ' _ej';
     } else if (props.size === "M") {
-        rules += ' _dbl';
-        rules += ' _dk';
+        rules += ' _ebl';
+        rules += ' _ek';
     } else if (props.size === "S") {
-        rules += ' _dbj';
-        rules += ' _di';
+        rules += ' _ebj';
+        rules += ' _ei';
     }
-    rules += ' _ed';
-    rules += ' _f-1x99dlob';
-    rules += ' _fa';
+    rules += ' _fd';
+    rules += ' _g-1x99dlob';
+    rules += ' _ga';
     if (props.isDisabled) rules += ' aj';
     else {
         if (props.isPressed) rules += ' ao';
@@ -119,9 +119,9 @@ const $cf1d656285911959$var$buttonStyles = function anonymous(props) {
         else if (props.isHovered) rules += ' ao';
         else rules += ' an';
     }
-    rules += ' _Zd';
-    rules += ' _9-3t1y';
-    rules += ' _1d';
+    rules += ' _0d';
+    rules += ' __a-3t1y';
+    rules += ' _2d';
     rules += ' C-10cd9hn';
     rules += ' D-10cd9hn';
     rules += ' E-1dbqcch';
@@ -134,16 +134,13 @@ const $cf1d656285911959$var$buttonStyles = function anonymous(props) {
     else if (props.isHovered) rules += ' b-1tgz9bq';
     else if (props.isFocusVisible) rules += ' b-1tgz9bq';
     else rules += ' ba';
-    rules += ' _Oa';
-    rules += ' _Q-375x7f';
-    rules += ' _Ra';
+    rules += ' _Pa';
+    rules += ' _R-375x7f';
+    rules += ' _Sa';
     rules += ' u-375tp0';
     rules += ' v-375tp1';
     rules += ' sa';
     rules += ' ta';
-    if (props.isQuiet) rules += ' _vh';
-    else if (props.isFocusVisible) rules += ' _vh';
-    else rules += ' _va';
     if (props.isQuiet) rules += ' _wh';
     else if (props.isFocusVisible) rules += ' _wh';
     else rules += ' _wa';
@@ -153,8 +150,11 @@ const $cf1d656285911959$var$buttonStyles = function anonymous(props) {
     if (props.isQuiet) rules += ' _yh';
     else if (props.isFocusVisible) rules += ' _yh';
     else rules += ' _ya';
-    rules += ' _ja';
-    rules += ' __R-yksgrp';
+    if (props.isQuiet) rules += ' _zh';
+    else if (props.isFocusVisible) rules += ' _zh';
+    else rules += ' _za';
+    rules += ' _ka';
+    rules += ' __S-yksgrp';
     if (props.size === "XL") {
         if (props.density === "spacious") rules += ' -_375tou_o-_q';
         else if (props.density === "regular") rules += ' -_375tou_o-_i';
@@ -180,11 +180,11 @@ const $cf1d656285911959$var$chevronStyles = function anonymous(props) {
     let rules = " .";
     if (props.isExpanded) rules += ' R-3hn0u';
     else if (props.isRTL) rules += ' R-375xa6';
-    rules += ' _Oa';
-    rules += ' _Q-375x7f';
-    rules += ' _Ra';
+    rules += ' _Pa';
+    rules += ' _R-375x7f';
+    rules += ' _Sa';
     rules += ' -rwx0fg_e-b';
-    rules += ' _8-3t1x';
+    rules += ' _9-3t1x';
     return rules;
 };
 const $cf1d656285911959$var$InternalDisclosureHeader = /*#__PURE__*/ (0, $7VHtn$createContext)(null);
@@ -217,7 +217,7 @@ function $cf1d656285911959$var$DisclosureHeaderWithForwardRef(props, ref) {
         ],
         children: /*#__PURE__*/ (0, $7VHtn$jsx)("div", {
             style: UNSAFE_style,
-            className: (UNSAFE_className ?? '') + " . _Zd _1c ic jc",
+            className: (UNSAFE_className ?? '') + " . _0d _2c ic jc",
             ref: domRef,
             children: children
         })
@@ -269,19 +269,19 @@ const $cf1d656285911959$export$7843c6a5b3e340a2 = /*#__PURE__*/ (0, $7VHtn$forwa
 });
 const $cf1d656285911959$var$panelStyles = function anonymous(props) {
     let rules = " .";
-    rules += ' _c-bc1l9oh';
-    rules += ' _c-1uotwbwg';
-    rules += ' _c-eo0c6sf';
-    rules += ' _c-enzzrge';
-    rules += ' _c-enzykdd';
-    rules += ' _c-enzwzjc';
-    rules += ' _c-enzrfpb';
-    rules += ' _ca';
-    rules += ' _dbh';
-    rules += ' _dg';
-    rules += ' _eb';
-    rules += ' _f-1x99dloc';
+    rules += ' _d-bc1l9oh';
+    rules += ' _d-1uotwbwg';
+    rules += ' _d-eo0c6sf';
+    rules += ' _d-enzzrge';
+    rules += ' _d-enzykdd';
+    rules += ' _d-enzwzjc';
+    rules += ' _d-enzrfpb';
+    rules += ' _da';
+    rules += ' _ebh';
+    rules += ' _eg';
     rules += ' _fb';
+    rules += ' _g-1x99dloc';
+    rules += ' _gb';
     rules += ' an';
     if (props.isExpanded) rules += ' Ed';
     if (props.isExpanded) rules += ' Ff';

package/dist/Divider.cjs

@@ -31,16 +31,16 @@ $parcel$export(module.exports, "Divider", () => $2d04acb918636de0$export$2e0a83e
 const $2d04acb918636de0$export$30fbfd376abdf190 = /*#__PURE__*/ (0, $98jss$react.createContext)(null);
 const $2d04acb918636de0$export$e8c9778bf415dd08 = function anonymous(props, overrides) {
     let rules = " .";
-    let matches = (overrides || '').match(/(?:^|\s)(?:y|z|A|B|_9|_8|h|_5|_4|__A|__c|__d|__a|__b|U|__Q|X|Z|V|W|l|q|r)[^\s]+/g) || [];
+    let matches = (overrides || '').match(/(?:^|\s)(?:y|z|A|B|__a|_9|h|_6|_5|__B|__d|__e|__b|__c|V|__R|Y|_a|W|X|l|q|r)[^\s]+/g) || [];
     rules += matches.join('');
-    let $_4 = false;
+    let $_5 = false;
     let $A = false;
     let $B = false;
     let $y = false;
     let $z = false;
     let $l = false;
     for (let p of matches){
-        if (/^\s*_4/.test(p)) $_4 = true;
+        if (/^\s*_5/.test(p)) $_5 = true;
         if (/^\s*A/.test(p)) $A = true;
         if (/^\s*B/.test(p)) $B = true;
         if (/^\s*y/.test(p)) $y = true;
@@ -49,7 +49,7 @@ const $2d04acb918636de0$export$e8c9778bf415dd08 = function anonymous(props, over
     }
     if (props.staticColor === "white") rules += ' -_1de2x0q_b-b';
     else if (props.staticColor === "black") rules += ' -_1de2x0q_b-c';
-    if (!$_4) rules += ' _4e';
+    if (!$_5) rules += ' _5e';
     rules += ' ba_____I';
     if (props.isStaticColor) {
         if (props.size === "L") rules += ' b_____E';
@@ -57,10 +57,10 @@ const $2d04acb918636de0$export$e8c9778bf415dd08 = function anonymous(props, over
     } else if (props.size === "L") rules += ' bn';
     else rules += ' bh';
     rules += ' wf';
-    rules += ' _vf';
     rules += ' _wf';
     rules += ' _xf';
     rules += ' _yf';
+    rules += ' _zf';
     if (!$A) rules += ' Aa';
     if (!$B) rules += ' Ba';
     if (!$y) rules += ' ya';

package/dist/Divider.css

@@ -11,7 +11,7 @@
     --s2-container-bg: black;
   }
 
-  ._4e {
+  ._5e {
     align-self: stretch;
   }
 
@@ -35,19 +35,19 @@
     border-style: none;
   }
 
-  ._vf {
+  ._wf {
     border-start-start-radius: 9999px;
   }
 
-  ._wf {
+  ._xf {
     border-start-end-radius: 9999px;
   }
 
-  ._xf {
+  ._yf {
     border-end-start-radius: 9999px;
   }
 
-  ._yf {
+  ._zf {
     border-end-end-radius: 9999px;
   }
 

package/dist/Divider.mjs

@@ -23,16 +23,16 @@ import {useDOMRef as $5nGzy$useDOMRef} from "@react-spectrum/utils";
 const $bdf52657dac0f070$export$30fbfd376abdf190 = /*#__PURE__*/ (0, $5nGzy$createContext)(null);
 const $bdf52657dac0f070$export$e8c9778bf415dd08 = function anonymous(props, overrides) {
     let rules = " .";
-    let matches = (overrides || '').match(/(?:^|\s)(?:y|z|A|B|_9|_8|h|_5|_4|__A|__c|__d|__a|__b|U|__Q|X|Z|V|W|l|q|r)[^\s]+/g) || [];
+    let matches = (overrides || '').match(/(?:^|\s)(?:y|z|A|B|__a|_9|h|_6|_5|__B|__d|__e|__b|__c|V|__R|Y|_a|W|X|l|q|r)[^\s]+/g) || [];
     rules += matches.join('');
-    let $_4 = false;
+    let $_5 = false;
     let $A = false;
     let $B = false;
     let $y = false;
     let $z = false;
     let $l = false;
     for (let p of matches){
-        if (/^\s*_4/.test(p)) $_4 = true;
+        if (/^\s*_5/.test(p)) $_5 = true;
         if (/^\s*A/.test(p)) $A = true;
         if (/^\s*B/.test(p)) $B = true;
         if (/^\s*y/.test(p)) $y = true;
@@ -41,7 +41,7 @@ const $bdf52657dac0f070$export$e8c9778bf415dd08 = function anonymous(props, over
     }
     if (props.staticColor === "white") rules += ' -_1de2x0q_b-b';
     else if (props.staticColor === "black") rules += ' -_1de2x0q_b-c';
-    if (!$_4) rules += ' _4e';
+    if (!$_5) rules += ' _5e';
     rules += ' ba_____I';
     if (props.isStaticColor) {
         if (props.size === "L") rules += ' b_____E';
@@ -49,10 +49,10 @@ const $bdf52657dac0f070$export$e8c9778bf415dd08 = function anonymous(props, over
     } else if (props.size === "L") rules += ' bn';
     else rules += ' bh';
     rules += ' wf';
-    rules += ' _vf';
     rules += ' _wf';
     rules += ' _xf';
     rules += ' _yf';
+    rules += ' _zf';
     if (!$A) rules += ' Aa';
     if (!$B) rules += ' Ba';
     if (!$y) rules += ' ya';

package/dist/DropZone.cjs

@@ -40,22 +40,22 @@ $parcel$export(module.exports, "DropZone", () => $797cda10ca96fc86$export$3c6489
 const $797cda10ca96fc86$export$14a72053295ff9a6 = /*#__PURE__*/ (0, $faaBC$react.createContext)(null);
 const $797cda10ca96fc86$var$dropzone = function anonymous(props, overrides) {
     let rules = " .";
-    let matches = (overrides || '').match(/(?:^|\s)(?:y|z|A|B|_9|_8|h|_5|_4|__A|__c|__d|__a|__b|U|__Q|X|Z|V|W|l|q|r|k|o|p)[^\s]+/g) || [];
+    let matches = (overrides || '').match(/(?:^|\s)(?:y|z|A|B|__a|_9|h|_6|_5|__B|__d|__e|__b|__c|V|__R|Y|_a|W|X|l|q|r|k|o|p)[^\s]+/g) || [];
     rules += matches.join('');
-    let $U = false;
-    for (let p of matches)if (/^\s*U/.test(p)) $U = true;
-    rules += ' _Zd';
-    rules += ' _2d';
-    rules += ' _1c';
-    if (!$U) rules += ' Uc';
-    rules += ' _c-bc1l9oh';
-    rules += ' _c-1uotwbwg';
-    rules += ' _c-eo0c6sf';
-    rules += ' _c-enzzrge';
-    rules += ' _c-enzykdd';
-    rules += ' _c-enzwzjc';
-    rules += ' _c-enzrfpb';
-    rules += ' _ca';
+    let $V = false;
+    for (let p of matches)if (/^\s*V/.test(p)) $V = true;
+    rules += ' _0d';
+    rules += ' _3d';
+    rules += ' _2c';
+    if (!$V) rules += ' Vc';
+    rules += ' _d-bc1l9oh';
+    rules += ' _d-1uotwbwg';
+    rules += ' _d-eo0c6sf';
+    rules += ' _d-enzzrge';
+    rules += ' _d-enzykdd';
+    rules += ' _d-enzwzjc';
+    rules += ' _d-enzrfpb';
+    rules += ' _da';
     rules += ' ao';
     if (props.isDropTarget) rules += ' wa';
     else rules += ' wb';
@@ -67,10 +67,10 @@ const $797cda10ca96fc86$var$dropzone = function anonymous(props, overrides) {
     if (props.isFocusVisible) rules += ' cx';
     else if (props.isDropTarget) rules += ' cx';
     else rules += ' ci';
-    rules += ' _vd';
     rules += ' _wd';
     rules += ' _xd';
     rules += ' _yd';
+    rules += ' _zd';
     rules += ' Eh';
     rules += ' Fh';
     rules += ' Ch';
@@ -79,14 +79,14 @@ const $797cda10ca96fc86$var$dropzone = function anonymous(props, overrides) {
 };
 const $797cda10ca96fc86$var$banner = function anonymous(props) {
     let rules = " .";
-    rules += ' Ua';
-    rules += ' Ya';
-    rules += ' _aa';
+    rules += ' Va';
+    rules += ' Za';
+    rules += ' _ba';
     rules += ' y_d';
     rules += ' z_d';
-    rules += ' _Zd';
-    rules += ' _1c';
-    rules += ' _2d';
+    rules += ' _0d';
+    rules += ' _2c';
+    rules += ' _3d';
     rules += ' o-375tou';
     rules += ' le';
     if (props.size === "L") rules += ' r___L';
@@ -96,12 +96,12 @@ const $797cda10ca96fc86$var$banner = function anonymous(props) {
     else if (props.isFocusVisible) rules += ' b_____S';
     else if (props.isHovered) rules += ' b_____S';
     else rules += ' b_____R';
-    rules += ' _vc';
     rules += ' _wc';
     rules += ' _xc';
     rules += ' _yc';
+    rules += ' _zc';
     rules += ' ac';
-    rules += ' _ed';
+    rules += ' _fd';
     rules += ' E-17c1d5h';
     rules += ' F-17c1d5h';
     rules += ' C-17c1d5h';