diff --git a/theme-base/components/data/_datatable.scss b/theme-base/components/data/_datatable.scss
index ebe0eae..e20a065 100644
--- a/theme-base/components/data/_datatable.scss
+++ b/theme-base/components/data/_datatable.scss
@@ -193,7 +193,11 @@
         .p-datatable-thead {
             > tr {
                 > th {
-                    border-width: 1px 1px nth($tableHeaderCellBorderWidth,3) 1px;
+                    border-width: 1px 0 1px 1px;
+
+                    &:last-child {
+                        border-width: 1px;
+                    }
                 }
             }
         }
@@ -201,7 +205,21 @@
         .p-datatable-tbody {
             > tr {
                 > td {
-                    border-width: 1px;
+                    border-width: 1px 0 0 1px;
+
+                    &:last-child {
+                        border-width: 1px 1px 0 1px;
+                    }
+                }
+
+                &:last-child {
+                    > td {
+                        border-width: 1px 0 1px 1px;
+
+                        &:last-child {
+                            border-width: 1px;
+                        }
+                    }
                 }
             }
         }
@@ -209,40 +227,48 @@
         .p-datatable-tfoot {
             > tr {
                 > td {
-                    border-width: 1px;
+                    border-width: 1px 0 1px 1px;
+
+                    &:last-child {
+                        border-width: 1px 1px 1px 1px;
+                    }
                 }
             }
         }
 
