@wavemaker/rn-codegen 11.14.2-rc.6311 → 11.15.0-1.246

package/src/templates/foundation-theme/dist/android/style.js

@@ -60,8 +60,23 @@ export default {
         "activeDotStyle": {
             "backgroundColor": "var(--wm-carousel-dots-background)",
             "--wm-carousel-dots-opacity": 1,
+            "--wm-carousel-dots-width": 10,
+            "--wm-carousel-dots-height": 10,
+            "--wm-carousel-dots-border-radius": 5,
             "--wm-carousel-dots-background": "var(--wm-color-primary-container)",
-            "opacity": "var(--wm-carousel-dots-opacity)"
+            "--wm-carousel-dots-border-color": "var(--wm-color-primary-container)",
+            "--wm-carousel-dots-border-width": "var(--wm-border-width-base)",
+            "--wm-carousel-dots-margin-left": "var(--wm-radius-xxs)",
+            "--wm-carousel-dots-margin-right": "var(--wm-radius-xxs)",
+            "--wm-carousel-slide-padding-horizontal": "var(--wm-space-4)",
+            "opacity": "var(--wm-carousel-dots-opacity)",
+            "width": "var(--wm-carousel-dots-width)",
+            "height": "var(--wm-carousel-dots-height)",
+            "borderRadius": "var(--wm-carousel-dots-border-radius)",
+            "borderColor": "var(--wm-carousel-dots-border-color)",
+            "marginLeft": "var(--wm-carousel-dots-margin-left)",
+            "marginRight": "var(--wm-carousel-dots-margin-right)",
+            "borderWidth": "var(--wm-carousel-dots-border-width)"
         },
         "root": {
             "rippleColor": "var(--wm-carousel-ripple-color)"
@@ -72,6 +87,10 @@ export default {
             "paddingRight": "var(--wm-carousel-slide-padding-horizontal)",
             "paddingHorizontal": "var(--wm-carousel-slide-padding-horizontal)"
         },
+        "activeSlide": {
+            "paddingLeft": "var(--wm-carousel-slide-padding-horizontal)",
+            "paddingRight": "var(--wm-carousel-slide-padding-horizontal)"
+        },
         "skeleton": {
             "width": "var(--wm-carousel-skeleton-width)"
         },
@@ -98,15 +117,19 @@ export default {
         }
     },
     "app-webview": {
-        "container": {
-            "minHeight": "var(--wm-webview-container-min-height)"
+        "root": {
+            "backgroundColor": "var(--wm-webview-background-color)",
+            "paddingRight": "var(--wm-webview-padding-right)",
+            "paddingLeft": "var(--wm-webview-padding-left)",
+            "paddingBottom": "var(--wm-webview-padding-bottom)",
+            "paddingTop": "var(--wm-webview-padding-top)"
         }
     },
     "app-anchor": {
         "text": {
             "color": "var(--wm-anchor-color)",
-            "paddingLeft": "var(--wm-space-2)",
-            "paddingRight": "var(--wm-space-2)",
+            "paddingLeft": "var(--wm-anchor-text-padding-left)",
+            "paddingRight": "var(--wm-anchor-text-padding-right)",
             "fontSize": "var(--wm-anchor-font-size)",
             "fontFamily": "var(--wm-anchor-font-family)",
             "fontWeight": "var(--wm-anchor-font-weight)",
@@ -260,7 +283,6 @@ export default {
             "borderColor": "#fff"
         },
         "root": {
-            "alignSelf": "flex-start",
             "flexDirection": "column",
             "overflow": "hidden",
             "position": "var(--wm-btn-position)",
@@ -272,7 +294,7 @@ export default {
             "borderColor": "var(--wm-btn-border-color)",
             "borderRadius": "var(--wm-btn-radius)",
             "rippleColor": "var(--wm-btn-ripple-color)",
-            "parsedBoxShadow": "var(--wm-btn-shadow)",
+            "boxShadow": "var(--wm-btn-shadow)",
             "minWidth": "var(--wm-btn-min-width)",
             "minHeight": "var(--wm-btn-height)",
             "paddingLeft": "var(--wm-btn-padding-left)",
@@ -308,12 +330,15 @@ export default {
             "paddingRight": "var(--wm-space-0)",
             "paddingTop": "var(--wm-space-0)",
             "paddingBottom": "var(--wm-space-0)",
-            "minWidth": "var(--wm-btn-icon-size)",
-            "width": "var(--wm-btn-icon-size)",
-            "height": "var(--wm-btn-icon-size)",
-            "fontSize": "var(--wm-btn-icon-size)",
             "root": {
                 "color": "var(--wm-btn-color)"
+            },
+            "icon": {
+                "minWidth": "var(--wm-btn-icon-size)",
+                "width": "var(--wm-btn-icon-size)",
+                "height": "var(--wm-btn-icon-size)",
+                "fontSize": "var(--wm-btn-icon-size)",
+                "lineHeight": "var(--wm-btn-icon-size)"
             }
         },
         "skeleton": {
@@ -517,6 +542,14 @@ export default {
         }
     },
     "app-button-disabled": {
+        "root": {
+            "color": "var(--wm-btn-color)",
+            "backgroundColor": "var(--wm-btn-background)",
+            "borderColor": "var(--wm-btn-border-color)",
+            "opacity": "var(--wm-btn-opacity)",
+            "cursor": "var(--wm-btn-cursor)",
+            "boxShadow": "var(--wm-btn-shadow)"
+        },
         "--wm-btn-opacity": 0.38,
         "--wm-btn-cursor": "not-allowed",
         "--wm-btn-shadow": "none",
@@ -794,41 +827,53 @@ export default {
     },
     "app-buttongroup": {
         "root": {
-            "borderColor": "#ccc",
+            "borderColor": "var(--wm-button-group-border-color)",
             "backgroundColor": "#fff",
             "flexDirection": "row",
             "borderRadius": "var(--wm-button-group-radius)",
-            "--wm-button-group-radius": "var(--wm-radius-sm)"
+            "borderWidth": "var(--wm-button-group-border-width)",
+            "borderStyle": "var(--wm-button-group-border-style)"
         }
     },
     "btn-group-child": {
-        "borderColor": "#ccc",
-        "backgroundColor": "var(--wm-btn-background)"
+        "borderColor": "var(--wm-btn-border-color)",
+        "backgroundColor": "var(--wm-btn-background)",
+        "borderTopWidth": "var(--wm-btn-border-width)",
+        "borderBottomWidth": "var(--wm-btn-border-width)",
+        "borderLeftWidth": "var(--wm-btn-border-width)",
+        "borderRightWidth": "var(--wm-btn-border-width)"
     },
     "btn-group-first-child": {
         "root": {
-            "borderColor": "#ccc",
-            "borderTopLeftRadius": 0,
-            "borderBottomLeftRadius": 0,
-            "backgroundColor": "var(--wm-btn-background)"
+            "borderColor": "var(--wm-btn-border-color)",
+            "backgroundColor": "var(--wm-btn-background)",
+            "borderTopWidth": "var(--wm-btn-border-width)",
+            "borderBottomWidth": "var(--wm-btn-border-width)",
+            "borderLeftWidth": "var(--wm-btn-border-width)",
+            "borderRightWidth": "var(--wm-btn-border-width)",
+            "borderTopLeftRadius": "var(--wm-btn-radius)",
+            "borderBottomLeftRadius": "var(--wm-btn-radius)"
         }
     },
     "btn-group-child-vertical": {
-        "alignSelf": "stretch",
-        "flexGrow": 0
+        "alignSelf": "stretch"
     },
     "btn-group-vertical": {
         "root": {
             "flexDirection": "column",
             "borderRadius": "var(--wm-button-group-radius)"
-        },
-        "--wm-button-group-radius": "var(--wm-radius-xs)"
+        }
     },
     "btn-group-last-child": {
         "root": {
-            "borderTopRightRadius": 0,
-            "borderBottomRightRadius": 0,
-            "backgroundColor": "var(--wm-btn-background)"
+            "backgroundColor": "var(--wm-btn-background)",
+            "borderTopWidth": "var(--wm-btn-border-width)",
+            "borderBottomWidth": "var(--wm-btn-border-width)",
+            "borderLeftWidth": "var(--wm-btn-border-width)",
+            "borderRightWidth": "var(--wm-btn-border-width)",
+            "borderColor": "var(--wm-btn-border-color)",
+            "borderTopRightRadius": "var(--wm-btn-radius)",
+            "borderBottomRightRadius": "var(--wm-btn-radius)"
         }
     },
     "app-icon": {
@@ -901,8 +946,19 @@ export default {
     "app-label": {
         "root": {
             "color": "#888",
-            "margin": "var(--wm-label-margin)",
-            "padding": "var(--wm-label-padding)"
+            "marginTop": "var(--wm-label-margin-top)",
+            "marginBottom": "var(--wm-label-margin-bottom)",
+            "marginLeft": "var(--wm-label-margin-left)",
+            "marginRight": "var(--wm-label-margin-right)",
+            "backgroundColor": "var(--wm-label-background-color)",
+            "borderRadius": "var(--wm-label-border-radius)",
+            "borderWidth": "var(--wm-label-border-width)",
+            "borderStyle": "var(--wm-label-border-style)",
+            "borderColor": "var(--wm-label-border-color)",
+            "paddingTop": "var(--wm-label-padding-top)",
+            "paddingBottom": "var(--wm-label-padding-bottom)",
+            "paddingLeft": "var(--wm-label-padding-left)",
+            "paddingRight": "var(--wm-label-padding-right)"
         },
         "asterisk": {
             "color": "var(--wm-label-asterisk-color)"
@@ -925,7 +981,9 @@ export default {
         },
         "text": {
             "color": "var(--wm-label-color)",
-            "fontWeight": "var(--wm-label-font-weight)"
+            "fontWeight": "var(--wm-label-font-weight)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-border-radius": 6,
         "--wm-label-padding-left": "var(--wm-space-8)",
@@ -947,7 +1005,9 @@ export default {
         },
         "text": {
             "color": "var(--wm-label-color)",
-            "fontWeight": "var(--wm-label-font-weight)"
+            "fontWeight": "var(--wm-label-font-weight)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-border-radius": 6,
         "--wm-label-padding-left": "var(--wm-space-8)",
@@ -977,7 +1037,9 @@ export default {
         },
         "text": {
             "color": "var(--wm-label-color)",
-            "fontWeight": "var(--wm-label-font-weight)"
+            "fontWeight": "var(--wm-label-font-weight)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-border-radius": 6,
         "--wm-label-padding-left": "var(--wm-space-8)",
@@ -999,7 +1061,9 @@ export default {
         },
         "text": {
             "color": "var(--wm-label-color)",
-            "fontWeight": "var(--wm-label-font-weight)"
+            "fontWeight": "var(--wm-label-font-weight)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-border-radius": 6,
         "--wm-label-padding-left": "var(--wm-space-8)",
@@ -1021,7 +1085,9 @@ export default {
         },
         "text": {
             "color": "var(--wm-label-color)",
-            "fontWeight": "var(--wm-label-font-weight)"
+            "fontWeight": "var(--wm-label-font-weight)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-border-radius": 6,
         "--wm-label-padding-left": "var(--wm-space-8)",
@@ -1034,31 +1100,96 @@ export default {
     },
     "text-danger": {
         "text": {
-            "color": "var(--wm-label-color)"
+            "color": "var(--wm-label-color)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
+        },
+        "root": {
+            "backgroundColor": "var(--wm-label-background-color)",
+            "borderRadius": "var(--wm-label-border-radius)",
+            "borderWidth": "var(--wm-label-border-width)",
+            "borderStyle": "var(--wm-label-border-style)",
+            "borderColor": "var(--wm-label-border-color)",
+            "paddingTop": "var(--wm-label-padding-top)",
+            "paddingBottom": "var(--wm-label-padding-bottom)",
+            "paddingLeft": "var(--wm-label-padding-left)",
+            "paddingRight": "var(--wm-label-padding-right)"
         },
         "--wm-label-color": "var(--wm-color-error)"
     },
     "text-primary": {
         "text": {
-            "color": "var(--wm-label-color)"
+            "color": "var(--wm-label-color)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
+        },
+        "root": {
+            "backgroundColor": "var(--wm-label-background-color)",
+            "borderRadius": "var(--wm-label-border-radius)",
+            "borderWidth": "var(--wm-label-border-width)",
+            "borderStyle": "var(--wm-label-border-style)",
+            "borderColor": "var(--wm-label-border-color)",
+            "paddingTop": "var(--wm-label-padding-top)",
+            "paddingBottom": "var(--wm-label-padding-bottom)",
+            "paddingLeft": "var(--wm-label-padding-left)",
+            "paddingRight": "var(--wm-label-padding-right)"
         },
         "--wm-label-color": "var(--wm-color-primary)"
     },
     "text-success": {
         "text": {
-            "color": "var(--wm-label-color)"
+            "color": "var(--wm-label-color)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
+        },
+        "root": {
+            "backgroundColor": "var(--wm-label-background-color)",
+            "borderRadius": "var(--wm-label-border-radius)",
+            "borderWidth": "var(--wm-label-border-width)",
+            "borderStyle": "var(--wm-label-border-style)",
+            "borderColor": "var(--wm-label-border-color)",
+            "paddingTop": "var(--wm-label-padding-top)",
+            "paddingBottom": "var(--wm-label-padding-bottom)",
+            "paddingLeft": "var(--wm-label-padding-left)",
+            "paddingRight": "var(--wm-label-padding-right)"
         },
         "--wm-label-color": "var(--wm-color-success)"
     },
     "text-warning": {
         "text": {
-            "color": "var(--wm-label-color)"
+            "color": "var(--wm-label-color)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
+        },
+        "root": {
+            "backgroundColor": "var(--wm-label-background-color)",
+            "borderRadius": "var(--wm-label-border-radius)",
+            "borderWidth": "var(--wm-label-border-width)",
+            "borderStyle": "var(--wm-label-border-style)",
+            "borderColor": "var(--wm-label-border-color)",
+            "paddingTop": "var(--wm-label-padding-top)",
+            "paddingBottom": "var(--wm-label-padding-bottom)",
+            "paddingLeft": "var(--wm-label-padding-left)",
+            "paddingRight": "var(--wm-label-padding-right)"
         },
         "--wm-label-color": "var(--wm-color-warning)"
     },
     "text-info": {
         "text": {
-            "color": "var(--wm-label-color)"
+            "color": "var(--wm-label-color)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
+        },
+        "root": {
+            "backgroundColor": "var(--wm-label-background-color)",
+            "borderRadius": "var(--wm-label-border-radius)",
+            "borderWidth": "var(--wm-label-border-width)",
+            "borderStyle": "var(--wm-label-border-style)",
+            "borderColor": "var(--wm-label-border-color)",
+            "paddingTop": "var(--wm-label-padding-top)",
+            "paddingBottom": "var(--wm-label-padding-bottom)",
+            "paddingLeft": "var(--wm-label-padding-left)",
+            "paddingRight": "var(--wm-label-padding-right)"
         },
         "--wm-label-color": "var(--wm-color-info)"
     },
@@ -1068,11 +1199,14 @@ export default {
             "color": "var(--wm-label-color)",
             "fontWeight": "var(--wm-label-font-weight)",
             "fontFamily": "var(--wm-label-font-family)",
-            "margin": "var(--wm-label-margin)"
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-font-size": "var(--wm-h1-font-size)",
         "--wm-label-font-weight": "var(--wm-h1-font-weight)",
-        "--wm-label-font-family": "var(--wm-h1-font-family)"
+        "--wm-label-font-family": "var(--wm-h1-font-family)",
+        "--wm-label-line-height": "var(--wm-h1-line-height)",
+        "--wm-label-letter-spacing": "var(--wm-h1-letter-spacing)"
     },
     "h2": {
         "text": {
@@ -1080,11 +1214,14 @@ export default {
             "color": "var(--wm-label-color)",
             "fontWeight": "var(--wm-label-font-weight)",
             "fontFamily": "var(--wm-label-font-family)",
-            "margin": "var(--wm-label-margin)"
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-font-size": "var(--wm-h2-font-size)",
         "--wm-label-font-weight": "var(--wm-h2-font-weight)",
-        "--wm-label-font-family": "var(--wm-h2-font-family)"
+        "--wm-label-font-family": "var(--wm-h2-font-family)",
+        "--wm-label-line-height": "var(--wm-h2-line-height)",
+        "--wm-label-letter-spacing": "var(--wm-h2-letter-spacing)"
     },
     "h3": {
         "text": {
@@ -1092,11 +1229,14 @@ export default {
             "color": "var(--wm-label-color)",
             "fontWeight": "var(--wm-label-font-weight)",
             "fontFamily": "var(--wm-label-font-family)",
-            "margin": "var(--wm-label-margin)"
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-font-size": "var(--wm-h3-font-size)",
         "--wm-label-font-weight": "var(--wm-h3-font-weight)",
-        "--wm-label-font-family": "var(--wm-h3-font-family)"
+        "--wm-label-font-family": "var(--wm-h3-font-family)",
+        "--wm-label-line-height": "var(--wm-h3-line-height)",
+        "--wm-label-letter-spacing": "var(--wm-h3-letter-spacing)"
     },
     "h4": {
         "text": {
@@ -1104,11 +1244,14 @@ export default {
             "color": "var(--wm-label-color)",
             "fontWeight": "var(--wm-label-font-weight)",
             "fontFamily": "var(--wm-label-font-family)",
-            "margin": "var(--wm-label-margin)"
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-font-size": "var(--wm-h4-font-size)",
         "--wm-label-font-weight": "var(--wm-h4-font-weight)",
-        "--wm-label-font-family": "var(--wm-h4-font-family)"
+        "--wm-label-font-family": "var(--wm-h4-font-family)",
+        "--wm-label-line-height": "var(--wm-h4-line-height)",
+        "--wm-label-letter-spacing": "var(--wm-h4-letter-spacing)"
     },
     "h5": {
         "text": {
@@ -1116,11 +1259,14 @@ export default {
             "color": "var(--wm-label-color)",
             "fontWeight": "var(--wm-label-font-weight)",
             "fontFamily": "var(--wm-label-font-family)",
-            "margin": "var(--wm-label-margin)"
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-font-size": "var(--wm-h5-font-size)",
         "--wm-label-font-weight": "var(--wm-h5-font-weight)",
-        "--wm-label-font-family": "var(--wm-h5-font-family)"
+        "--wm-label-font-family": "var(--wm-h5-font-family)",
+        "--wm-label-line-height": "var(--wm-h5-line-height)",
+        "--wm-label-letter-spacing": "var(--wm-h5-letter-spacing)"
     },
     "h6": {
         "text": {
@@ -1128,37 +1274,70 @@ export default {
             "color": "var(--wm-label-color)",
             "fontWeight": "var(--wm-label-font-weight)",
             "fontFamily": "var(--wm-label-font-family)",
-            "margin": "var(--wm-label-margin)"
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-font-size": "var(--wm-h6-font-size)",
         "--wm-label-font-weight": "var(--wm-h6-font-weight)",
-        "--wm-label-font-family": "var(--wm-h6-font-family)"
+        "--wm-label-font-family": "var(--wm-h6-font-family)",
+        "--wm-label-line-height": "var(--wm-h6-line-height)",
+        "--wm-label-letter-spacing": "var(--wm-h6-letter-spacing)"
     },
     "text-muted": {
         "text": {
-            "color": "var(--wm-label-color)"
+            "color": "var(--wm-label-color)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
+        },
+        "root": {
+            "backgroundColor": "var(--wm-label-background-color)",
+            "borderRadius": "var(--wm-label-border-radius)",
+            "borderWidth": "var(--wm-label-border-width)",
+            "borderStyle": "var(--wm-label-border-style)",
+            "borderColor": "var(--wm-label-border-color)",
+            "paddingTop": "var(--wm-label-padding-top)",
+            "paddingBottom": "var(--wm-label-padding-bottom)",
+            "paddingLeft": "var(--wm-label-padding-left)",
+            "paddingRight": "var(--wm-label-padding-right)"
         },
         "--wm-label-color": "var(--wm-color-on-surface-variant)"
     },
     "p": {
         "text": {
             "fontSize": "var(--wm-label-font-size)",
-            "margin": "var(--wm-label-margin)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)",
             "color": "var(--wm-label-color)"
         },
-        "--wm-label-font-size": "var(--wm-body-small-font-size)"
+        "--wm-label-font-size": "var(--wm-p-font-size)",
+        "--wm-label-font-weight": "var(--wm-p-font-weight)",
+        "--wm-label-font-family": "var(--wm-p-font-family)",
+        "--wm-label-line-height": "var(--wm-p-line-height)",
+        "--wm-label-letter-spacing": "var(--wm-p-letter-spacing)"
     },
     "media-heading": {
         "text": {
             "fontSize": "var(--wm-label-font-size)",
-            "margin": "var(--wm-label-margin)",
             "color": "var(--wm-label-color)"
         },
         "--wm-label-font-size": "var(--wm-body-large-font-size)"
     },
     "text-secondary": {
+        "root": {
+            "backgroundColor": "var(--wm-label-background-color)",
+            "borderRadius": "var(--wm-label-border-radius)",
+            "borderWidth": "var(--wm-label-border-width)",
+            "borderStyle": "var(--wm-label-border-style)",
+            "borderColor": "var(--wm-label-border-color)",
+            "paddingTop": "var(--wm-label-padding-top)",
+            "paddingBottom": "var(--wm-label-padding-bottom)",
+            "paddingLeft": "var(--wm-label-padding-left)",
+            "paddingRight": "var(--wm-label-padding-right)"
+        },
         "text": {
-            "color": "var(--wm-label-color)"
+            "color": "var(--wm-label-color)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-color": "var(--wm-color-secondary)"
     },
@@ -1173,7 +1352,9 @@ export default {
         },
         "text": {
             "color": "var(--wm-label-color)",
-            "fontWeight": "var(--wm-label-font-weight)"
+            "fontWeight": "var(--wm-label-font-weight)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-border-radius": 6,
         "--wm-label-padding-left": "var(--wm-space-8)",
@@ -1195,7 +1376,9 @@ export default {
         },
         "text": {
             "color": "var(--wm-label-color)",
-            "fontWeight": "var(--wm-label-font-weight)"
+            "fontWeight": "var(--wm-label-font-weight)",
+            "lineHeight": "var(--wm-label-line-height)",
+            "letterSpacing": "var(--wm-label-letter-spacing)"
         },
         "--wm-label-border-radius": 6,
         "--wm-label-padding-left": "var(--wm-space-8)",
@@ -1206,6 +1389,19 @@ export default {
         "--wm-label-background-color": "var(--wm-color-on-surface-variant)",
         "--wm-label-color": "var(--wm-color-surface-variant)"
     },
+    "text-tertiary": {
+        "--wm-label-color": "var(--wm-color-tertiary)"
+    },
+    "label-tertiary": {
+        "--wm-label-border-radius": 6,
+        "--wm-label-padding-left": "var(--wm-space-8)",
+        "--wm-label-padding-right": "var(--wm-space-8)",
+        "--wm-label-padding-top": "var(--wm-space-4)",
+        "--wm-label-padding-bottom": "var(--wm-space-4)",
+        "--wm-label-font-weight": "var(--wm-font-weight-700)",
+        "--wm-label-background-color": "var(--wm-color-tertiary)",
+        "--wm-label-color": "var(--wm-color-on-tertiary)"
+    },
     "success-dark-message": {
         "root": {
             "backgroundColor": "#28a745",
@@ -1576,7 +1772,16 @@ export default {
             "justifyContent": "center",
             "alignItems": "center",
             "maxWidth": "100%",
-            "maxHeight": "100%"
+            "maxHeight": "100%",
+            "borderRadius": "var(--wm-picture-radius)",
+            "paddingTop": "var(--wm-picture-padding-top)",
+            "paddingBottom": "var(--wm-picture-padding-bottom)",
+            "paddingLeft": "var(--wm-picture-padding-left)",
+            "paddingRight": "var(--wm-picture-padding-right)",
+            "backgroundColor": "var(--wm-picture-background)",
+            "borderWidth": "var(--wm-picture-border-width)",
+            "borderStyle": "var(--wm-picture-border-style)",
+            "borderColor": "var(--wm-picture-border-color)"
         }
     },
     "rounded-image": {
@@ -1590,7 +1795,6 @@ export default {
             "borderWidth": "var(--wm-picture-border-width)",
             "borderStyle": "var(--wm-picture-border-style)",
             "borderColor": "var(--wm-picture-border-color)",
-            "--wm-picture-background": "transparent",
             "--wm-picture-radius": "var(--wm-radius-xs)",
             "--wm-picture-padding-top": "var(--wm-space-0)",
             "--wm-picture-padding-bottom": "var(--wm-space-0)",
@@ -1598,7 +1802,8 @@ export default {
             "--wm-picture-padding-right": "var(--wm-space-0)",
             "--wm-picture-border-color": "var(--wm-color-border)",
             "--wm-picture-border-style": "var(--wm-border-style-base)",
-            "--wm-picture-border-width": "var(--wm-border-width-0)"
+            "--wm-picture-border-width": "var(--wm-border-width-0)",
+            "--wm-picture-background": "var(--wm-color-transparent)"
         }
     },
     "circle-image": {
@@ -1612,7 +1817,6 @@ export default {
             "borderWidth": "var(--wm-picture-border-width)",
             "borderStyle": "var(--wm-picture-border-style)",
             "borderColor": "var(--wm-picture-border-color)",
-            "--wm-picture-background": "transparent",
             "--wm-picture-radius": "var(--wm-radius-circle)",
             "--wm-picture-padding-top": "var(--wm-space-0)",
             "--wm-picture-padding-bottom": "var(--wm-space-0)",
@@ -1620,7 +1824,8 @@ export default {
             "--wm-picture-padding-right": "var(--wm-space-0)",
             "--wm-picture-border-color": "var(--wm-color-border)",
             "--wm-picture-border-style": "var(--wm-border-style-base)",
-            "--wm-picture-border-width": "var(--wm-border-width-0)"
+            "--wm-picture-border-width": "var(--wm-border-width-0)",
+            "--wm-picture-background": "var(--wm-color-transparent)"
         }
     },
     "app-default-progress-bar": {
@@ -1853,7 +2058,7 @@ export default {
             "borderWidth": "var(--wm-search-border-width)"
         },
         "invalid": {
-            "borderBottomColor": "#dc3545",
+            "borderBottomColor": "var(--wm-search-invalid-color)",
             "borderColor": "var(--wm-search-invalid-color)"
         },
         "searchButton": {
@@ -1877,7 +2082,12 @@ export default {
                 "borderTopRightRadius": "var(--wm-search-border-radius)",
                 "borderBottomRightRadius": "var(--wm-search-border-radius)",
                 "borderColor": "var(--wm-search-border-color)",
-                "borderWidth": "var(--wm-search-border-width)"
+                "borderWidth": "var(--wm-search-border-width)",
+                "paddingLeft": "var(--wm-search-btn-padding-left)",
+                "paddingRight": "var(--wm-search-btn-padding-right)",
+                "paddingTop": "var(--wm-search-btn-padding-top)",
+                "paddingBottom": "var(--wm-search-btn-padding-bottom)",
+                "width": "var(--wm-search-btn-width)"
             }
         },
         "searchItem": {
@@ -1892,7 +2102,7 @@ export default {
             "borderBottomWidth": "var(--wm-search-item-separator-width)"
         },
         "placeholderText": {
-            "color": "var(--wm-search-placeholder-color)"
+            "color": "var(--wm-search-placeholder-text-color)"
         },
         "root": {
             "borderRadius": "var(--wm-search-border-radius)"
@@ -1900,7 +2110,21 @@ export default {
         "clearButton": {
             "root": {
                 "borderColor": "transparent",
-                "rippleColor": "transparent"
+                "rippleColor": "transparent",
+                "paddingLeft": "var(--wm-search-clear-btn-padding-left)",
+                "paddingRight": "var(--wm-search-clear-btn-padding-right)",
+                "paddingTop": "var(--wm-search-clear-btn-padding-top)",
+                "paddingBottom": "var(--wm-search-clear-btn-padding-bottom)",
+                "borderRadius": "var(--wm-search-clear-btn-border-radius)",
+                "backgroundColor": "var(--wm-search-clear-btn-background-color)",
+                "width": "var(--wm-search-clear-btn-width)"
+            },
+            "icon": {
+                "icon": {
+                    "backgroundColor": "transparent",
+                    "color": "var(--wm-search-clear-btn-icon-color)",
+                    "fontSize": "var(--wm-search-clear-btn-icon-size)"
+                }
             }
         },
         "dataCompleteItem": {
@@ -2206,11 +2430,17 @@ export default {
     "app-panel-footer": {
         "root": {
             "backgroundColor": "var(--wm-panel-footer-background)",
-            "paddingInline": "var(--wm-panel-footer-padding)",
-            "paddingBlock": "var(--wm-panel-footer-padding)",
+            "paddingInline": "var(--wm-panel-footer-padding-inline)",
+            "paddingBlock": "var(--wm-panel-footer-padding-block)",
             "borderStyle": "var(--wm-panel-footer-border-style)",
             "borderWidth": "var(--wm-panel-footer-border-width)",
-            "borderColor": "var(--wm-panel-footer-border-color)"
+            "borderColor": "var(--wm-panel-footer-border-color)",
+            "borderRadius": "var(--wm-panel-footer-border-radius)",
+            "minHeight": "var(--wm-panel-footer-min-height)",
+            "marginTop": "var(--wm-panel-footer-margin-top)",
+            "marginBottom": "var(--wm-panel-footer-margin-bottom)",
+            "marginLeft": "var(--wm-panel-footer-margin-left)",
+            "marginRight": "var(--wm-panel-footer-margin-right)"
         }
     },
     "app-panel": {
@@ -2223,17 +2453,20 @@ export default {
             "borderRadius": "var(--wm-panel-radius)",
             "borderColor": "var(--wm-panel-border-color)",
             "borderWidth": "var(--wm-panel-border-width)",
-            "parsedBoxShadow": "var(--wm-panel-shadow)"
+            "boxShadow": "var(--wm-panel-shadow)"
         },
         "text": {
-            "color": "var(--wm-panel-heading-color)",
+            "color": "var(--wm-panel-heading-text-color)",
             "fontFamily": "var(--wm-panel-heading-font-family)",
             "fontSize": "var(--wm-panel-heading-font-size)",
-            "fontWeight": "var(--wm-panel-heading-font-weight)"
+            "fontWeight": "var(--wm-panel-heading-font-weight)",
+            "letterSpacing": "var(--wm-panel-heading-letter-spacing)",
+            "lineHeight": "var(--wm-panel-heading-line-height)"
         },
         "header": {
             "backgroundColor": "var(--wm-panel-heading-background)",
             "borderColor": "#fff",
+            "gap": "var(--wm-panel-heading-gap)",
             "paddingInline": "var(--wm-panel-heading-padding-inline)",
             "paddingBlock": "var(--wm-panel-heading-padding-block)"
         },
@@ -2264,13 +2497,19 @@ export default {
             "backgroundColor": "#4263eb",
             "color": "#fff"
         },
-        "subHeading": {
-            "color": "var(--wm-panel-description-color)"
-        },
         "icon": {
             "text": {
-                "color": "var(--wm-panel-heading-color)"
+                "fontSize": "var(--wm-panel-heading-icon-size)",
+                "color": "var(--wm-panel-heading-icon-color)"
             }
+        },
+        "subheading": {
+            "fontFamily": "var(--wm-panel-description-font-family)",
+            "fontSize": "var(--wm-panel-description-font-size)",
+            "fontWeight": "var(--wm-panel-description-font-weight)",
+            "letterSpacing": "var(--wm-panel-description-letter-spacing)",
+            "lineHeight": "var(--wm-panel-description-line-height)",
+            "color": "var(--wm-panel-description-color)"
         }
     },
     "panel-default": {
@@ -2278,18 +2517,19 @@ export default {
             "backgroundColor": "var(--wm-panel-heading-background)"
         },
         "text": {
-            "color": "var(--wm-panel-heading-color)"
+            "color": "var(--wm-panel-heading-text-color)"
         },
-        "subHeading": {
+        "subheading": {
             "color": "var(--wm-panel-description-color)"
         },
         "icon": {
             "text": {
-                "color": "var(--wm-panel-heading-color)"
+                "color": "var(--wm-panel-heading-icon-color)"
             }
         },
         "--wm-panel-heading-background": "var(--wm-color-surface-container)",
-        "--wm-panel-heading-color": "var(--wm-color-on-surface)",
+        "--wm-panel-heading-icon-color": "var(--wm-color-on-surface)",
+        "--wm-panel-heading-text-color": "var(--wm-color-on-surface)",
         "--wm-panel-description-color": "var(--wm-color-on-surface)"
     },
     "panel-danger": {
@@ -2297,18 +2537,19 @@ export default {
             "backgroundColor": "var(--wm-panel-heading-background)"
         },
         "text": {
-            "color": "var(--wm-panel-heading-color)"
+            "color": "var(--wm-panel-heading-text-color)"
         },
-        "subHeading": {
+        "subheading": {
             "color": "var(--wm-panel-description-color)"
         },
         "icon": {
             "text": {
-                "color": "var(--wm-panel-heading-color)"
+                "color": "var(--wm-panel-heading-icon-color)"
             }
         },
         "--wm-panel-heading-background": "var(--wm-color-error-container)",
-        "--wm-panel-heading-color": "var(--wm-color-error)",
+        "--wm-panel-heading-icon-color": "var(--wm-color-error)",
+        "--wm-panel-heading-text-color": "var(--wm-color-error)",
         "--wm-panel-description-color": "var(--wm-color-error)"
     },
     "panel-success": {
@@ -2316,18 +2557,19 @@ export default {
             "backgroundColor": "var(--wm-panel-heading-background)"
         },
         "text": {
-            "color": "var(--wm-panel-heading-color)"
+            "color": "var(--wm-panel-heading-text-color)"
         },
-        "subHeading": {
+        "subheading": {
             "color": "var(--wm-panel-description-color)"
         },
         "icon": {
             "text": {
-                "color": "var(--wm-panel-heading-color)"
+                "color": "var(--wm-panel-heading-icon-color)"
             }
         },
         "--wm-panel-heading-background": "var(--wm-color-success-container)",
-        "--wm-panel-heading-color": "var(--wm-color-success)",
+        "--wm-panel-heading-icon-color": "var(--wm-color-success)",
+        "--wm-panel-heading-text-color": "var(--wm-color-success)",
         "--wm-panel-description-color": "var(--wm-color-success)"
     },
     "panel-warning": {
@@ -2335,18 +2577,19 @@ export default {
             "backgroundColor": "var(--wm-panel-heading-background)"
         },
         "text": {
-            "color": "var(--wm-panel-heading-color)"
+            "color": "var(--wm-panel-heading-text-color)"
         },
-        "subHeading": {
+        "subheading": {
             "color": "var(--wm-panel-description-color)"
         },
         "icon": {
             "text": {
-                "color": "var(--wm-panel-heading-color)"
+                "color": "var(--wm-panel-heading-icon-color)"
             }
         },
         "--wm-panel-heading-background": "var(--wm-color-warning-container)",
-        "--wm-panel-heading-color": "var(--wm-color-warning)",
+        "--wm-panel-heading-icon-color": "var(--wm-color-warning)",
+        "--wm-panel-heading-text-color": "var(--wm-color-warning)",
         "--wm-panel-description-color": "var(--wm-color-warning)"
     },
     "panel-info": {
@@ -2354,18 +2597,19 @@ export default {
             "backgroundColor": "var(--wm-panel-heading-background)"
         },
         "text": {
-            "color": "var(--wm-panel-heading-color)"
+            "color": "var(--wm-panel-heading-text-color)"
         },
-        "subHeading": {
+        "subheading": {
             "color": "var(--wm-panel-description-color)"
         },
         "icon": {
             "text": {
-                "color": "var(--wm-panel-heading-color)"
+                "color": "var(--wm-panel-heading-icon-color)"
             }
         },
         "--wm-panel-heading-background": "var(--wm-color-info-container)",
-        "--wm-panel-heading-color": "var(--wm-color-info)",
+        "--wm-panel-heading-icon-color": "var(--wm-color-info)",
+        "--wm-panel-heading-text-color": "var(--wm-color-info)",
         "--wm-panel-description-color": "var(--wm-color-info)"
     },
     "panel-primary": {
@@ -2373,57 +2617,60 @@ export default {
             "backgroundColor": "var(--wm-panel-heading-background)"
         },
         "text": {
-            "color": "var(--wm-panel-heading-color)"
+            "color": "var(--wm-panel-heading-text-color)"
         },
-        "subHeading": {
+        "subheading": {
             "color": "var(--wm-panel-description-color)"
         },
         "icon": {
             "text": {
-                "color": "var(--wm-panel-heading-color)"
+                "color": "var(--wm-panel-heading-icon-color)"
             }
         },
         "--wm-panel-heading-background": "var(--wm-color-primary-container)",
-        "--wm-panel-heading-color": "var(--wm-color-primary)",
+        "--wm-panel-heading-icon-color": "var(--wm-color-primary)",
+        "--wm-panel-heading-text-color": "var(--wm-color-primary)",
         "--wm-panel-description-color": "var(--wm-color-primary)"
     },
     "panel-secondary": {
         "root": {
             "--wm-panel-heading-background": "var(--wm-color-secondary-container)",
-            "--wm-panel-heading-color": "var(--wm-color-secondary)",
+            "--wm-panel-heading-icon-color": "var(--wm-color-secondary)",
+            "--wm-panel-heading-text-color": "var(--wm-color-secondary)",
             "--wm-panel-description-color": "var(--wm-color-secondary)"
         },
         "header": {
             "backgroundColor": "var(--wm-panel-heading-background)"
         },
         "text": {
-            "color": "var(--wm-panel-heading-color)"
+            "color": "var(--wm-panel-heading-text-color)"
         },
-        "subHeading": {
+        "subheading": {
             "color": "var(--wm-panel-description-color)"
         },
         "icon": {
             "text": {
-                "color": "var(--wm-panel-heading-color)"
+                "color": "var(--wm-panel-heading-icon-color)"
             }
         }
     },
     "panel-tertiary": {
         "--wm-panel-heading-background": "var(--wm-color-tertiary-container)",
-        "--wm-panel-heading-color": "var(--wm-color-tertiary)",
+        "--wm-panel-heading-icon-color": "var(--wm-color-tertiary)",
+        "--wm-panel-heading-text-color": "var(--wm-color-tertiary)",
         "--wm-panel-description-color": "var(--wm-color-tertiary)",
         "header": {
             "backgroundColor": "var(--wm-panel-heading-background)"
         },
         "text": {
-            "color": "var(--wm-panel-heading-color)"
+            "color": "var(--wm-panel-heading-text-color)"
         },
-        "subHeading": {
+        "subheading": {
             "color": "var(--wm-panel-description-color)"
         },
         "icon": {
             "text": {
-                "color": "var(--wm-panel-heading-color)"
+                "color": "var(--wm-panel-heading-icon-color)"
             }
         }
     },
@@ -2435,48 +2682,72 @@ export default {
     "app-tabs": {
         "root": {
             "borderColor": "var(--wm-tabs-border-color)",
+            "width": "100%",
             "backgroundColor": "var(--wm-tabs-background)",
             "borderRadius": "var(--wm-tabs-border-radius)",
             "borderStyle": "var(--wm-tabs-border-style)",
             "borderWidth": "var(--wm-tabs-border-width)",
-            "borderBottomWidth": "var(--wm-tabs-border-width)"
+            "borderBottomWidth": "var(--wm-tabs-border-width)",
+            "minHeight": "var(--wm-tabs-min-height)"
         }
     },
     "app-tabheader": {
         "activeIndicator": {
             "--wm-tabs-item-heading-indicator-height": 3,
+            "--wm-tabs-item-heading-font-size": "var(--wm-h6-font-size)",
+            "--wm-tabs-item-heading-font-weight": "var(--wm-h6-font-weight)",
+            "--wm-tabs-item-heading-line-height": "var(--wm-h6-line-height)",
             "--wm-tabs-item-heading-indicator-background": "var(--wm-color-primary)",
             "--wm-tabs-item-heading-background": "var(--wm-color-surface)",
-            "--wm-tabs-item-heading-text": "var(--wm-color-primary)",
-            "--wm-tabs-item-heading-icon": "var(--wm-color-primary)",
+            "--wm-tabs-item-heading-text-color": "var(--wm-color-primary)",
+            "--wm-tabs-item-heading-icon-size": "var(--wm-icon-size)",
+            "--wm-tabs-item-heading-icon-color": "var(--wm-color-primary)",
             "backgroundColor": "var(--wm-tabs-item-heading-indicator-background)",
             "height": "var(--wm-tabs-item-heading-indicator-height)"
         },
         "activeHeader": {
             "--wm-tabs-item-heading-indicator-height": 3,
+            "--wm-tabs-item-heading-font-size": "var(--wm-h6-font-size)",
+            "--wm-tabs-item-heading-font-weight": "var(--wm-h6-font-weight)",
+            "--wm-tabs-item-heading-line-height": "var(--wm-h6-line-height)",
             "--wm-tabs-item-heading-indicator-background": "var(--wm-color-primary)",
             "--wm-tabs-item-heading-background": "var(--wm-color-surface)",
-            "--wm-tabs-item-heading-text": "var(--wm-color-primary)",
-            "--wm-tabs-item-heading-icon": "var(--wm-color-primary)",
+            "--wm-tabs-item-heading-text-color": "var(--wm-color-primary)",
+            "--wm-tabs-item-heading-icon-size": "var(--wm-icon-size)",
+            "--wm-tabs-item-heading-icon-color": "var(--wm-color-primary)",
             "backgroundColor": "var(--wm-tabs-item-heading-background)"
         },
         "activeHeaderIcon": {
             "--wm-tabs-item-heading-indicator-height": 3,
+            "--wm-tabs-item-heading-font-size": "var(--wm-h6-font-size)",
+            "--wm-tabs-item-heading-font-weight": "var(--wm-h6-font-weight)",
+            "--wm-tabs-item-heading-line-height": "var(--wm-h6-line-height)",
             "--wm-tabs-item-heading-indicator-background": "var(--wm-color-primary)",
             "--wm-tabs-item-heading-background": "var(--wm-color-surface)",
-            "--wm-tabs-item-heading-text": "var(--wm-color-primary)",
-            "--wm-tabs-item-heading-icon": "var(--wm-color-primary)",
+            "--wm-tabs-item-heading-text-color": "var(--wm-color-primary)",
+            "--wm-tabs-item-heading-icon-size": "var(--wm-icon-size)",
+            "--wm-tabs-item-heading-icon-color": "var(--wm-color-primary)",
             "icon": {
-                "color": "var(--wm-tabs-item-heading-icon)"
+                "color": "var(--wm-tabs-item-heading-icon-color)",
+                "fontSize": "var(--wm-tabs-item-heading-icon-size)",
+                "height": "var(--wm-tabs-item-heading-icon-height)",
+                "width": "var(--wm-tabs-item-heading-icon-width)"
             }
         },
         "activeHeaderText": {
             "--wm-tabs-item-heading-indicator-height": 3,
+            "--wm-tabs-item-heading-font-size": "var(--wm-h6-font-size)",
+            "--wm-tabs-item-heading-font-weight": "var(--wm-h6-font-weight)",
+            "--wm-tabs-item-heading-line-height": "var(--wm-h6-line-height)",
             "--wm-tabs-item-heading-indicator-background": "var(--wm-color-primary)",
             "--wm-tabs-item-heading-background": "var(--wm-color-surface)",
-            "--wm-tabs-item-heading-text": "var(--wm-color-primary)",
-            "--wm-tabs-item-heading-icon": "var(--wm-color-primary)",
-            "color": "var(--wm-tabs-item-heading-text)"
+            "--wm-tabs-item-heading-text-color": "var(--wm-color-primary)",
+            "--wm-tabs-item-heading-icon-size": "var(--wm-icon-size)",
+            "--wm-tabs-item-heading-icon-color": "var(--wm-color-primary)",
+            "color": "var(--wm-tabs-item-heading-text-color)",
+            "fontSize": "var(--wm-tabs-item-heading-font-size)",
+            "fontWeight": "var(--wm-tabs-item-heading-font-weight)",
+            "lineHeight": "var(--wm-tabs-item-heading-line-height)"
         },
         "root": {
             "backgroundColor": "var(--wm-tabs-heading-background)",
@@ -2486,7 +2757,7 @@ export default {
             "borderColor": "var(--wm-tabs-heading-border-color)"
         },
         "headerText": {
-            "color": "var(--wm-tabs-item-heading-text)",
+            "color": "var(--wm-tabs-item-heading-text-color)",
             "fontSize": "var(--wm-tabs-item-heading-font-size)",
             "fontWeight": "var(--wm-tabs-item-heading-font-weight)",
             "lineHeight": "var(--wm-tabs-item-heading-line-height)"
@@ -2504,8 +2775,8 @@ export default {
         },
         "headerIcon": {
             "icon": {
-                "color": "var(--wm-tabs-item-heading-icon)",
-                "fontSize": "var(--wm-tabs-item-heading-font-size)",
+                "color": "var(--wm-tabs-item-heading-icon-color)",
+                "fontSize": "var(--wm-tabs-item-heading-icon-size)",
                 "height": "var(--wm-tabs-item-heading-icon-height)",
                 "width": "var(--wm-tabs-item-heading-icon-width)"
             }
@@ -2647,7 +2918,7 @@ export default {
         "root": {
             "backgroundColor": "var(--wm-wizard-background-color)",
             "borderRadius": "var(--wm-wizard-border-radius)",
-            "parsedBoxShadow": "var(--wm-wizard-box-shadow)",
+            "boxShadow": "var(--wm-wizard-box-shadow)",
             "paddingTop": "var(--wm-wizard-padding-top)",
             "paddingBottom": "var(--wm-wizard-padding-bottom)",
             "paddingLeft": "var(--wm-wizard-padding-left)",
@@ -2765,72 +3036,107 @@ export default {
     "app-default-container": {
         "root": {
             "borderStyle": "var(--wm-container-border-style)",
-            "parsedBoxShadow": "var(--wm-container-box-shadow)",
+            "boxShadow": "var(--wm-container-box-shadow)",
             "backgroundColor": "var(--wm-container-background-color)",
             "paddingRight": "var(--wm-container-padding-right)",
             "paddingLeft": "var(--wm-container-padding-left)",
             "paddingBottom": "var(--wm-container-padding-bottom)",
             "paddingTop": "var(--wm-container-padding-top)",
             "borderRadius": "var(--wm-container-border-radius)",
-            "borderWidth": "var(--wm-container-border-width)",
+            "borderTopWidth": "var(--wm-container-border-width-top)",
+            "borderBottomWidth": "var(--wm-container-border-width-bottom)",
+            "borderLeftWidth": "var(--wm-container-border-width-left)",
+            "borderRightWidth": "var(--wm-container-border-width-right)",
             "borderColor": "var(--wm-container-border-color)",
             "opacity": "var(--wm-container-opacity)"
         },
         "--wm-container-border-color": "transparent",
         "--wm-container-border-style": "var(--wm-border-style-base)",
-        "--wm-container-border-width": "var(--wm-border-width-0)",
-        "--wm-container-border-radius": "var(--wm-radius-none)"
+        "--wm-container-border-width-top": "var(--wm-border-width-0)",
+        "--wm-container-border-width-bottom": "var(--wm-border-width-0)",
+        "--wm-container-border-width-left": "var(--wm-border-width-0)",
+        "--wm-container-border-width-right": "var(--wm-border-width-0)",
+        "--wm-container-border-radius": "var(--wm-radius-none)",
+        "--wm-container-box-shadow": "var(--wm-elevation-shadow-none)",
+        "--wm-container-padding-top": "var(--wm-space-0)",
+        "--wm-container-padding-bottom": "var(--wm-space-0)",
+        "--wm-container-padding-left": "var(--wm-space-0)",
+        "--wm-container-padding-right": "var(--wm-space-0)"
     },
     "app-elevated-container": {
         "root": {
             "borderStyle": "var(--wm-container-border-style)",
-            "parsedBoxShadow": "var(--wm-container-box-shadow)",
+            "boxShadow": "var(--wm-container-box-shadow)",
             "backgroundColor": "var(--wm-container-background-color)",
             "paddingRight": "var(--wm-container-padding-right)",
             "paddingLeft": "var(--wm-container-padding-left)",
             "paddingBottom": "var(--wm-container-padding-bottom)",
             "paddingTop": "var(--wm-container-padding-top)",
             "borderRadius": "var(--wm-container-border-radius)",
-            "borderWidth": "var(--wm-container-border-width)",
+            "borderTopWidth": "var(--wm-container-border-width-top)",
+            "borderBottomWidth": "var(--wm-container-border-width-bottom)",
+            "borderLeftWidth": "var(--wm-container-border-width-left)",
+            "borderRightWidth": "var(--wm-container-border-width-right)",
             "borderColor": "var(--wm-container-border-color)",
             "opacity": "var(--wm-container-opacity)"
         },
         "--wm-container-border-color": "transparent",
-        "--wm-container-parsedBoxShadow": "var(--wm-elevation-shadow-1)",
+        "--wm-container-box-shadow": "var(--wm-elevation-shadow-1)",
         "--wm-container-border-style": "var(--wm-border-style-base)",
-        "--wm-container-border-width": "var(--wm-border-width-base)",
-        "--wm-container-border-radius": "var(--wm-radius-sm)"
+        "--wm-container-border-width-top": "var(--wm-border-width-base)",
+        "--wm-container-border-width-bottom": "var(--wm-border-width-base)",
+        "--wm-container-border-width-left": "var(--wm-border-width-base)",
+        "--wm-container-border-width-right": "var(--wm-border-width-base)",
+        "--wm-container-border-radius": "var(--wm-radius-sm)",
+        "--wm-container-padding-top": "var(--wm-space-0)",
+        "--wm-container-padding-bottom": "var(--wm-space-0)",
+        "--wm-container-padding-left": "var(--wm-space-0)",
+        "--wm-container-padding-right": "var(--wm-space-0)"
     },
     "app-outlined-container": {
         "root": {
             "borderStyle": "var(--wm-container-border-style)",
-            "parsedBoxShadow": "var(--wm-container-box-shadow)",
+            "boxShadow": "var(--wm-container-box-shadow)",
             "backgroundColor": "var(--wm-container-background-color)",
             "paddingRight": "var(--wm-container-padding-right)",
             "paddingLeft": "var(--wm-container-padding-left)",
             "paddingBottom": "var(--wm-container-padding-bottom)",
             "paddingTop": "var(--wm-container-padding-top)",
             "borderRadius": "var(--wm-container-border-radius)",
-            "borderWidth": "var(--wm-container-border-width)",
+            "borderTopWidth": "var(--wm-container-border-width-top)",
+            "borderBottomWidth": "var(--wm-container-border-width-bottom)",
+            "borderLeftWidth": "var(--wm-container-border-width-left)",
+            "borderRightWidth": "var(--wm-container-border-width-right)",
             "borderColor": "var(--wm-container-border-color)",
             "opacity": "var(--wm-container-opacity)"
         },
         "--wm-container-border-radius": 1,
         "--wm-container-border-style": "var(--wm-border-style-base)",
-        "--wm-container-border-width": "var(--wm-border-width-base)",
-        "--wm-container-border-color": "var(--wm-color-outline-variant)"
+        "--wm-container-border-width-top": "var(--wm-border-width-base)",
+        "--wm-container-border-width-bottom": "var(--wm-border-width-base)",
+        "--wm-container-border-width-left": "var(--wm-border-width-base)",
+        "--wm-container-border-width-right": "var(--wm-border-width-base)",
+        "--wm-container-border-color": "var(--wm-color-outline-variant)",
+        "--wm-container-box-shadow": "var(--wm-elevation-shadow-none)",
+        "--wm-container-padding-top": "var(--wm-space-0)",
+        "--wm-container-padding-bottom": "var(--wm-space-0)",
+        "--wm-container-padding-left": "var(--wm-space-0)",
+        "--wm-container-padding-right": "var(--wm-space-0)"
     },
     "app-container": {
         "root": {
             "borderStyle": "var(--wm-container-border-style)",
-            "parsedBoxShadow": "var(--wm-container-box-shadow)",
+            "boxShadow": "var(--wm-container-box-shadow)",
             "backgroundColor": "var(--wm-container-background-color)",
             "paddingRight": "var(--wm-container-padding-right)",
             "paddingLeft": "var(--wm-container-padding-left)",
             "paddingBottom": "var(--wm-container-padding-bottom)",
             "paddingTop": "var(--wm-container-padding-top)",
             "borderRadius": "var(--wm-container-border-radius)",
-            "borderWidth": "var(--wm-container-border-width)",
+            "borderTopWidth": "var(--wm-container-border-width-top)",
+            "borderBottomWidth": "var(--wm-container-border-width-bottom)",
+            "borderLeftWidth": "var(--wm-container-border-width-left)",
+            "borderRightWidth": "var(--wm-container-border-width-right)",
             "borderColor": "var(--wm-container-border-color)",
             "opacity": "var(--wm-container-opacity)"
         }
@@ -2856,7 +3162,10 @@ export default {
         "heading": {
             "backgroundColor": "var(--wm-card-header-background-color)",
             "width": "var(--wm-card-header-width)",
-            "padding": "var(--wm-card-header-padding)"
+            "paddingLeft": "var(--wm-card-header-padding-left)",
+            "paddingRight": "var(--wm-card-header-padding-right)",
+            "paddingTop": "var(--wm-card-header-padding-top)",
+            "paddingBottom": "var(--wm-card-header-padding-bottom)"
         },
         "title": {
             "text": {
@@ -2878,7 +3187,7 @@ export default {
         "borderColor": "var(--wm-card-border-color)",
         "borderRadius": "var(--wm-card-border-radius)",
         "backgroundColor": "var(--wm-card-background)",
-        "parsedBoxShadow": "var(--wm-card-shadow)",
+        "boxShadow": "var(--wm-card-shadow)",
         "padding": "var(--wm-card-padding)",
         "--wm-card-background": "transparent",
         "--wm-card-shadow": "none",
@@ -2893,7 +3202,7 @@ export default {
         "borderColor": "var(--wm-card-border-color)",
         "borderRadius": "var(--wm-card-border-radius)",
         "backgroundColor": "var(--wm-card-background)",
-        "parsedBoxShadow": "var(--wm-card-shadow)",
+        "boxShadow": "var(--wm-card-shadow)",
         "padding": "var(--wm-card-padding)",
         "--wm-card-border-width": 0,
         "--wm-card-shadow": "none",
@@ -2908,7 +3217,7 @@ export default {
         "borderColor": "var(--wm-card-border-color)",
         "borderRadius": "var(--wm-card-border-radius)",
         "backgroundColor": "var(--wm-card-background)",
-        "parsedBoxShadow": "var(--wm-card-shadow)",
+        "boxShadow": "var(--wm-card-shadow)",
         "padding": "var(--wm-card-padding)",
         "--wm-card-border-width": 0,
         "--wm-card-shadow": "var(--wm-elevation-shadow-1)",
@@ -2921,13 +3230,7 @@ export default {
                 "borderRadius": "var(--wm-card-border-radius)"
             },
             "borderBottomColor": "#cccccc",
-            "backgroundColor": "var(--wm-list-item-header-background-color)",
-            "color": "var(--wm-list-item-header-color)",
-            "padding": "var(--wm-list-item-padding)",
-            "borderColor": "var(--wm-list-item-border-color)",
-            "borderRadius": "var(--wm-list-item-border-radius)",
-            "minHeight": "var(--wm-list-item-min-height)",
-            "borderStyle": "var(--wm-list-item-border-style)"
+            "backgroundColor": "#ffffff"
         }
     },
     "list-card-template": {
@@ -2940,14 +3243,14 @@ export default {
         "text": {
             "fontSize": "var(--wm-form-controls-label-font-size)",
             "color": "var(--wm-form-controls-label-color)",
-            "backgroundColor": "var(--wm-form-controls-label-background)",
             "fontWeight": "var(--wm-form-controls-label-font-weight)",
-            "fontFamily": "var(--wm-form-controls-label-font-family)",
-            "marginTop": "var(--wm-form-controls-label-margin-vertical)",
-            "marginBottom": "var(--wm-form-controls-label-margin-vertical)",
-            "marginLeft": "var(--wm-form-controls-label-margin-horizontal)",
-            "marginRight": "var(--wm-form-controls-label-margin-horizontal)"
-        }
+            "fontFamily": "var(--wm-form-controls-label-font-family)"
+        },
+        "backgroundColor": "var(--wm-form-controls-label-background)",
+        "marginTop": "var(--wm-form-controls-label-margin-vertical)",
+        "marginBottom": "var(--wm-form-controls-label-margin-vertical)",
+        "marginLeft": "var(--wm-form-controls-label-margin-horizontal)",
+        "marginRight": "var(--wm-form-controls-label-margin-horizontal)"
     },
     "app-form": {
         "footer": {
@@ -3026,54 +3329,90 @@ export default {
     "app-input": {
         "focused": {
             "--wm-form-controls-border-color": "var(--wm-color-primary)",
-            "--wm-form-controls-border-width": "var(--wm-border-width-base)",
+            "--wm-form-controls-border-top-width": "var(--wm-border-width-1)",
+            "--wm-form-controls-border-left-width": "var(--wm-border-width-1)",
+            "--wm-form-controls-border-right-width": "var(--wm-border-width-1)",
+            "--wm-form-controls-border-bottom-width": "var(--wm-border-width-1)",
             "--wm-form-controls-background": "var(--wm-color-outline-variant)",
             "--wm-form-controls-color": "var(--wm-color-black)",
-            "borderWidth": "var(--wm-form-controls-border-width)",
+            "borderTopWidth": "var(--wm-form-controls-border-top-width)",
+            "borderLeftWidth": "var(--wm-form-controls-border-left-width)",
+            "borderRightWidth": "var(--wm-form-controls-border-right-width)",
+            "borderBottomWidth": "var(--wm-form-controls-border-bottom-width)",
             "borderColor": "var(--wm-form-controls-border-color)",
             "backgroundColor": "var(--wm-form-controls-background)",
-            "color": "var(--wm-form-controls-color)",
             "opacity": "var(--wm-form-controls-opacity)",
             "minHeight": "var(--wm-form-controls-min-height)",
-            "paddingTop": "var(--wm-form-controls-padding-vertical)",
-            "paddingBottom": "var(--wm-form-controls-padding-vertical)",
-            "paddingLeft": "var(--wm-form-controls-padding-horizontal)",
-            "paddingRight": "var(--wm-form-controls-padding-horizontal)",
+            "paddingTop": "var(--wm-form-controls-padding-top)",
+            "paddingBottom": "var(--wm-form-controls-padding-bottom)",
+            "paddingLeft": "var(--wm-form-controls-padding-left)",
+            "paddingRight": "var(--wm-form-controls-padding-right)",
             "borderStyle": "var(--wm-form-controls-border-style)",
-            "borderRadius": "var(--wm-form-controls-border-radius)"
+            "borderRadius": "var(--wm-form-controls-border-radius)",
+            "color": "var(--wm-form-controls-color)",
+            "fontFamily": "var(--wm-form-controls-font-family)",
+            "fontWeight": "var(--wm-form-controls-font-weight)",
+            "minWidth": "var(--wm-form-controls-min-width)"
         },
         "disabled": {
             "--wm-form-controls-opacity": 0.67,
             "--wm-form-controls-border-color": "var(--wm-color-shadow)",
-            "--wm-form-controls-border-width": "var(--wm-border-width-base)",
+            "--wm-form-controls-border-top-width": "var(--wm-border-width-1)",
+            "--wm-form-controls-border-left-width": "var(--wm-border-width-1)",
+            "--wm-form-controls-border-right-width": "var(--wm-border-width-1)",
+            "--wm-form-controls-border-bottom-width": "var(--wm-border-width-1)",
             "--wm-form-controls-background": "var(--wm-color-surface-dim)",
             "--wm-form-controls-color": "var(--wm-color-scrim)",
             "minHeight": "var(--wm-form-controls-min-height)",
-            "paddingTop": "var(--wm-form-controls-padding-vertical)",
-            "paddingBottom": "var(--wm-form-controls-padding-vertical)",
-            "paddingLeft": "var(--wm-form-controls-padding-horizontal)",
-            "paddingRight": "var(--wm-form-controls-padding-horizontal)",
+            "paddingTop": "var(--wm-form-controls-padding-top)",
+            "paddingBottom": "var(--wm-form-controls-padding-bottom)",
+            "paddingLeft": "var(--wm-form-controls-padding-left)",
+            "paddingRight": "var(--wm-form-controls-padding-right)",
             "borderStyle": "var(--wm-form-controls-border-style)",
-            "borderWidth": "var(--wm-form-controls-border-width)",
+            "borderTopWidth": "var(--wm-form-controls-border-top-width)",
+            "borderLeftWidth": "var(--wm-form-controls-border-left-width)",
+            "borderRightWidth": "var(--wm-form-controls-border-right-width)",
+            "borderBottomWidth": "var(--wm-form-controls-border-bottom-width)",
             "borderColor": "var(--wm-form-controls-border-color)",
             "borderRadius": "var(--wm-form-controls-border-radius)",
             "backgroundColor": "var(--wm-form-controls-background)",
             "color": "var(--wm-form-controls-color)",
-            "opacity": "var(--wm-form-controls-opacity)"
+            "opacity": "var(--wm-form-controls-opacity)",
+            "fontSize": "var(--wm-form-controls-font-size)",
+            "fontFamily": "var(--wm-form-controls-font-family)",
+            "fontWeight": "var(--wm-form-controls-font-weight)",
+            "minWidth": "var(--wm-form-controls-min-width)",
+            "borderTopColor": "var(--wm-form-controls-border-color)",
+            "borderLeftColor": "var(--wm-form-controls-border-color)",
+            "borderBottomColor": "var(--wm-form-controls-border-color)",
+            "borderRightColor": "var(--wm-form-controls-border-color)"
         },
         "root": {
             "minHeight": "var(--wm-form-controls-min-height)",
-            "paddingTop": "var(--wm-form-controls-padding-vertical)",
-            "paddingBottom": "var(--wm-form-controls-padding-vertical)",
-            "paddingLeft": "var(--wm-form-controls-padding-horizontal)",
-            "paddingRight": "var(--wm-form-controls-padding-horizontal)",
+            "paddingTop": "var(--wm-form-controls-padding-top)",
+            "paddingBottom": "var(--wm-form-controls-padding-bottom)",
+            "paddingLeft": "var(--wm-form-controls-padding-left)",
+            "paddingRight": "var(--wm-form-controls-padding-right)",
             "borderStyle": "var(--wm-form-controls-border-style)",
-            "borderWidth": "var(--wm-form-controls-border-width)",
+            "borderTopWidth": "var(--wm-form-controls-border-top-width)",
+            "borderLeftWidth": "var(--wm-form-controls-border-left-width)",
+            "borderRightWidth": "var(--wm-form-controls-border-right-width)",
+            "borderBottomWidth": "var(--wm-form-controls-border-bottom-width)",
             "borderColor": "var(--wm-form-controls-border-color)",
             "borderRadius": "var(--wm-form-controls-border-radius)",
             "backgroundColor": "var(--wm-form-controls-background)",
             "color": "var(--wm-form-controls-color)",
-            "opacity": "var(--wm-form-controls-opacity)"
+            "opacity": "var(--wm-form-controls-opacity)",
+            "minWidth": "var(--wm-form-controls-min-width)",
+            "fontSize": "var(--wm-form-controls-font-size)",
+            "fontFamily": "var(--wm-form-controls-font-family)",
+            "fontWeight": "var(--wm-form-controls-font-weight)"
+        },
+        "text": {
+            "color": "var(--wm-form-controls-color)",
+            "fontSize": "var(--wm-form-controls-font-size)",
+            "fontFamily": "var(--wm-form-controls-font-family)",
+            "fontWeight": "var(--wm-form-controls-font-weight)"
         },
         "invalid": {
             "borderBottomColor": "#dc3545"
@@ -3094,10 +3433,10 @@ export default {
         "errorMsg": {
             "color": "var(--wm-form-error-color)",
             "fontSize": "var(--wm-form-error-font-size)",
-            "paddingTop": "var(--wm-form-error-padding-vertical)",
-            "paddingBottom": "var(--wm-form-error-padding-vertical)",
-            "paddingLeft": "var(--wm-form-error-padding-horizontal)",
-            "paddingRight": "var(--wm-form-error-padding-horizontal)"
+            "paddingTop": "var(--wm-form-error-padding-top)",
+            "paddingBottom": "var(--wm-form-error-padding-bottom)",
+            "paddingLeft": "var(--wm-form-error-padding-left)",
+            "paddingRight": "var(--wm-form-error-padding-right)"
         }
     },
     "app-text": {
@@ -3271,16 +3610,23 @@ export default {
     },
     "app-select-disabled": {
         "minHeight": "var(--wm-form-controls-min-height)",
-        "paddingTop": "var(--wm-form-controls-padding-vertical)",
-        "paddingBottom": "var(--wm-form-controls-padding-vertical)",
-        "paddingLeft": "var(--wm-form-controls-padding-horizontal)",
-        "paddingRight": "var(--wm-form-controls-padding-horizontal)",
+        "paddingTop": "var(--wm-form-controls-padding-top)",
+        "paddingBottom": "var(--wm-form-controls-padding-bottom)",
+        "paddingLeft": "var(--wm-form-controls-padding-left)",
+        "paddingRight": "var(--wm-form-controls-padding-right)",
         "borderStyle": "var(--wm-form-controls-border-style)",
-        "borderWidth": "var(--wm-form-controls-border-width)",
+        "borderTopWidth": "var(--wm-form-controls-border-top-width)",
+        "borderLeftWidth": "var(--wm-form-controls-border-left-width)",
+        "borderRightWidth": "var(--wm-form-controls-border-right-width)",
+        "borderBottomWidth": "var(--wm-form-controls-border-bottom-width)",
         "borderColor": "var(--wm-form-controls-border-color)",
         "backgroundColor": "var(--wm-form-controls-background)",
         "color": "var(--wm-form-controls-color)",
-        "opacity": "var(--wm-form-controls-opacity)"
+        "opacity": "var(--wm-form-controls-opacity)",
+        "fontSize": "var(--wm-form-controls-font-size)",
+        "fontFamily": "var(--wm-form-controls-font-family)",
+        "fontWeight": "var(--wm-form-controls-font-weight)",
+        "minWidth": "var(--wm-form-controls-min-width)"
     },
     "app-list": {
         "loadingIcon": {
@@ -3289,29 +3635,19 @@ export default {
             }
         },
         "heading": {
-            "backgroundColor": "var(--wm-list-heading-background-color)",
-            "padding": "var(--wm-list-heading-padding)",
-            "marginBottom": "var(--wm-list-heading-margin-bottom)"
+            "backgroundColor": "#fff"
         },
         "groupHeading": {
             "backgroundColor": "transparent"
         },
         "title": {
             "text": {
-                "color": "var(--wm-list-title-color)",
-                "fontFamily": "var(--wm-list-title-font-family)",
-                "fontSize": "var(--wm-list-title-font-size)",
-                "lineHeight": "var(--wm-list-title-line-height)",
-                "fontWeight": "var(--wm-list-title-font-weight)"
+                "color": "#333"
             }
         },
         "subheading": {
             "text": {
-                "color": "var(--wm-list-sub-heading-color)",
-                "fontFamily": "var(--wm-list-sub-heading-font-family)",
-                "lineHeight": "var(--wm-list-sub-heading-line-height)",
-                "fontSize": "var(--wm-list-sub-heading-font-size)",
-                "fontWeight": "var(--wm-list-sub-heading-font-weight)"
+                "color": "#666"
             }
         },
         "emptyMessage": {
@@ -3324,20 +3660,16 @@ export default {
                 "color": "#666"
             }
         },
-        "item": {
-            "color": "var(--wm-list-item-header-color)",
-            "backgroundColor": "var(--wm-list-item-header-background-color)",
-            "padding": "var(--wm-list-item-padding)",
-            "borderRadius": "var(--wm-list-item-border-radius)",
-            "minHeight": "var(--wm-list-item-min-height)",
-            "borderStyle": "var(--wm-list-item-border-style)",
-            "boxShadow": "none"
-        },
-        "selectedIcon": {
-            "text": {
-                "fontSize": "var(--wm-list-select-icon-font-size)",
-                "color": "var(--wm-list-select-icon-color)"
-            }
+        "root": {
+            "borderStyle": "var(--wm-list-border-style)",
+            "backgroundColor": "var(--wm-list-background-color)",
+            "paddingRight": "var(--wm-list-padding-right)",
+            "paddingLeft": "var(--wm-list-padding-left)",
+            "paddingBottom": "var(--wm-list-padding-bottom)",
+            "paddingTop": "var(--wm-list-padding-top)",
+            "borderRadius": "var(--wm-list-border-radius)",
+            "borderColor": "var(--wm-list-border-color)",
+            "borderWidth": "var(--wm-list-border-width)"
         }
     },
     "app-barcodescanner": {
@@ -3379,11 +3711,14 @@ export default {
             "root": {
                 "backgroundColor": "var(--wm-camera-background)",
                 "borderColor": "var(--wm-camera-border-color)",
-                "minHeight": "var(--wm-camera-min-height)",
-                "minWidth": "var(--wm-camera-min-width)",
                 "borderWidth": "var(--wm-camera-border-width)",
                 "borderRadius": "var(--wm-camera-border-radius)",
-                "padding": "var(--wm-camera-padding)"
+                "minHeight": "var(--wm-camera-min-height)",
+                "minWidth": "var(--wm-camera-min-width)",
+                "paddingTop": "var(--wm-camera-padding-top)",
+                "paddingBottom": "var(--wm-camera-padding-bottom)",
+                "paddingLeft": "var(--wm-camera-padding-left)",
+                "paddingRight": "var(--wm-camera-padding-right)"
             },
             "text": {
                 "color": "var(--wm-camera-color)"
@@ -3398,14 +3733,38 @@ export default {
     "app-alertdialog": {
         "message": {
             "text": {
-                "color": "#888"
+                "color": "var(--wm-modal-description-color)",
+                "fontWeight": "var(--wm-modal-description-font-weight)",
+                "fontFamily": "var(--wm-modal-description-font-family)",
+                "fontSize": "var(--wm-modal-description-font-size)"
+            }
+        },
+        "okButton": {
+            "root": {
+                "backgroundColor": "var(--wm-modal-btn-ok-background)"
             }
         }
     },
     "app-confirmdialog": {
         "message": {
             "text": {
-                "color": "#888"
+                "color": "var(--wm-modal-description-color)",
+                "fontWeight": "var(--wm-modal-description-font-weight)",
+                "fontFamily": "var(--wm-modal-description-font-family)",
+                "fontSize": "var(--wm-modal-description-font-size)"
+            }
+        },
+        "cancelButton": {
+            "root": {
+                "backgroundColor": "var(--wm-modal-btn-cancel-background)"
+            },
+            "text": {
+                "color": "var(--wm-modal-btn-cancel-color)"
+            }
+        },
+        "dialogActions": {
+            "root": {
+                "padding": "var(--wm-modal-footer-padding)"
             }
         }
     },
@@ -3416,43 +3775,43 @@ export default {
             "padding": "var(--wm-modal-body-padding)",
             "minWidth": "var(--wm-modal-min-width)",
             "marginTop": "var(--wn-modal-margin)",
-            "marginBottom": "var(--wn-modal-margin)",
-            "header": {
-                "padding": "var(--wm-modal-header-padding)",
-                "borderStyle": "var(--wm-modal-header-border-style)",
-                "borderColor": "var(--wm-modal-header-border-color)",
-                "borderWidth": "var(--wm-modal-header-border-width)"
-            },
-            "icon": {
-                "icon": {
-                    "color": "var(--wm-color-black)",
-                    "fontSize": "var(--wm-modal-icon-font-size)"
-                }
-            }
+            "marginBottom": "var(--wn-modal-margin)"
         },
         "header": {
-            "borderColor": "#ccc"
+            "borderColor": "var(--wm-modal-header-border-color)",
+            "padding": "var(--wm-modal-header-padding)",
+            "borderStyle": "var(--wm-modal-header-border-style)",
+            "borderWidth": "var(--wm-modal-header-border-width)",
+            "backgroundColor": "var(--wm-modal-header-background)"
         },
         "headerLabel": {
             "paddingBottom": "var(--wm-modal-header-label-padding-bottom)"
         },
         "icon": {
-            "fontSize": "var(--wm-modal-icon-font-size)",
+            "icon": {
+                "fontSize": "var(--wm-modal-icon-font-size)",
+                "color": "var(--wm-modal-icon-color)"
+            },
             "text": {
                 "maxWidth": "unset",
                 "paddingTop": 0,
                 "paddingRight": 0,
                 "paddingBottom": 0,
                 "paddingLeft": 0,
-                "fontSize": "var(--wm-modal-icon-font-size)",
-                "fontWeight": "var(--wm-modal-icon-font-weight)",
-                "color": "var(--wm-color-black)"
+                "fontSize": "var(--wm-modal-title-font-size)",
+                "fontWeight": "var(--wm-modal-title-font-weight)",
+                "color": "var(--wm-modal-title-color)",
+                "letterSpacing": "var(--wm-modal-title-letter-spacing)",
+                "lineHeight": "var(--wm-modal-title-line-height)",
+                "fontFamily": "var(--wm-modal-title-font-family)"
             }
         },
         "closeBtn": {
             "root": {
-                "marginBottom": "var(--wm-modal-header-close-btn-margin)",
-                "borderWidth": "var(--wm-modal-header-close-btn-border-width)"
+                "borderWidth": "var(--wm-modal-header-close-btn-border-width)",
+                "borderColor": "var(--wm-modal-header-close-btn-border-color)",
+                "borderStyle": "var(--wm-modal-header-close-btn-border-style)",
+                "backgroundColor": "var(--wm-modal-header-close-btn-background)"
             },
             "content": {
                 "minHeight": "unset"
@@ -3475,7 +3834,10 @@ export default {
     },
     "btn-only-label": {
         "text": {
-            "color": "var(--wm-color-primary)"
+            "color": "var(--wm-modal-btn-ok-color)"
+        },
+        "root": {
+            "backgroundColor": "var(--wm-modal-btn-ok-background)"
         }
     },
     "app-dialog-footer": {
@@ -3488,6 +3850,7 @@ export default {
     },
     "app-dialogactions": {
         "root": {
+            "padding": "var(--wm-modal-footer-padding)",
             "borderColor": "#ccc"
         }
     },
@@ -3498,7 +3861,7 @@ export default {
         "calendar": {
             "backgroundColor": "var(--wm-calendar-header-background-color)",
             "borderColor": "var(--wm-calendar-day-border-color)",
-            "parsedBoxShadow": "var(--wm-calendar-view-shadow)",
+            "boxShadow": "var(--wm-calendar-view-shadow)",
             "borderStyle": "var(--wm-calendar-view-border-style)",
             "borderRadius": "var(--wm-calendar-view-radius)"
         },
@@ -3586,8 +3949,7 @@ export default {
         },
         "root": {
             "width": "var(--wm-calendar-width)",
-            "minHeight": "var(--wm-calendar-min-height)",
-            "minWidth": "var(--wm-calendar-min-width)"
+            "minHeight": "var(--wm-calendar-min-height)"
         },
         "headerSkeleton": {
             "width": "var(--wm-calendar-header-skeleton-width)",
@@ -3794,7 +4156,7 @@ export default {
             "fontSize": "var(--wm-chips-item-font-size)",
             "lineHeight": "var(--wm-chips-item-line-height)",
             "letterSpacing": "var(--wm-chips-item-letter-spacing)",
-            "parsedBoxShadow": "var(--wm-chips-shadow)"
+            "boxShadow": "var(--wm-chips-shadow)"
         },
         "assistchip": {
             "gap": "var(--wm-chips-item-gap)",
@@ -3810,7 +4172,7 @@ export default {
             "borderWidth": "var(--wm-chips-border-width)",
             "borderStyle": "var(--wm-chips-item-border-style)",
             "borderColor": "var(--wm-chips-item-border-color)",
-            "parsedBoxShadow": "var(--wm-chips-shadow)"
+            "boxShadow": "var(--wm-chips-shadow)"
         },
         "chipLabel": {
             "color": "var(--wm-chips-color)",
@@ -4007,7 +4369,7 @@ export default {
         "opacity": "var(--wm-rating-opacity)",
         "--wm-rating-opacity": 0.38
     },
-    "select": {
+    "select:active": {
         "--wm-select-item-color": "var(--wm-color-secondary)"
     },
     "app-slider": {
@@ -4063,11 +4425,28 @@ export default {
         "selectedButton": {
             "color": "var(--wm-switch-button-color)",
             "backgroundColor": "var(--wm-switch-button-background-color)",
+            "--wm-switch-button-text-transform": "capitalize",
             "--wm-switch-button-background-color": "var(--wm-color-secondary-fixed)",
             "--wm-switch-button-color": "var(--wm-color-on-secondary-container)",
             "--wm-switch-button-border-color": "var(--wm-color-outline)",
+            "--wm-switch-button-font-size": "var(--wm-label-large-font-size)",
+            "--wm-switch-button-font-family": "var(--wm-font-family-brand)",
+            "--wm-switch-button-font-weight": "var(--wm-font-weight-500)",
             "borderColor": "var(--wm-switch-button-border-color)"
         },
+        "selectedButtonText": {
+            "--wm-switch-button-text-transform": "capitalize",
+            "--wm-switch-button-background-color": "var(--wm-color-secondary-fixed)",
+            "--wm-switch-button-color": "var(--wm-color-on-secondary-container)",
+            "--wm-switch-button-border-color": "var(--wm-color-outline)",
+            "--wm-switch-button-font-size": "var(--wm-label-large-font-size)",
+            "--wm-switch-button-font-family": "var(--wm-font-family-brand)",
+            "--wm-switch-button-font-weight": "var(--wm-font-weight-500)",
+            "fontSize": "var(--wm-switch-button-font-size)",
+            "fontFamily": "var(--wm-switch-button-font-family)",
+            "fontWeight": "var(--wm-switch-button-font-weight)",
+            "textTransform": "var(--wm-switch-button-text-transform)"
+        },
         "firstButton": {
             "borderTopLeftRadius": "var(--wm-switch-button-border-radius)",
             "borderBottomLeftRadius": "var(--wm-switch-button-border-radius)"
@@ -4079,7 +4458,8 @@ export default {
         "text": {
             "fontSize": "var(--wm-switch-button-font-size)",
             "fontFamily": "var(--wm-switch-button-font-family)",
-            "fontWeight": "var(--wm-switch-button-font-weight)"
+            "fontWeight": "var(--wm-switch-button-font-weight)",
+            "textTransform": "var(--wm-switch-button-text-transform)"
         }
     },
     "app-switch-disabled": {
@@ -4093,13 +4473,23 @@ export default {
     },
     "app-toggle-on": {
         "backgroundColor": "#4263eb",
+        "--wm-toggle-border-radius": 18,
+        "--wm-toggle-border-width": 2,
+        "--wm-toggle-handle-width": 16,
+        "--wm-toggle-handle-height": 16,
+        "--wm-toggle-handle-radius": 18,
+        "--wm-toggle-handle-margin-left": 8,
+        "--wm-toggle-handle-margin-right": 1,
         "--wm-toggle-background-color": "var(--wm-color-secondary)",
+        "--wm-toggle-border-color": "var(--wm-color-secondary)",
         "--wm-toggle-handle-color": "var(--wm-color-on-secondary)",
         "root": {
             "width": "var(--wm-toggle-width)",
             "height": "var(--wm-toggle-height)",
             "borderRadius": "var(--wm-toggle-border-radius)",
-            "backgroundColor": "var(--wm-toggle-background-color)"
+            "borderColor": "var(--wm-toggle-border-color)",
+            "backgroundColor": "var(--wm-toggle-background-color)",
+            "borderWidth": "var(--wm-toggle-border-width)"
         },
         "handle": {
             "width": "var(--wm-toggle-handle-width)",
@@ -4151,7 +4541,14 @@ export default {
             "paddingLeft": "var(--wm-navbar-padding-left)",
             "paddingRight": "var(--wm-navbar-padding-right)",
             "paddingTop": "var(--wm-navbar-padding-top)",
-            "paddingBottom": "var(--wm-navbar-padding-bottom)"
+            "paddingBottom": "var(--wm-navbar-padding-bottom)",
+            "borderColor": "var(--wm-navbar-border-color)",
+            "borderStyle": "var(--wm-navbar-border-style)",
+            "borderTopWidth": "var(--wm-navbar-border-width-top)",
+            "borderBottomWidth": "var(--wm-navbar-border-width-bottom)",
+            "borderLeftWidth": "var(--wm-navbar-border-width-left)",
+            "borderRightWidth": "var(--wm-navbar-border-width-right)",
+            "borderRadius": "var(--wm-navbar-border-radius)"
         },
         "leftnavIcon": {
             "root": {
@@ -4178,8 +4575,12 @@ export default {
             }
         },
         "image": {
-            "width": "var(--wm-navbar-image-width)",
-            "height": "var(--wm-navbar-image-height)"
+            "width": 32,
+            "height": 32,
+            "root": {
+                "width": "var(--wm-navbar-image-width)",
+                "height": "var(--wm-navbar-image-height)"
+            }
         },
         "content": {
             "color": "var(--wm-navbar-content-color)",
@@ -4204,6 +4605,10 @@ export default {
             "text": {
                 "color": "var(--wm-navbar-anchor-icon-color)",
                 "fontSize": "var(--wm-navbar-anchor-icon-size)"
+            },
+            "icon": {
+                "color": "var(--wm-navbar-anchor-icon-color)",
+                "fontSize": "var(--wm-navbar-anchor-icon-size)"
             }
         },
         "root": {
@@ -4216,8 +4621,8 @@ export default {
     "navbarButton": {
         "icon": {
             "text": {
-                "color": "var(--wm-navbar-button-icon-color)",
-                "fontSize": "var(--wm-navbar-button-icon-size)"
+                "color": "var(--wm-navbar-button-color)",
+                "fontSize": "var(--wm-navbar-button-font-size)"
             }
         },
         "text": {
@@ -4329,67 +4734,228 @@ export default {
     "app-navitem": {
         "root": {
             "borderColor": "#ccc",
-            "backgroundColor": "var(--wm-nav-item-background)",
-            "minHeight": "var(--wm-nav-item-min-height)"
+            "backgroundColor": "var(--wm-navitem-background)"
         },
         "caretIcon": {
             "text": {
-                "color": "#4263eb"
+                "color": "var(--wm-navitem-caret-color)"
+            }
+        },
+        "navAnchorItem": {
+            "icon": {
+                "icon": {
+                    "color": "var(--wm-navitem-icon-color)",
+                    "fontSize": "var(--wm-navitem-icon-size)",
+                    "paddingLeft": "var(--wm-navitem-icon-padding-left)",
+                    "paddingRight": "var(--wm-navitem-icon-padding-right)",
+                    "paddingTop": "var(--wm-navitem-icon-padding-top)",
+                    "paddingBottom": "var(--wm-navitem-icon-padding-bottom)"
+                }
+            },
+            "paddingTop": "var(--wm-navitem-padding-top)",
+            "paddingBottom": "var(--wm-navitem-padding-bottom)",
+            "paddingLeft": "var(--wm-navitem-padding-left)",
+            "paddingRight": "var(--wm-navitem-padding-right)",
+            "marginLeft": "var(--wm-navitem-margin-left)",
+            "marginRight": "var(--wm-navitem-margin-right)",
+            "marginTop": "var(--wm-navitem-margin-top)",
+            "marginBottom": "var(--wm-navitem-margin-bottom)",
+            "borderRadius": "var(--wm-navitem-border-radius)",
+            "backgroundColor": "var(--wm-navitem-background)",
+            "badge": {
+                "marginTop": "var(--wm-navitem-badge-margin-top)",
+                "marginBottom": "var(--wm-navitem-badge-margin-bottom)",
+                "marginRight": "var(--wm-navitem-badge-margin-right)",
+                "marginLeft": "var(--wm-navitem-badge-margin-left)",
+                "backgroundColor": "var(--wm-navitem-badge-background)",
+                "textAlign": "var(--wm-navitem-badge-text-align)",
+                "alignSelf": "var(--wm-navitem-badge-align-self)",
+                "fontWeight": "var(--wm-navitem-badge-font-weight)",
+                "fontSize": "var(--wm-navitem-badge-font-size)",
+                "fontFamily": "var(--wm-navitem-badge-font-family)",
+                "borderRadius": "var(--wm-navitem-badge-border-radius)",
+                "minWidth": "var(--wm-navitem-badge-min-width)",
+                "minHeight": "var(--wm-navitem-badge-min-height)",
+                "lineHeight": "var(--wm-navitem-badge-line-height)",
+                "color": "var(--wm-navitem-badge-color)"
+            },
+            "text": {
+                "textDecoration": "var(--wm-navitem-text-decoration)",
+                "textDecorationLine": "var(--wm-navitem-text-decoration)",
+                "lineHeight": "var(--wm-navitem-line-height)",
+                "fontWeight": "var(--wm-navitem-font-weight)",
+                "fontSize": "var(--wm-navitem-font-size)",
+                "fontFamily": "var(--wm-navitem-font-family)",
+                "paddingLeft": "var(--wm-navitem-text-padding-left)",
+                "paddingRight": "var(--wm-navitem-text-padding-right)",
+                "paddingTop": "var(--wm-navitem-text-padding-top)",
+                "paddingBottom": "var(--wm-navitem-text-padding-bottom)",
+                "color": "var(--wm-navitem-color)",
+                "flex": "var(--wm-navitem-text-flex)"
             }
         }
     },
     "app-navitem-active": {
         "root": {
-            "backgroundColor": "#4263eb"
+            "backgroundColor": "var(--wm-navitem-background)",
+            "paddingTop": "var(--wm-navitem-padding-top)",
+            "paddingBottom": "var(--wm-navitem-padding-bottom)",
+            "paddingLeft": "var(--wm-navitem-padding-left)",
+            "paddingRight": "var(--wm-navitem-padding-right)",
+            "marginLeft": "var(--wm-navitem-margin-left)",
+            "marginRight": "var(--wm-navitem-margin-right)",
+            "marginTop": "var(--wm-navitem-margin-top)",
+            "marginBottom": "var(--wm-navitem-margin-bottom)",
+            "borderRadius": "var(--wm-navitem-border-radius)"
         },
         "navAnchorItem": {
             "root": {
-                "backgroundColor": "#4263eb"
+                "backgroundColor": "var(--wm-navitem-background)",
+                "paddingTop": 0,
+                "paddingRight": 0,
+                "paddingBottom": 0,
+                "paddingLeft": 0
             },
             "text": {
-                "color": "#fff"
+                "color": "var(--wm-navitem-color)",
+                "textDecoration": "var(--wm-navitem-text-decoration)",
+                "textDecorationLine": "var(--wm-navitem-text-decoration)",
+                "lineHeight": "var(--wm-navitem-line-height)",
+                "fontWeight": "var(--wm-navitem-font-weight)",
+                "fontSize": "var(--wm-navitem-font-size)",
+                "fontFamily": "var(--wm-navitem-font-family)",
+                "paddingLeft": "var(--wm-navitem-text-padding-left)",
+                "paddingRight": "var(--wm-navitem-text-padding-right)",
+                "paddingTop": "var(--wm-navitem-text-padding-top)",
+                "paddingBottom": "var(--wm-navitem-text-padding-bottom)",
+                "flex": "var(--wm-navitem-text-flex)"
             },
             "icon": {
                 "icon": {
-                    "color": "#fff"
+                    "color": "var(--wm-navitem-icon-color)",
+                    "fontSize": "var(--wm-navitem-icon-size)",
+                    "paddingLeft": "var(--wm-navitem-icon-padding-left)",
+                    "paddingRight": "var(--wm-navitem-icon-padding-right)",
+                    "paddingTop": "var(--wm-navitem-icon-padding-top)",
+                    "paddingBottom": "var(--wm-navitem-icon-padding-bottom)"
                 }
+            },
+            "--wm-navitem-color": "var(--wm-color-on-secondary-fixed)",
+            "--wm-navitem-icon-size": "var(--wm-icon-size)",
+            "--wm-navitem-icon-color": "var(--wm-color-on-secondary-container)",
+            "--wm-navitem-border-radius": "var(--wm-radius-pill)",
+            "--wm-navitem-background": "var(--wm-color-secondary-fixed)",
+            "--wm-navitem-badge-font-size": "var(--wm-label-large-font-size)",
+            "--wm-navitem-badge-font-family": "var(--wm-label-large-font-family)",
+            "--wm-navitem-badge-font-weight": "var(--wm-font-weight-600)",
+            "--wm-navitem-badge-border-radius": "var(--wm-radius-circle)",
+            "--wm-navitem-badge-background": "var(--wm-color-secondary-fixed-dim)",
+            "--wm-navitem-caret-color": "var(--wm-color-on-secondary-fixed)",
+            "badge": {
+                "marginTop": "var(--wm-navitem-badge-margin-top)",
+                "marginBottom": "var(--wm-navitem-badge-margin-bottom)",
+                "marginRight": "var(--wm-navitem-badge-margin-right)",
+                "marginLeft": "var(--wm-navitem-badge-margin-left)",
+                "backgroundColor": "var(--wm-navitem-badge-background)",
+                "textAlign": "var(--wm-navitem-badge-text-align)",
+                "alignSelf": "var(--wm-navitem-badge-align-self)",
+                "fontWeight": "var(--wm-navitem-badge-font-weight)",
+                "fontSize": "var(--wm-navitem-badge-font-size)",
+                "fontFamily": "var(--wm-navitem-badge-font-family)",
+                "borderRadius": "var(--wm-navitem-badge-border-radius)",
+                "minWidth": "var(--wm-navitem-badge-min-width)",
+                "minHeight": "var(--wm-navitem-badge-min-height)",
+                "lineHeight": "var(--wm-navitem-badge-line-height)",
+                "color": "var(--wm-navitem-badge-color)"
             }
-        }
+        },
+        "--wm-navitem-color": "var(--wm-color-on-secondary-fixed)",
+        "--wm-navitem-icon-size": "var(--wm-icon-size)",
+        "--wm-navitem-icon-color": "var(--wm-color-on-secondary-container)",
+        "--wm-navitem-border-radius": "var(--wm-radius-pill)",
+        "--wm-navitem-background": "var(--wm-color-secondary-fixed)",
+        "--wm-navitem-badge-font-size": "var(--wm-label-large-font-size)",
+        "--wm-navitem-badge-font-family": "var(--wm-label-large-font-family)",
+        "--wm-navitem-badge-font-weight": "var(--wm-font-weight-600)",
+        "--wm-navitem-badge-border-radius": "var(--wm-radius-circle)",
+        "--wm-navitem-badge-background": "var(--wm-color-secondary-fixed-dim)",
+        "--wm-navitem-caret-color": "var(--wm-color-on-secondary-fixed)",
+        "caretIcon": {
+            "text": {
+                "color": "var(--wm-navitem-caret-color)"
+            }
+        },
+        "backgroundColor": "var(--wm-navitem-background)"
     },
     "app-navitem-child": {
         "root": {
-            "backgroundColor": "#fff"
+            "backgroundColor": "var(--wm-navitem-child-background-color)"
         },
         "navAnchorItem": {
             "text": {
-                "color": "#4263eb"
+                "color": "var(--wm-navitem-child-color)"
             },
             "icon": {
                 "icon": {
-                    "color": "#4263eb"
+                    "color": "var(--wm-navitem-child-color)"
                 }
+            },
+            "badge": {
+                "color": "var(--wm-navitem-child-color)"
             }
         }
     },
     "navAnchorItem": {
-        "text": {
-            "fontSize": "var(--wm-nav-item-font-size)",
-            "fontFamily": "var(--wm-nav-item-font-family)",
-            "fontWeight": "var(--wm-nav-item-font-weight)",
-            "lineHeight": "var(--wm-nav-item-line-height)",
-            "letterSpacing": "var(--wm-nav-item-letter-spacing)",
-            "color": "var(--wm-nav-item-color)"
-        },
-        "root": {
-            "paddingLeft": "var(--wm-nav-item-padding-left)",
-            "paddingRight": "var(--wm-nav-item-padding-right)",
-            "paddingTop": "var(--wm-nav-item-padding-top)",
-            "paddingBottom": "var(--wm-nav-item-padding-bottom)"
-        },
         "icon": {
-            "root": {
-                "color": "var(--wm-nav-item-color)"
+            "icon": {
+                "color": "var(--wm-navitem-icon-color)",
+                "fontSize": "var(--wm-navitem-icon-size)",
+                "paddingLeft": "var(--wm-navitem-icon-padding-left)",
+                "paddingRight": "var(--wm-navitem-icon-padding-right)",
+                "paddingTop": "var(--wm-navitem-icon-padding-top)",
+                "paddingBottom": "var(--wm-navitem-icon-padding-bottom)"
             }
+        },
+        "paddingTop": "var(--wm-navitem-padding-top)",
+        "paddingBottom": "var(--wm-navitem-padding-bottom)",
+        "paddingLeft": "var(--wm-navitem-padding-left)",
+        "paddingRight": "var(--wm-navitem-padding-right)",
+        "marginLeft": "var(--wm-navitem-margin-left)",
+        "marginRight": "var(--wm-navitem-margin-right)",
+        "marginTop": "var(--wm-navitem-margin-top)",
+        "marginBottom": "var(--wm-navitem-margin-bottom)",
+        "borderRadius": "var(--wm-navitem-border-radius)",
+        "backgroundColor": "var(--wm-navitem-background)",
+        "badge": {
+            "marginTop": "var(--wm-navitem-badge-margin-top)",
+            "marginBottom": "var(--wm-navitem-badge-margin-bottom)",
+            "marginRight": "var(--wm-navitem-badge-margin-right)",
+            "marginLeft": "var(--wm-navitem-badge-margin-left)",
+            "backgroundColor": "var(--wm-navitem-badge-background)",
+            "textAlign": "var(--wm-navitem-badge-text-align)",
+            "alignSelf": "var(--wm-navitem-badge-align-self)",
+            "fontWeight": "var(--wm-navitem-badge-font-weight)",
+            "fontSize": "var(--wm-navitem-badge-font-size)",
+            "fontFamily": "var(--wm-navitem-badge-font-family)",
+            "borderRadius": "var(--wm-navitem-badge-border-radius)",
+            "minWidth": "var(--wm-navitem-badge-min-width)",
+            "minHeight": "var(--wm-navitem-badge-min-height)",
+            "lineHeight": "var(--wm-navitem-badge-line-height)",
+            "color": "var(--wm-navitem-badge-color)"
+        },
+        "text": {
+            "textDecoration": "var(--wm-navitem-text-decoration)",
+            "textDecorationLine": "var(--wm-navitem-text-decoration)",
+            "lineHeight": "var(--wm-navitem-line-height)",
+            "fontWeight": "var(--wm-navitem-font-weight)",
+            "fontSize": "var(--wm-navitem-font-size)",
+            "fontFamily": "var(--wm-navitem-font-family)",
+            "paddingLeft": "var(--wm-navitem-text-padding-left)",
+            "paddingRight": "var(--wm-navitem-text-padding-right)",
+            "paddingTop": "var(--wm-navitem-text-padding-top)",
+            "paddingBottom": "var(--wm-navitem-text-padding-bottom)",
+            "color": "var(--wm-navitem-color)",
+            "flex": "var(--wm-navitem-text-flex)"
         }
     },
     "app-popover": {
@@ -4399,7 +4965,7 @@ export default {
             "paddingTop": "var(--wm-popover-padding-top)",
             "paddingLeft": "var(--wm-popover-padding-left)",
             "paddingRight": "var(--wm-popover-padding-right)",
-            "parsedBoxShadow": "var(--wm-popover-shadow)",
+            "boxShadow": "var(--wm-popover-shadow)",
             "borderTopLeftRadius": "var(--wm-popover-border-top-left-radius)",
             "borderTopRightRadius": "var(--wm-popover-border-top-right-radius)"
         },
@@ -4416,6 +4982,20 @@ export default {
             "lineHeight": "var(--wm-popover-header-line-height)",
             "letterSpacing": "var(--wm-popover-header-letter-spacing)"
         },
+        "root": {
+            "backgroundColor": "var(--wm-popover-link-background-color)",
+            "borderColor": "var(--wm-popover-link-border-color)",
+            "borderWidth": "var(--wm-popover-link-border-width)",
+            "borderStyle": "var(--wm-popover-link-border-style)",
+            "borderRadius": "var(--wm-popover-link-border-radius)",
+            "paddingTop": "var(--wm-popover-link-padding-top)",
+            "paddingBottom": "var(--wm-popover-link-padding-bottom)",
+            "paddingLeft": "var(--wm-popover-link-padding-left)",
+            "paddingRight": "var(--wm-popover-link-padding-right)",
+            "width": "var(--wm-popover-link-width)",
+            "height": "var(--wm-popover-link-height)",
+            "minHeight": "var(--wm-popover-link-min-height)"
+        },
         "link": {
             "icon": {
                 "root": {
@@ -4433,7 +5013,7 @@ export default {
                 }
             },
             "text": {
-                "color": "var(--wm-popover-link-text-color)",
+                "color": "var(--wm-popover-link-color)",
                 "paddingLeft": "var(--wm-space-2)",
                 "paddingRight": "var(--wm-space-2)",
                 "fontSize": "var(--wm-popover-link-font-size)",
@@ -4444,20 +5024,21 @@ export default {
             }
         }
     },
-    "app-popover-action-sheet-popover": {
-        "position": "var(--wm-popover-position)",
-        "left": "var(--wm-popover-left)",
-        "bottom": "var(--wm-popover-bottom)",
-        "width": "var(--wm-popover-width)",
-        "minHeight": "var(--wm-popover-min-height)",
-        "borderRadius": "var(--wm-popover-radius)",
-        "parsedBoxShadow": "var(--wm-popover-elevation)"
+    "app-popover-action-sheet": {
+        "popover": {
+            "left": "var(--wm-popover-left)",
+            "bottom": "var(--wm-popover-bottom)",
+            "width": "var(--wm-popover-width)",
+            "minHeight": "var(--wm-popover-min-height)",
+            "borderRadius": "var(--wm-popover-radius)",
+            "boxShadow": "var(--wm-popover-shadow)"
+        }
     },
     "app-left-panel": {
         "root": {
             "minHeight": "var(--wm-left-panel-min-height)",
             "backgroundColor": "var(--wm-left-panel-background)",
-            "parsedBoxShadow": "var(--wm-left-panel-elevation)",
+            "boxShadow": "var(--wm-left-panel-elevation)",
             "borderTopRightRadius": "var(--wm-left-panel-border-top-right-radius)",
             "borderBottomRightRadius": "var(--wm-left-panel-border-bottom-right-radius)",
             "maxWidth": "var(--wm-left-panel-max-width)"
@@ -4472,12 +5053,13 @@ export default {
     "app-tabbar": {
         "menu": {
             "backgroundColor": "var(--wm-tabbar-menu-background)",
+            "alignItems": "center",
             "height": "var(--wm-tabbar-menu-height)"
         },
         "moreMenu": {
             "backgroundColor": "var(--wm-tabbar-more-menu-background)",
             "width": "var(--wm-tabbar-more-menu-width)",
-            "parsedBoxShadow": "var(--wm-tabbar-more-menu-box-shadow)"
+            "boxShadow": "var(--wm-tabbar-more-menu-box-shadow)"
         },
         "tabIcon": {
             "icon": {
@@ -4500,7 +5082,10 @@ export default {
         },
         "root": {
             "height": "var(--wm-tabbar-height)",
-            "parsedBoxShadow": "var(--wm-tabbar-box-shadow)"
+            "boxShadow": "var(--wm-tabbar-box-shadow)",
+            "borderTopWidth": "var(--wm-tabbar-border-top-width)",
+            "borderTopStyle": "var(--wm-tabbar-border-top-style)",
+            "borderTopColor": "var(--wm-tabbar-border-top-color)"
         },
         "moreMenuRow": {
             "width": "var(--wm-tabbar-more-menu-row-width)",
@@ -4513,7 +5098,9 @@ export default {
             "alignItems": "center",
             "minHeight": "var(--wm-tabbar-item-min-height)",
             "minWidth": "var(--wm-tabbar-item-min-width)",
-            "marginBottom": "var(--wm-tabbar-item-margin-bottom)",
+            "backgroundColor": "var(--wm-tabbar-item-background-color)",
+            "borderRadius": "var(--wm-tabbar-item-border-radius)",
+            "marginBottom": "var(--wm-space-0)",
             "opacity": "var(--wm-tabbar-item-opacity)"
         },
         "activeTabItem": {
@@ -4522,7 +5109,7 @@ export default {
             "alignItems": "center",
             "height": "auto",
             "opacity": "var(--wm-tabbar-item-opacity)",
-            "marginBottom": "var(--wm-tabbar-item-margin-bottom)",
+            "marginBottom": "var(--wm-space-0)",
             "borderRadius": "var(--wm-tabbar-item-border-radius)",
             "backgroundColor": "var(--wm-tabbar-item-background-color)",
             "paddingTop": "var(--wm-spacer-1)",
@@ -4536,7 +5123,9 @@ export default {
         },
         "activeTabIcon": {
             "icon": {
-                "color": "var(--wm-tabbar-icon-color)"
+                "color": "var(--wm-tabbar-icon-color)",
+                "fontSize": "var(--wm-tabbar-icon-size)",
+                "paddingRight": "var(--wm-tabbar-icon-padding-right)"
             },
             "--wm-tabbar-item-border-radius": 50,
             "--wm-tabbar-item-margin-bottom": -2,
@@ -4547,6 +5136,8 @@ export default {
         },
         "activeTabLabel": {
             "fontWeight": "var(--wm-tabbar-text-font-weight)",
+            "fontSize": "var(--wm-tabbar-text-font-size)",
+            "fontFamily": "var(--wm-tabbar-text-font-family)",
             "color": "var(--wm-tabbar-text-color)",
             "--wm-tabbar-item-border-radius": 50,
             "--wm-tabbar-item-margin-bottom": -2,
@@ -4582,6 +5173,7 @@ export default {
             "root": {
                 "borderColor": "transparent",
                 "borderWidth": 0,
+                "backgroundColor": "transparent",
                 "rippleColor": "var(--wm-fileupload-ripple-color)"
             }
         }
@@ -4593,9 +5185,12 @@ export default {
         }
     },
     "app-lottie": {
-        "content": {
-            "height": "var(--wm-lottie-content-height)",
-            "width": "var(--wm-lottie-content-width)"
+        "root": {
+            "backgroundColor": "var(--wm-lottie-background-color)",
+            "paddingRight": "var(--wm-lottie-padding-right)",
+            "paddingLeft": "var(--wm-lottie-padding-left)",
+            "paddingBottom": "var(--wm-lottie-padding-bottom)",
+            "paddingTop": "var(--wm-lottie-padding-top)"
         }
     },
     "app-audio": {
@@ -4612,7 +5207,13 @@ export default {
             "borderTopRightRadius": "var(--wm-bottomsheet-border-radius)",
             "borderTopLeftRadius": "var(--wm-bottomsheet-border-radius)",
             "marginLeft": "var(--wm-bottomsheet-margin-left)",
-            "marginRight": "var(--wm-bottomsheet-margin-right)"
+            "marginRight": "var(--wm-bottomsheet-margin-right)",
+            "borderTopWidth": "var(--wm-bottomsheet-border-width-top)",
+            "borderBottomWidth": "var(--wm-bottomsheet-border-width-bottom)",
+            "borderLeftWidth": "var(--wm-bottomsheet-border-width-left)",
+            "borderRightWidth": "var(--wm-bottomsheet-border-width-right)",
+            "borderColor": "var(--wm-bottomsheet-border-color)",
+            "borderStyle": "var(--wm-bottomsheet-border-style)"
         },
         "dragHandleContainer": {
             "paddingTop": "var(--wm-bottomsheet-handle-padding-top)",