diff --git a/public/themes/arya-blue/theme.css b/public/themes/arya-blue/theme.css
index 91bb05232..48113533f 100644
--- a/public/themes/arya-blue/theme.css
+++ b/public/themes/arya-blue/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #383838;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #93cbf9;
+    border-color: #64B5F6;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #383838;
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #383838;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #383838;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #93cbf9;
+    border-color: #64B5F6;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #383838;
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #383838;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/arya-green/theme.css b/public/themes/arya-green/theme.css
index 3db7c0514..d9019daa5 100644
--- a/public/themes/arya-green/theme.css
+++ b/public/themes/arya-green/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #383838;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #a7d8a9;
+    border-color: #81C784;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #383838;
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #383838;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #383838;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #a7d8a9;
+    border-color: #81C784;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #383838;
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #383838;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/arya-orange/theme.css b/public/themes/arya-orange/theme.css
index f0ac2beef..41565ae95 100644
--- a/public/themes/arya-orange/theme.css
+++ b/public/themes/arya-orange/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #383838;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #ffe284;
+    border-color: #FFD54F;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #383838;
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #383838;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #383838;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #ffe284;
+    border-color: #FFD54F;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #383838;
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #383838;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/arya-purple/theme.css b/public/themes/arya-purple/theme.css
index 42ff882fd..8ca0ba605 100644
--- a/public/themes/arya-purple/theme.css
+++ b/public/themes/arya-purple/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #383838;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #cf95d9;
+    border-color: #BA68C8;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #383838;
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #383838;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #383838;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #cf95d9;
+    border-color: #BA68C8;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #383838;
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #383838;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/bootstrap4-dark-blue/theme.css b/public/themes/bootstrap4-dark-blue/theme.css
index 943e32c66..b88781864 100644
--- a/public/themes/bootstrap4-dark-blue/theme.css
+++ b/public/themes/bootstrap4-dark-blue/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #2a323d;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #3f4b5b;
+    border-radius: 4px;
+    transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #e3f3fe;
+    border-color: #8dd0ff;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem 1.25rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #3f4b5b;
-    background: #2a323d;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #3f4b5b;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1.5rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #2a323d;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #3f4b5b;
+    border-radius: 4px;
+    transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #e3f3fe;
+    border-color: #8dd0ff;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem 1.25rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #3f4b5b;
-    background: #2a323d;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #3f4b5b;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1.5rem;
     margin: 0;
diff --git a/public/themes/bootstrap4-dark-purple/theme.css b/public/themes/bootstrap4-dark-purple/theme.css
index 59dad0a7f..7a1aed705 100644
--- a/public/themes/bootstrap4-dark-purple/theme.css
+++ b/public/themes/bootstrap4-dark-purple/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #2a323d;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #3f4b5b;
+    border-radius: 4px;
+    transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #f0e6f5;
+    border-color: #c298d8;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem 1.25rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #3f4b5b;
-    background: #2a323d;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #3f4b5b;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1.5rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #2a323d;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #3f4b5b;
+    border-radius: 4px;
+    transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #f0e6f5;
+    border-color: #c298d8;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem 1.25rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #3f4b5b;
-    background: #2a323d;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #3f4b5b;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1.5rem;
     margin: 0;
diff --git a/public/themes/bootstrap4-light-blue/theme.css b/public/themes/bootstrap4-light-blue/theme.css
index c3ea11be5..260e31384 100644
--- a/public/themes/bootstrap4-light-blue/theme.css
+++ b/public/themes/bootstrap4-light-blue/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #efefef;
-    color: #212529;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 4px;
+    transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+    border-color: #007bff;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #212529;
     padding: 1rem 1.25rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #212529;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1.5rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #efefef;