-        &.p-datatable-scrollable {
-            .p-datatable-thead {
-                > tr {
-                    > th + th {
-                        border-left-width: 0;
+        .p-datatable-thead + .p-datatable-tfoot {
+            > tr {
+                > td {
+                    border-width: 0 0 1px 1px;
+
+                    &:last-child {
+                        border-width: 0 1px 1px 1px;
                     }
                 }
             }
-    
-            .p-datatable-tbody {
-                > tr {
-                    > td + td {
-                        border-left-width: 0;
-                    }
+        }
 
-                    + tr,
-                    &:first-child {
-                        > td {
-                            border-top-width: 0;
-                        }
+        &:has(.p-datatable-thead):has(.p-datatable-tbody) .p-datatable-tbody {
+            > tr {
+                > td {
+                    border-width: 0 0 1px 1px;
+
+                    &:last-child {
+                        border-width: 0 1px 1px 1px;
                     }
-                    
                 }
             }
-    
-            .p-datatable-tfoot {
-                > tr {
-                    > td + td {
-                        border-left-width: 0;
+        }
+
+        &:has(.p-datatable-tbody):has(.p-datatable-tfoot) .p-datatable-tbody {
+            > tr {
+                &:last-child {
+                    > td {
+                        border-width: 0 0 0 1px;
+
+                        &:last-child {
+                            border-width: 0 1px 0 1px;
+                        }
                     }
                 }
             }
diff --git a/theme-base/components/input/_inputswitch.scss b/theme-base/components/input/_inputswitch.scss
index 8ef73e6..6ed6c73 100644
--- a/theme-base/components/input/_inputswitch.scss
+++ b/theme-base/components/input/_inputswitch.scss
@@ -44,7 +44,7 @@
 
             &:before {
                 background: $inputSwitchHandleOnBg;
-             }
+            }
         }
 
         &:not(.p-disabled):hover {
@@ -55,6 +55,8 @@
     }
 
     &.p-invalid {
-        @include invalid-input();
+        .p-inputswitch-slider {
+            @include invalid-input();
+        }
     }
 }
\ No newline at end of file
diff --git a/themes/arya/_variables.scss b/themes/arya/_variables.scss
index 805599b..288d357 100644
--- a/themes/arya/_variables.scss
+++ b/themes/arya/_variables.scss
@@ -884,5 +884,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:rgba(255,255,255,.03);
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: dark;
 }
\ No newline at end of file
diff --git a/themes/bootstrap4/bootstrap4-dark/_variables_dark.scss b/themes/bootstrap4/bootstrap4-dark/_variables_dark.scss
index 18c401a..032ea15 100644
--- a/themes/bootstrap4/bootstrap4-dark/_variables_dark.scss
+++ b/themes/bootstrap4/bootstrap4-dark/_variables_dark.scss
@@ -887,5 +887,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:rgba(255,255,255,.04);
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: dark;
 }
diff --git a/themes/bootstrap4/bootstrap4-light/_variables_light.scss b/themes/bootstrap4/bootstrap4-light/_variables_light.scss
index 67c59cf..edd0423 100644
--- a/themes/bootstrap4/bootstrap4-light/_variables_light.scss
+++ b/themes/bootstrap4/bootstrap4-light/_variables_light.scss
@@ -885,5 +885,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:#e9ecef;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
diff --git a/themes/fluent/fluent-light/_variables.scss b/themes/fluent/fluent-light/_variables.scss
index 81c6755..e2f6ec5 100644
--- a/themes/fluent/fluent-light/_variables.scss
+++ b/themes/fluent/fluent-light/_variables.scss
@@ -904,5 +904,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:#f3f2f1;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
diff --git a/themes/lara/lara-dark/_variables.scss b/themes/lara/lara-dark/_variables.scss
index d0e5cdb..cfc7195 100644
--- a/themes/lara/lara-dark/_variables.scss
+++ b/themes/lara/lara-dark/_variables.scss
@@ -884,5 +884,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:rgba(255,255,255,.03);
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: dark;
 }
\ No newline at end of file
diff --git a/themes/lara/lara-light/_variables.scss b/themes/lara/lara-light/_variables.scss
index c9bcf5e..e091923 100644
--- a/themes/lara/lara-light/_variables.scss
+++ b/themes/lara/lara-light/_variables.scss
@@ -886,5 +886,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:#f6f9fc;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
\ No newline at end of file
diff --git a/themes/luna/_variables.scss b/themes/luna/_variables.scss
index 035f18f..d9f054f 100644
--- a/themes/luna/_variables.scss
+++ b/themes/luna/_variables.scss
@@ -873,5 +873,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:#4c4c4c;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light dark;
 }
\ No newline at end of file
diff --git a/themes/material/material-dark/_variables.scss b/themes/material/material-dark/_variables.scss
index 9bfdbac..f2ec95e 100644
--- a/themes/material/material-dark/_variables.scss
+++ b/themes/material/material-dark/_variables.scss
@@ -883,5 +883,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:hsla(0,0%,100%,.04);
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: dark;
 }
\ No newline at end of file
diff --git a/themes/material/material-light/_variables.scss b/themes/material/material-light/_variables.scss
index 745b5a0..476b220 100644
--- a/themes/material/material-light/_variables.scss
+++ b/themes/material/material-light/_variables.scss
@@ -883,5 +883,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:rgba(0,0,0,.04);
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
diff --git a/themes/mira/_variables.scss b/themes/mira/_variables.scss
index 490082e..bd0fe9b 100644
--- a/themes/mira/_variables.scss
+++ b/themes/mira/_variables.scss
@@ -908,5 +908,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:#D8DEE9;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
\ No newline at end of file
diff --git a/themes/mytheme/_variables.scss b/themes/mytheme/_variables.scss
index 5748123..43835ed 100644
--- a/themes/mytheme/_variables.scss
+++ b/themes/mytheme/_variables.scss
@@ -75,5 +75,7 @@ $colors: (
     --surface-hover:#e9ecef;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
\ No newline at end of file
diff --git a/themes/nano/_variables.scss b/themes/nano/_variables.scss
index 198b221..d98d40d 100644
--- a/themes/nano/_variables.scss
+++ b/themes/nano/_variables.scss
@@ -895,5 +895,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:#dde1e6;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
\ No newline at end of file
diff --git a/themes/nova/_variables.scss b/themes/nova/_variables.scss
index 627f310..1195180 100644
--- a/themes/nova/_variables.scss
+++ b/themes/nova/_variables.scss
@@ -873,5 +873,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:#eaeaea;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
\ No newline at end of file
diff --git a/themes/rhea/_variables.scss b/themes/rhea/_variables.scss
index 13b0427..29e4afe 100644
--- a/themes/rhea/_variables.scss
+++ b/themes/rhea/_variables.scss
@@ -885,5 +885,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover: #eaeaea;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
\ No newline at end of file
diff --git a/themes/saga/_variables.scss b/themes/saga/_variables.scss
index ab06995..f912b94 100644
--- a/themes/saga/_variables.scss
+++ b/themes/saga/_variables.scss
@@ -885,5 +885,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover: #e9ecef;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
\ No newline at end of file
diff --git a/themes/soho/soho-dark/_variables.scss b/themes/soho/soho-dark/_variables.scss
index 30672a8..1f52edf 100644
--- a/themes/soho/soho-dark/_variables.scss
+++ b/themes/soho/soho-dark/_variables.scss
@@ -894,5 +894,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:rgba(255,255,255,.03);
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: dark;
 }
\ No newline at end of file
diff --git a/themes/soho/soho-light/_variables.scss b/themes/soho/soho-light/_variables.scss
index bf1e33d..744dc1b 100644
--- a/themes/soho/soho-light/_variables.scss
+++ b/themes/soho/soho-light/_variables.scss
@@ -896,5 +896,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:#f6f9fc;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
\ No newline at end of file
diff --git a/themes/tailwind/tailwind-light/_variables.scss b/themes/tailwind/tailwind-light/_variables.scss
index 3b78c10..b1955df 100644
--- a/themes/tailwind/tailwind-light/_variables.scss
+++ b/themes/tailwind/tailwind-light/_variables.scss
@@ -894,5 +894,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover: #f4f4f5;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
\ No newline at end of file
diff --git a/themes/vela/_variables.scss b/themes/vela/_variables.scss
index f0b81fc..1fd4f34 100644
--- a/themes/vela/_variables.scss
+++ b/themes/vela/_variables.scss
@@ -884,5 +884,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:rgba(255,255,255,.03);
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light dark;
 }
diff --git a/themes/viva/viva-dark/_variables.scss b/themes/viva/viva-dark/_variables.scss
index e846f5c..5dc8ea7 100644
--- a/themes/viva/viva-dark/_variables.scss
+++ b/themes/viva/viva-dark/_variables.scss
@@ -894,5 +894,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:rgba($primaryColor, .08);
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: dark;
 }
\ No newline at end of file
diff --git a/themes/viva/viva-light/_variables.scss b/themes/viva/viva-light/_variables.scss
index 4a879b3..efd0ba4 100644
--- a/themes/viva/viva-light/_variables.scss
+++ b/themes/viva/viva-light/_variables.scss
@@ -897,5 +897,7 @@ $imagePreviewActionIconBorderRadius:50% !default;
     --surface-hover:#edf0fA;
     --focus-ring: #{$focusShadow};
     --maskbg: #{$maskBg};
+    --highlight-bg: #{$highlightBg};
+    --highlight-text-color: #{$highlightTextColor};
     color-scheme: light;
 }
\ No newline at end of file