-    color: #212529;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 4px;
+    transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
+    border-color: #007bff;
+  }
+  .p-picklist .p-picklist-header {
+    color: #212529;
     padding: 1rem 1.25rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #212529;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1.5rem;
     margin: 0;
diff --git a/public/themes/bootstrap4-light-purple/theme.css b/public/themes/bootstrap4-light-purple/theme.css
index 8f493ca04..e13e872cf 100644
--- a/public/themes/bootstrap4-light-purple/theme.css
+++ b/public/themes/bootstrap4-light-purple/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #efefef;
-    color: #212529;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 4px;
+    transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
+    border-color: #883cae;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #212529;
     padding: 1rem 1.25rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #212529;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1.5rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #efefef;
-    color: #212529;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 4px;
+    transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(136, 60, 174, 0.5);
+    border-color: #883cae;
+  }
+  .p-picklist .p-picklist-header {
+    color: #212529;
     padding: 1rem 1.25rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #212529;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1.5rem;
     margin: 0;
diff --git a/public/themes/fluent-light/theme.css b/public/themes/fluent-light/theme.css
index 64fedeba9..9d9c0a637 100644
--- a/public/themes/fluent-light/theme.css
+++ b/public/themes/fluent-light/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #faf9f8;
-    color: #323130;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #a19f9d;
+    border-radius: 2px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: inset 0 0 0 1px #605e5c;
+    border-color: #0078d4;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #323130;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 2px;
-    border-top-left-radius: 2px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #a19f9d;
-    background: #ffffff;
     color: #323130;
     padding: 0;
-    border-bottom-right-radius: 2px;
-    border-bottom-left-radius: 2px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #a19f9d;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 0.5rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #faf9f8;
-    color: #323130;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #a19f9d;
+    border-radius: 2px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: inset 0 0 0 1px #605e5c;
+    border-color: #0078d4;
+  }
+  .p-picklist .p-picklist-header {
+    color: #323130;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 2px;
-    border-top-left-radius: 2px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #a19f9d;
-    background: #ffffff;
     color: #323130;
     padding: 0;
-    border-bottom-right-radius: 2px;
-    border-bottom-left-radius: 2px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #a19f9d;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 0.5rem;
     margin: 0;
diff --git a/public/themes/lara-dark-amber/theme.css b/public/themes/lara-dark-amber/theme.css
index c3e30be3a..9d470a21b 100644
--- a/public/themes/lara-dark-amber/theme.css
+++ b/public/themes/lara-dark-amber/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(251, 191, 36, 0.2);
+    border-color: #fbbf24;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(251, 191, 36, 0.2);
+    border-color: #fbbf24;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-dark-blue/theme.css b/public/themes/lara-dark-blue/theme.css
index 2d0bfd483..46d85afb3 100644
--- a/public/themes/lara-dark-blue/theme.css
+++ b/public/themes/lara-dark-blue/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(96, 165, 250, 0.2);
+    border-color: #60a5fa;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(96, 165, 250, 0.2);
+    border-color: #60a5fa;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-dark-cyan/theme.css b/public/themes/lara-dark-cyan/theme.css
index c1894d151..cb75626c6 100644
--- a/public/themes/lara-dark-cyan/theme.css
+++ b/public/themes/lara-dark-cyan/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(34, 211, 238, 0.2);
+    border-color: #22d3ee;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(34, 211, 238, 0.2);
+    border-color: #22d3ee;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-dark-green/theme.css b/public/themes/lara-dark-green/theme.css
index 8cc88b1cb..8a080d7af 100644
--- a/public/themes/lara-dark-green/theme.css
+++ b/public/themes/lara-dark-green/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(52, 211, 153, 0.2);
+    border-color: #34d399;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(52, 211, 153, 0.2);
+    border-color: #34d399;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-dark-indigo/theme.css b/public/themes/lara-dark-indigo/theme.css
index 34841fb6c..be64e0ba8 100644
--- a/public/themes/lara-dark-indigo/theme.css
+++ b/public/themes/lara-dark-indigo/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(129, 140, 248, 0.2);
+    border-color: #818cf8;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(129, 140, 248, 0.2);
+    border-color: #818cf8;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-dark-pink/theme.css b/public/themes/lara-dark-pink/theme.css
index 6804c926e..a184d5cb0 100644
--- a/public/themes/lara-dark-pink/theme.css
+++ b/public/themes/lara-dark-pink/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(244, 114, 182, 0.2);
+    border-color: #f472b6;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(244, 114, 182, 0.2);
+    border-color: #f472b6;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-dark-purple/theme.css b/public/themes/lara-dark-purple/theme.css
index 35a0caf7e..27807c657 100644
--- a/public/themes/lara-dark-purple/theme.css
+++ b/public/themes/lara-dark-purple/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(167, 139, 250, 0.2);
+    border-color: #a78bfa;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(167, 139, 250, 0.2);
+    border-color: #a78bfa;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-dark-teal/theme.css b/public/themes/lara-dark-teal/theme.css
index 1b105e0a6..f28e3e467 100644
--- a/public/themes/lara-dark-teal/theme.css
+++ b/public/themes/lara-dark-teal/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(45, 212, 191, 0.2);
+    border-color: #2dd4bf;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2937;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #424b57;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem rgba(45, 212, 191, 0.2);
+    border-color: #2dd4bf;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #424b57;
-    background: #1f2937;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #424b57;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-light-amber/theme.css b/public/themes/lara-light-amber/theme.css
index e9f368304..1b3fc44a3 100644
--- a/public/themes/lara-light-amber/theme.css
+++ b/public/themes/lara-light-amber/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #fef08a;
+    border-color: #f59e0b;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #fef08a;
+    border-color: #f59e0b;
+  }
+  .p-picklist .p-picklist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-light-blue/theme.css b/public/themes/lara-light-blue/theme.css
index f5b0da7f0..383ba02b5 100644
--- a/public/themes/lara-light-blue/theme.css
+++ b/public/themes/lara-light-blue/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #BFDBFE;
+    border-color: #3B82F6;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #BFDBFE;
+    border-color: #3B82F6;
+  }
+  .p-picklist .p-picklist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-light-cyan/theme.css b/public/themes/lara-light-cyan/theme.css
index 02a293311..d00ffa5ca 100644
--- a/public/themes/lara-light-cyan/theme.css
+++ b/public/themes/lara-light-cyan/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #a5f3fc;
+    border-color: #06b6d4;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #a5f3fc;
+    border-color: #06b6d4;
+  }
+  .p-picklist .p-picklist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-light-green/theme.css b/public/themes/lara-light-green/theme.css
index 6570826b3..c03933160 100644
--- a/public/themes/lara-light-green/theme.css
+++ b/public/themes/lara-light-green/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #a7f3d0;
+    border-color: #10b981;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #a7f3d0;
+    border-color: #10b981;
+  }
+  .p-picklist .p-picklist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-light-indigo/theme.css b/public/themes/lara-light-indigo/theme.css
index 8e2c112bd..8193837d0 100644
--- a/public/themes/lara-light-indigo/theme.css
+++ b/public/themes/lara-light-indigo/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #C7D2FE;
+    border-color: #6366F1;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #C7D2FE;
+    border-color: #6366F1;
+  }
+  .p-picklist .p-picklist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-light-pink/theme.css b/public/themes/lara-light-pink/theme.css
index 62de07a88..87b314993 100644
--- a/public/themes/lara-light-pink/theme.css
+++ b/public/themes/lara-light-pink/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #fbcfe8;
+    border-color: #ec4899;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #fbcfe8;
+    border-color: #ec4899;
+  }
+  .p-picklist .p-picklist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-light-purple/theme.css b/public/themes/lara-light-purple/theme.css
index 37cc0db37..9125221c7 100644
--- a/public/themes/lara-light-purple/theme.css
+++ b/public/themes/lara-light-purple/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #DDD6FE;
+    border-color: #8B5CF6;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #DDD6FE;
+    border-color: #8B5CF6;
+  }
+  .p-picklist .p-picklist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/lara-light-teal/theme.css b/public/themes/lara-light-teal/theme.css
index 9e47d236a..472ddee2a 100644
--- a/public/themes/lara-light-teal/theme.css
+++ b/public/themes/lara-light-teal/theme.css
@@ -3150,25 +3150,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #99f6e4;
+    border-color: #14b8a6;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3333,25 +3340,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f9fafb;
-    color: #374151;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #99f6e4;
+    border-color: #14b8a6;
+  }
+  .p-picklist .p-picklist-header {
+    color: #374151;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #4b5563;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index 6039c0729..a8b65b13f 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #191919;
-    color: #dedede;
+  .p-orderlist .p-orderlist-list-container {
+    background: #323232;
     border: 1px solid #191919;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.1rem white;
+    border-color: #FFE082;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #dedede;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #191919;
-    background: #323232;
     color: #dedede;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #191919;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #191919;
-    color: #dedede;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #323232;
     border: 1px solid #191919;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.1rem white;
+    border-color: #FFE082;
+  }
+  .p-picklist .p-picklist-header {
+    color: #dedede;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #191919;
-    background: #323232;
     color: #dedede;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #191919;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
diff --git a/public/themes/luna-blue/theme.css b/public/themes/luna-blue/theme.css
index 5239085fc..978d36ad0 100644
--- a/public/themes/luna-blue/theme.css
+++ b/public/themes/luna-blue/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #191919;
-    color: #dedede;
+  .p-orderlist .p-orderlist-list-container {
+    background: #323232;
     border: 1px solid #191919;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.1rem white;
+    border-color: #81D4FA;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #dedede;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #191919;
-    background: #323232;
     color: #dedede;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #191919;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #191919;
-    color: #dedede;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #323232;
     border: 1px solid #191919;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.1rem white;
+    border-color: #81D4FA;
+  }
+  .p-picklist .p-picklist-header {
+    color: #dedede;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #191919;
-    background: #323232;
     color: #dedede;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #191919;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index c6b45c37d..6712bcce8 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #191919;
-    color: #dedede;
+  .p-orderlist .p-orderlist-list-container {
+    background: #323232;
     border: 1px solid #191919;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.1rem white;
+    border-color: #C5E1A5;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #dedede;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #191919;
-    background: #323232;
     color: #dedede;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #191919;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #191919;
-    color: #dedede;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #323232;
     border: 1px solid #191919;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.1rem white;
+    border-color: #C5E1A5;
+  }
+  .p-picklist .p-picklist-header {
+    color: #dedede;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #191919;
-    background: #323232;
     color: #dedede;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #191919;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index ae7668ead..8e60e3ff9 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #191919;
-    color: #dedede;
+  .p-orderlist .p-orderlist-list-container {
+    background: #323232;
     border: 1px solid #191919;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.1rem white;
+    border-color: #F48FB1;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #dedede;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #191919;
-    background: #323232;
     color: #dedede;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #191919;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #191919;
-    color: #dedede;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #323232;
     border: 1px solid #191919;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.1rem white;
+    border-color: #F48FB1;
+  }
+  .p-picklist .p-picklist-header {
+    color: #dedede;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #191919;
-    background: #323232;
     color: #dedede;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #191919;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
diff --git a/public/themes/md-dark-deeppurple/theme.css b/public/themes/md-dark-deeppurple/theme.css
index 2369f20a8..5cbc6a943 100644
--- a/public/themes/md-dark-deeppurple/theme.css
+++ b/public/themes/md-dark-deeppurple/theme.css
@@ -3155,25 +3155,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid rgba(255, 255, 255, 0.12);
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #CE93D8;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid rgba(255, 255, 255, 0.12);
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid rgba(255, 255, 255, 0.12);
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 1rem 1rem;
     margin: 0;
@@ -3338,25 +3345,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid rgba(255, 255, 255, 0.12);
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #CE93D8;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid rgba(255, 255, 255, 0.12);
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid rgba(255, 255, 255, 0.12);
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 1rem 1rem;
     margin: 0;
diff --git a/public/themes/md-dark-indigo/theme.css b/public/themes/md-dark-indigo/theme.css
index dd3c4c063..bec222e0d 100644
--- a/public/themes/md-dark-indigo/theme.css
+++ b/public/themes/md-dark-indigo/theme.css
@@ -3155,25 +3155,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid rgba(255, 255, 255, 0.12);
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #9FA8DA;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid rgba(255, 255, 255, 0.12);
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid rgba(255, 255, 255, 0.12);
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 1rem 1rem;
     margin: 0;
@@ -3338,25 +3345,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid rgba(255, 255, 255, 0.12);
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #9FA8DA;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid rgba(255, 255, 255, 0.12);
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid rgba(255, 255, 255, 0.12);
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 1rem 1rem;
     margin: 0;
diff --git a/public/themes/md-light-deeppurple/theme.css b/public/themes/md-light-deeppurple/theme.css
index b5473061b..b6ab4e4af 100644
--- a/public/themes/md-light-deeppurple/theme.css
+++ b/public/themes/md-light-deeppurple/theme.css
@@ -3155,25 +3155,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #ffffff;
-    color: rgba(0, 0, 0, 0.87);
     border: 1px solid #e0e0e0;
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #673AB7;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(0, 0, 0, 0.87);
     padding: 1rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e0e0e0;
-    background: #ffffff;
     color: rgba(0, 0, 0, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e0e0e0;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 1rem 1rem;
     margin: 0;
@@ -3338,25 +3345,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #ffffff;
-    color: rgba(0, 0, 0, 0.87);
     border: 1px solid #e0e0e0;
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #673AB7;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(0, 0, 0, 0.87);
     padding: 1rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e0e0e0;
-    background: #ffffff;
     color: rgba(0, 0, 0, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e0e0e0;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 1rem 1rem;
     margin: 0;
diff --git a/public/themes/md-light-indigo/theme.css b/public/themes/md-light-indigo/theme.css
index cf09ed8db..a3bd3cf2c 100644
--- a/public/themes/md-light-indigo/theme.css
+++ b/public/themes/md-light-indigo/theme.css
@@ -3155,25 +3155,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #ffffff;
-    color: rgba(0, 0, 0, 0.87);
     border: 1px solid #e0e0e0;
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #3F51B5;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(0, 0, 0, 0.87);
     padding: 1rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e0e0e0;
-    background: #ffffff;
     color: rgba(0, 0, 0, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e0e0e0;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 1rem 1rem;
     margin: 0;
@@ -3338,25 +3345,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #ffffff;
-    color: rgba(0, 0, 0, 0.87);
     border: 1px solid #e0e0e0;
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #3F51B5;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(0, 0, 0, 0.87);
     padding: 1rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e0e0e0;
-    background: #ffffff;
     color: rgba(0, 0, 0, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e0e0e0;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 1rem 1rem;
     margin: 0;
diff --git a/public/themes/mdc-dark-deeppurple/theme.css b/public/themes/mdc-dark-deeppurple/theme.css
index fcc881ace..3962cb188 100644
--- a/public/themes/mdc-dark-deeppurple/theme.css
+++ b/public/themes/mdc-dark-deeppurple/theme.css
@@ -3155,25 +3155,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid rgba(255, 255, 255, 0.12);
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #CE93D8;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid rgba(255, 255, 255, 0.12);
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid rgba(255, 255, 255, 0.12);
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 0.75rem;
     margin: 0;
@@ -3338,25 +3345,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid rgba(255, 255, 255, 0.12);
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #CE93D8;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid rgba(255, 255, 255, 0.12);
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid rgba(255, 255, 255, 0.12);
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 0.75rem;
     margin: 0;
diff --git a/public/themes/mdc-dark-indigo/theme.css b/public/themes/mdc-dark-indigo/theme.css
index 7c7f96a84..02954b9ca 100644
--- a/public/themes/mdc-dark-indigo/theme.css
+++ b/public/themes/mdc-dark-indigo/theme.css
@@ -3155,25 +3155,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid rgba(255, 255, 255, 0.12);
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #9FA8DA;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid rgba(255, 255, 255, 0.12);
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid rgba(255, 255, 255, 0.12);
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 0.75rem;
     margin: 0;
@@ -3338,25 +3345,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1e1e1e;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid rgba(255, 255, 255, 0.12);
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #9FA8DA;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid rgba(255, 255, 255, 0.12);
-    background: #1e1e1e;
     color: rgba(255, 255, 255, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid rgba(255, 255, 255, 0.12);
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 0.75rem;
     margin: 0;
diff --git a/public/themes/mdc-light-deeppurple/theme.css b/public/themes/mdc-light-deeppurple/theme.css
index 2be986dc2..52a727362 100644
--- a/public/themes/mdc-light-deeppurple/theme.css
+++ b/public/themes/mdc-light-deeppurple/theme.css
@@ -3155,25 +3155,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #ffffff;
-    color: rgba(0, 0, 0, 0.87);
     border: 1px solid #e0e0e0;
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #673AB7;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(0, 0, 0, 0.87);
     padding: 0.75rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e0e0e0;
-    background: #ffffff;
     color: rgba(0, 0, 0, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e0e0e0;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 0.75rem;
     margin: 0;
@@ -3338,25 +3345,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #ffffff;
-    color: rgba(0, 0, 0, 0.87);
     border: 1px solid #e0e0e0;
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #673AB7;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(0, 0, 0, 0.87);
     padding: 0.75rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e0e0e0;
-    background: #ffffff;
     color: rgba(0, 0, 0, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e0e0e0;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 0.75rem;
     margin: 0;
diff --git a/public/themes/mdc-light-indigo/theme.css b/public/themes/mdc-light-indigo/theme.css
index a663566ae..79cf03e5d 100644
--- a/public/themes/mdc-light-indigo/theme.css
+++ b/public/themes/mdc-light-indigo/theme.css
@@ -3155,25 +3155,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #ffffff;
-    color: rgba(0, 0, 0, 0.87);
     border: 1px solid #e0e0e0;
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #3F51B5;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(0, 0, 0, 0.87);
     padding: 0.75rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e0e0e0;
-    background: #ffffff;
     color: rgba(0, 0, 0, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e0e0e0;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 0.75rem;
     margin: 0;
@@ -3338,25 +3345,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #ffffff;
-    color: rgba(0, 0, 0, 0.87);
     border: 1px solid #e0e0e0;
+    border-radius: 4px;
+    transition: background-color 0.2s, border-color 0.2s, color 0.2s, box-shadow 0.2s, background-size 0.2s cubic-bezier(0.64, 0.09, 0.08, 1);
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: none;
+    border-color: #3F51B5;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(0, 0, 0, 0.87);
     padding: 0.75rem;
     font-weight: 500;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e0e0e0;
-    background: #ffffff;
     color: rgba(0, 0, 0, 0.87);
     padding: 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e0e0e0;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 0.75rem;
     margin: 0;
diff --git a/public/themes/mira/theme.css b/public/themes/mira/theme.css
index f83014349..3b64a9ef0 100644
--- a/public/themes/mira/theme.css
+++ b/public/themes/mira/theme.css
@@ -3159,25 +3159,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #ffffff;
-    color: #4C566A;
     border: 1px solid #E5E9F0;
+    border-radius: 4px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #C0D0E0;
+    border-color: #81A1C1;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #4C566A;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #E5E9F0;
-    background: #ffffff;
     color: #4C566A;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #E5E9F0;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3342,25 +3349,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #ffffff;
-    color: #4C566A;
     border: 1px solid #E5E9F0;
+    border-radius: 4px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #C0D0E0;
+    border-color: #81A1C1;
+  }
+  .p-picklist .p-picklist-header {
+    color: #4C566A;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 4px;
-    border-top-left-radius: 4px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #E5E9F0;
-    background: #ffffff;
     color: #4C566A;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #E5E9F0;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/nano/theme.css b/public/themes/nano/theme.css
index 0dbcf77fa..05490490e 100644
--- a/public/themes/nano/theme.css
+++ b/public/themes/nano/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f2f4f8;
-    color: #343a3f;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 1px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #90c9f5;
+    border-color: #1174c0;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #343a3f;
     padding: 0.75rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 1px;
-    border-top-left-radius: 1px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #343a3f;
     padding: 0.25rem 0;
-    border-bottom-right-radius: 1px;
-    border-bottom-left-radius: 1px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.25rem 0.5rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f2f4f8;
-    color: #343a3f;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 1px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #90c9f5;
+    border-color: #1174c0;
+  }
+  .p-picklist .p-picklist-header {
+    color: #343a3f;
     padding: 0.75rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 1px;
-    border-top-left-radius: 1px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #343a3f;
     padding: 0.25rem 0;
-    border-bottom-right-radius: 1px;
-    border-bottom-left-radius: 1px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.25rem 0.5rem;
     margin: 0;
diff --git a/public/themes/nova-accent/theme.css b/public/themes/nova-accent/theme.css
index bdf2dbcbc..0900cae06 100644
--- a/public/themes/nova-accent/theme.css
+++ b/public/themes/nova-accent/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
+    border: 1px solid #c8c8c8;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #8dcdff;
+    border-color: #007ad9;
+  }
   .p-orderlist .p-orderlist-header {
-    background: #007ad9;
     color: #ffffff;
-    border: 1px solid #007ad9;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #c8c8c8;
-    background: #ffffff;
     color: #333333;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #c8c8c8;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
+    border: 1px solid #c8c8c8;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #8dcdff;
+    border-color: #007ad9;
+  }
   .p-picklist .p-picklist-header {
-    background: #007ad9;
     color: #ffffff;
-    border: 1px solid #007ad9;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #c8c8c8;
-    background: #ffffff;
     color: #333333;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #c8c8c8;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
diff --git a/public/themes/nova-alt/theme.css b/public/themes/nova-alt/theme.css
index 055ce3c7d..16de6991f 100644
--- a/public/themes/nova-alt/theme.css
+++ b/public/themes/nova-alt/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
+    border: 1px solid #c8c8c8;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #8dcdff;
+    border-color: #007ad9;
+  }
   .p-orderlist .p-orderlist-header {
-    background: #333333;
     color: #ffffff;
-    border: 1px solid #333333;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #c8c8c8;
-    background: #ffffff;
     color: #333333;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #c8c8c8;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
+    border: 1px solid #c8c8c8;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #8dcdff;
+    border-color: #007ad9;
+  }
   .p-picklist .p-picklist-header {
-    background: #333333;
     color: #ffffff;
-    border: 1px solid #333333;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #c8c8c8;
-    background: #ffffff;
     color: #333333;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #c8c8c8;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css
index 700a9c801..7e5cce260 100644
--- a/public/themes/nova-vue/theme.css
+++ b/public/themes/nova-vue/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f4f4f4;
-    color: #333333;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #c8c8c8;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #c2e9d8;
+    border-color: #41b883;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #333333;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #c8c8c8;
-    background: #ffffff;
     color: #333333;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #c8c8c8;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f4f4f4;
-    color: #333333;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #c8c8c8;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #c2e9d8;
+    border-color: #41b883;
+  }
+  .p-picklist .p-picklist-header {
+    color: #333333;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #c8c8c8;
-    background: #ffffff;
     color: #333333;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #c8c8c8;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
diff --git a/public/themes/nova/theme.css b/public/themes/nova/theme.css
index b748b4b08..ceaf94004 100644
--- a/public/themes/nova/theme.css
+++ b/public/themes/nova/theme.css
@@ -3143,25 +3143,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f4f4f4;
-    color: #333333;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #c8c8c8;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #8dcdff;
+    border-color: #007ad9;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #333333;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #c8c8c8;
-    background: #ffffff;
     color: #333333;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #c8c8c8;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
@@ -3326,25 +3333,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f4f4f4;
-    color: #333333;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #c8c8c8;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #8dcdff;
+    border-color: #007ad9;
+  }
+  .p-picklist .p-picklist-header {
+    color: #333333;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #c8c8c8;
-    background: #ffffff;
     color: #333333;
     padding: 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #c8c8c8;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index 18a0537c4..6c08615d8 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
+    border: 1px solid #dadada;
+    border-radius: 2px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #e4e9ec;
+    border-color: #7B95A3;
+  }
   .p-orderlist .p-orderlist-header {
-    background: #7B95A3;
     color: #ffffff;
-    border: 1px solid #7B95A3;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 2px;
-    border-top-left-radius: 2px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #dadada;
-    background: #ffffff;
     color: #666666;
     padding: 0;
-    border-bottom-right-radius: 2px;
-    border-bottom-left-radius: 2px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #dadada;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
+    border: 1px solid #dadada;
+    border-radius: 2px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #e4e9ec;
+    border-color: #7B95A3;
+  }
   .p-picklist .p-picklist-header {
-    background: #7B95A3;
     color: #ffffff;
-    border: 1px solid #7B95A3;
     padding: 0.857rem 1rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 2px;
-    border-top-left-radius: 2px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #dadada;
-    background: #ffffff;
     color: #666666;
     padding: 0;
-    border-bottom-right-radius: 2px;
-    border-bottom-left-radius: 2px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #dadada;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.429rem 0.857rem;
     margin: 0;
diff --git a/public/themes/saga-blue/theme.css b/public/themes/saga-blue/theme.css
index 8371c30bb..a06b9082d 100644
--- a/public/themes/saga-blue/theme.css
+++ b/public/themes/saga-blue/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f8f9fa;
-    color: #495057;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #a6d5fa;
+    border-color: #2196F3;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #495057;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #495057;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f8f9fa;
-    color: #495057;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #a6d5fa;
+    border-color: #2196F3;
+  }
+  .p-picklist .p-picklist-header {
+    color: #495057;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #495057;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/saga-green/theme.css b/public/themes/saga-green/theme.css
index f8a6f901b..134e03890 100644
--- a/public/themes/saga-green/theme.css
+++ b/public/themes/saga-green/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f8f9fa;
-    color: #495057;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #b7e0b8;
+    border-color: #4CAF50;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #495057;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #495057;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f8f9fa;
-    color: #495057;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #b7e0b8;
+    border-color: #4CAF50;
+  }
+  .p-picklist .p-picklist-header {
+    color: #495057;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #495057;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/saga-orange/theme.css b/public/themes/saga-orange/theme.css
index 4df29a1a3..102b2d75f 100644
--- a/public/themes/saga-orange/theme.css
+++ b/public/themes/saga-orange/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f8f9fa;
-    color: #495057;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #ffe69c;
+    border-color: #FFC107;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #495057;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #495057;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f8f9fa;
-    color: #495057;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #ffe69c;
+    border-color: #FFC107;
+  }
+  .p-picklist .p-picklist-header {
+    color: #495057;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #495057;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/saga-purple/theme.css b/public/themes/saga-purple/theme.css
index 334b2fe8a..372865fab 100644
--- a/public/themes/saga-purple/theme.css
+++ b/public/themes/saga-purple/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #f8f9fa;
-    color: #495057;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #df9eea;
+    border-color: #9C27B0;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #495057;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #495057;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #f8f9fa;
-    color: #495057;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #dee2e6;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.2rem #df9eea;
+    border-color: #9C27B0;
+  }
+  .p-picklist .p-picklist-header {
+    color: #495057;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #dee2e6;
-    background: #ffffff;
     color: #495057;
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #dee2e6;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/soho-dark/theme.css b/public/themes/soho-dark/theme.css
index 366b494eb..9fa9ae9b5 100644
--- a/public/themes/soho-dark/theme.css
+++ b/public/themes/soho-dark/theme.css
@@ -3155,25 +3155,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #282936;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #3e4053;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #e0d8fc;
+    border-color: #b19df7;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #3e4053;
-    background: #282936;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #3e4053;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3338,25 +3345,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #282936;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #3e4053;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #e0d8fc;
+    border-color: #b19df7;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #3e4053;
-    background: #282936;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #3e4053;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/soho-light/theme.css b/public/themes/soho-light/theme.css
index a7e94bbc0..214cff9c3 100644
--- a/public/themes/soho-light/theme.css
+++ b/public/themes/soho-light/theme.css
@@ -3155,25 +3155,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #eff3f8;
-    color: #708da9;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #dfe7ef;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #c7bbfa;
+    border-color: #7254f3;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #708da9;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #dfe7ef;
-    background: #ffffff;
     color: #043d75;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #dfe7ef;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
@@ -3338,25 +3345,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #eff3f8;
-    color: #708da9;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #dfe7ef;
+    border-radius: 6px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #c7bbfa;
+    border-color: #7254f3;
+  }
+  .p-picklist .p-picklist-header {
+    color: #708da9;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #dfe7ef;
-    background: #ffffff;
     color: #043d75;
     padding: 0.75rem 0;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #dfe7ef;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1.25rem;
     margin: 0;
diff --git a/public/themes/tailwind-light/theme.css b/public/themes/tailwind-light/theme.css
index d4685a964..d48bba4f1 100644
--- a/public/themes/tailwind-light/theme.css
+++ b/public/themes/tailwind-light/theme.css
@@ -3166,25 +3166,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
-    background: #fafafa;
-    color: #3f3f46;
+  .p-orderlist .p-orderlist-list-container {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 0.375rem;
+    transition: none;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #6366F1;
+    border-color: #4F46E5;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #3f3f46;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 0.375rem;
-    border-top-left-radius: 0.375rem;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #3f3f46;
     padding: 0.25rem 0;
-    border-bottom-right-radius: 0.375rem;
-    border-bottom-left-radius: 0.375rem;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.75rem 1rem;
     margin: 0;
@@ -3349,25 +3356,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
-    background: #fafafa;
-    color: #3f3f46;
+  .p-picklist .p-picklist-list-wrapper {
+    background: #ffffff;
     border: 1px solid #e5e7eb;
+    border-radius: 0.375rem;
+    transition: none;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #6366F1;
+    border-color: #4F46E5;
+  }
+  .p-picklist .p-picklist-header {
+    color: #3f3f46;
     padding: 1.25rem;
     font-weight: 700;
-    border-bottom: 0 none;
-    border-top-right-radius: 0.375rem;
-    border-top-left-radius: 0.375rem;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #e5e7eb;
-    background: #ffffff;
     color: #3f3f46;
     padding: 0.25rem 0;
-    border-bottom-right-radius: 0.375rem;
-    border-bottom-left-radius: 0.375rem;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #e5e7eb;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.75rem 1rem;
     margin: 0;
diff --git a/public/themes/vela-blue/theme.css b/public/themes/vela-blue/theme.css
index daa3bc805..6144c1ae5 100644
--- a/public/themes/vela-blue/theme.css
+++ b/public/themes/vela-blue/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2d40;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #304562;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #93cbf9;
+    border-color: #64B5F6;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #304562;
-    background: #1f2d40;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #304562;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2d40;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #304562;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #93cbf9;
+    border-color: #64B5F6;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #304562;
-    background: #1f2d40;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #304562;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/vela-green/theme.css b/public/themes/vela-green/theme.css
index d5622e475..22cfef31a 100644
--- a/public/themes/vela-green/theme.css
+++ b/public/themes/vela-green/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2d40;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #304562;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #a7d8a9;
+    border-color: #81C784;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #304562;
-    background: #1f2d40;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #304562;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2d40;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #304562;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #a7d8a9;
+    border-color: #81C784;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #304562;
-    background: #1f2d40;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #304562;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/vela-orange/theme.css b/public/themes/vela-orange/theme.css
index 39ebcc958..5d4615b69 100644
--- a/public/themes/vela-orange/theme.css
+++ b/public/themes/vela-orange/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2d40;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #304562;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #ffe284;
+    border-color: #FFD54F;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #304562;
-    background: #1f2d40;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #304562;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2d40;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #304562;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #ffe284;
+    border-color: #FFD54F;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #304562;
-    background: #1f2d40;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #304562;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/vela-purple/theme.css b/public/themes/vela-purple/theme.css
index cce4c69ca..8309d10b6 100644
--- a/public/themes/vela-purple/theme.css
+++ b/public/themes/vela-purple/theme.css
@@ -3131,25 +3131,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #1f2d40;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #304562;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #cf95d9;
+    border-color: #BA68C8;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 1px solid #304562;
-    background: #1f2d40;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 1px solid #304562;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0;
@@ -3314,25 +3321,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #1f2d40;
-    color: rgba(255, 255, 255, 0.87);
     border: 1px solid #304562;
+    border-radius: 3px;
+    transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #cf95d9;
+    border-color: #BA68C8;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 3px;
-    border-top-left-radius: 3px;
   }
   .p-picklist .p-picklist-list {
-    border: 1px solid #304562;
-    background: #1f2d40;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0;
-    border-bottom-right-radius: 3px;
-    border-bottom-left-radius: 3px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 1px solid #304562;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0;
diff --git a/public/themes/viva-dark/theme.css b/public/themes/viva-dark/theme.css
index f607df43d..795612afa 100644
--- a/public/themes/viva-dark/theme.css
+++ b/public/themes/viva-dark/theme.css
@@ -3163,25 +3163,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #161d21;
-    color: rgba(255, 255, 255, 0.87);
     border: 2px solid #263238;
+    border-radius: 6px;
+    transition: background-color 0.3s, color 0.3s, border-color 0.3s, box-shadow 0.3s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #9eade6;
+    border-color: #9eade6;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 2px solid #263238;
-    background: #161d21;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0.5rem;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 2px solid #263238;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0 0 4px 0;
@@ -3346,25 +3353,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #161d21;
-    color: rgba(255, 255, 255, 0.87);
     border: 2px solid #263238;
+    border-radius: 6px;
+    transition: background-color 0.3s, color 0.3s, border-color 0.3s, box-shadow 0.3s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px #9eade6;
+    border-color: #9eade6;
+  }
+  .p-picklist .p-picklist-header {
+    color: rgba(255, 255, 255, 0.87);
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 2px solid #263238;
-    background: #161d21;
     color: rgba(255, 255, 255, 0.87);
     padding: 0.5rem 0.5rem;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 2px solid #263238;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0 0 4px 0;
diff --git a/public/themes/viva-light/theme.css b/public/themes/viva-light/theme.css
index eb7df1f4b..bd2f80d11 100644
--- a/public/themes/viva-light/theme.css
+++ b/public/themes/viva-light/theme.css
@@ -3163,25 +3163,32 @@
   .p-orderlist .p-orderlist-controls .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-orderlist .p-orderlist-header {
+  .p-orderlist .p-orderlist-list-container {
     background: #ffffff;
-    color: #6c6c6c;
     border: 2px solid #ebebeb;
+    border-radius: 6px;
+    transition: background-color 0.3s, color 0.3s, border-color 0.3s, box-shadow 0.3s;
+    outline-color: transparent;
+  }
+  .p-orderlist .p-orderlist-list-container.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.1rem #bbc7ee;
+    border-color: #91a4e3;
+  }
+  .p-orderlist .p-orderlist-header {
+    color: #6c6c6c;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-orderlist .p-orderlist-list {
-    border: 2px solid #ebebeb;
-    background: #ffffff;
     color: #6c6c6c;
     padding: 0.5rem 0.5rem;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-orderlist .p-orderlist-list:not(:first-child) {
+    border-top: 2px solid #ebebeb;
+  }
   .p-orderlist .p-orderlist-list .p-orderlist-item {
     padding: 0.5rem 1rem;
     margin: 0 0 4px 0;
@@ -3346,25 +3353,32 @@
   .p-picklist .p-picklist-buttons .p-button {
     margin-bottom: 0.5rem;
   }
-  .p-picklist .p-picklist-header {
+  .p-picklist .p-picklist-list-wrapper {
     background: #ffffff;
-    color: #6c6c6c;
     border: 2px solid #ebebeb;
+    border-radius: 6px;
+    transition: background-color 0.3s, color 0.3s, border-color 0.3s, box-shadow 0.3s;
+    outline-color: transparent;
+  }
+  .p-picklist .p-picklist-list-wrapper.p-focus {
+    outline: 0 none;
+    outline-offset: 0;
+    box-shadow: 0 0 0 0.1rem #bbc7ee;
+    border-color: #91a4e3;
+  }
+  .p-picklist .p-picklist-header {
+    color: #6c6c6c;
     padding: 1rem;
     font-weight: 600;
-    border-bottom: 0 none;
-    border-top-right-radius: 6px;
-    border-top-left-radius: 6px;
   }
   .p-picklist .p-picklist-list {
-    border: 2px solid #ebebeb;
-    background: #ffffff;
     color: #6c6c6c;
     padding: 0.5rem 0.5rem;
-    border-bottom-right-radius: 6px;
-    border-bottom-left-radius: 6px;
     outline: 0 none;
   }
+  .p-picklist .p-picklist-list:not(:first-child) {
+    border-top: 2px solid #ebebeb;
+  }
   .p-picklist .p-picklist-list .p-picklist-item {
     padding: 0.5rem 1rem;
     margin: 0 0 4px 0;