diff --git a/.gitignore b/.gitignore
index 4b0d51183..590787f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,26 +129,6 @@ vitest-coverage/
 test-output.txt
 server/job/test/fixtures
 
-# Keep .github ignored by default, but track Copilot instructions
 .github
-!.github/
-.github/*
-!.github/copilot-instructions.md
 _reference/ragmate/.ragmate.env
 docker_data
-/.cursorrules
-/AGENTS.md
-/AI_CONTEXT.md
-/CLAUDE.md
-/COPILOT.md
-/GEMINI.md
-/_reference/select-component-test-plan.md
-
-/.cursorrules
-/AGENTS.md
-/AI_CONTEXT.md
-/CLAUDE.md
-/COPILOT.md
-/.github/copilot-instructions.md
-/GEMINI.md
-/_reference/select-component-test-plan.md
diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index cfb312ab1..503000cd2 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -2549,27 +2549,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>confidence</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>cost_center</name>
                                         <definition_loaded>false</definition_loaded>
@@ -3015,48 +2994,6 @@
                             <folder_node>
                                 <name>errors</name>
                                 <children>
-                                    <concept_node>
-                                        <name>calculating_totals</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
-                                    <concept_node>
-                                        <name>calculating_totals_generic</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>creating</name>
                                         <definition_loaded>false</definition_loaded>
@@ -3529,310 +3466,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <folder_node>
-                                        <name>ai</name>
-                                        <children>
-                                            <concept_node>
-                                                <name>accept_and_continue</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <folder_node>
-                                                <name>confidence</name>
-                                                <children>
-                                                    <concept_node>
-                                                        <name>breakdown</name>
-                                                        <definition_loaded>false</definition_loaded>
-                                                        <description></description>
-                                                        <comment></comment>
-                                                        <default_text></default_text>
-                                                        <translations>
-                                                            <translation>
-                                                                <language>en-US</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>es-MX</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>fr-CA</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                        </translations>
-                                                    </concept_node>
-                                                    <concept_node>
-                                                        <name>match</name>
-                                                        <definition_loaded>false</definition_loaded>
-                                                        <description></description>
-                                                        <comment></comment>
-                                                        <default_text></default_text>
-                                                        <translations>
-                                                            <translation>
-                                                                <language>en-US</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>es-MX</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>fr-CA</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                        </translations>
-                                                    </concept_node>
-                                                    <concept_node>
-                                                        <name>missing_data</name>
-                                                        <definition_loaded>false</definition_loaded>
-                                                        <description></description>
-                                                        <comment></comment>
-                                                        <default_text></default_text>
-                                                        <translations>
-                                                            <translation>
-                                                                <language>en-US</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>es-MX</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>fr-CA</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                        </translations>
-                                                    </concept_node>
-                                                    <concept_node>
-                                                        <name>ocr</name>
-                                                        <definition_loaded>false</definition_loaded>
-                                                        <description></description>
-                                                        <comment></comment>
-                                                        <default_text></default_text>
-                                                        <translations>
-                                                            <translation>
-                                                                <language>en-US</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>es-MX</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>fr-CA</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                        </translations>
-                                                    </concept_node>
-                                                    <concept_node>
-                                                        <name>overall</name>
-                                                        <definition_loaded>false</definition_loaded>
-                                                        <description></description>
-                                                        <comment></comment>
-                                                        <default_text></default_text>
-                                                        <translations>
-                                                            <translation>
-                                                                <language>en-US</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>es-MX</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>fr-CA</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                        </translations>
-                                                    </concept_node>
-                                                </children>
-                                            </folder_node>
-                                            <concept_node>
-                                                <name>disclaimer_title</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <concept_node>
-                                                <name>generic_failure</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <concept_node>
-                                                <name>multipage</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <concept_node>
-                                                <name>processing</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <concept_node>
-                                                <name>scan</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <concept_node>
-                                                <name>scancomplete</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <concept_node>
-                                                <name>scanfailed</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <concept_node>
-                                                <name>scanstarted</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                        </children>
-                                    </folder_node>
                                     <concept_node>
                                         <name>bill_lines</name>
                                         <definition_loaded>false</definition_loaded>
@@ -17769,48 +17402,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>earlyrorequired</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
-                                    <concept_node>
-                                        <name>earlyrorequired.message</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                 </children>
                             </folder_node>
                             <folder_node>
@@ -20632,27 +20223,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>gotoadmin</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>login</name>
                                         <definition_loaded>false</definition_loaded>
@@ -21450,27 +21020,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>apply</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>areyousure</name>
                                         <definition_loaded>false</definition_loaded>
@@ -21513,27 +21062,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>beta</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>cancel</name>
                                         <definition_loaded>false</definition_loaded>
@@ -27132,27 +26660,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>convertwithoutearlyro</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>createiou</name>
                                         <definition_loaded>false</definition_loaded>
@@ -27240,27 +26747,6 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
-                                            <concept_node>
-                                                <name>createearlyro</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
                                             <concept_node>
                                                 <name>createnewcustomer</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -27392,27 +26878,6 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
-                                            <concept_node>
-                                                <name>update_ro</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
                                             <concept_node>
                                                 <name>usegeneric</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -30493,27 +29958,6 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
-                                            <concept_node>
-                                                <name>customer</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
                                             <concept_node>
                                                 <name>dms_make</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -30918,90 +30362,6 @@
                                                     </concept_node>
                                                 </children>
                                             </folder_node>
-                                            <concept_node>
-                                                <name>rr_opcode</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <concept_node>
-                                                <name>rr_opcode_base</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <concept_node>
-                                                <name>rr_opcode_prefix</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
-                                            <concept_node>
-                                                <name>rr_opcode_suffix</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
                                             <concept_node>
                                                 <name>sale</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -36606,74 +35966,6 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
-                                            <folder_node>
-                                                <name>earlyro</name>
-                                                <children>
-                                                    <concept_node>
-                                                        <name>created</name>
-                                                        <definition_loaded>false</definition_loaded>
-                                                        <description></description>
-                                                        <comment></comment>
-                                                        <default_text></default_text>
-                                                        <translations>
-                                                            <translation>
-                                                                <language>en-US</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>es-MX</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>fr-CA</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                        </translations>
-                                                    </concept_node>
-                                                    <concept_node>
-                                                        <name>fields</name>
-                                                        <definition_loaded>false</definition_loaded>
-                                                        <description></description>
-                                                        <comment></comment>
-                                                        <default_text></default_text>
-                                                        <translations>
-                                                            <translation>
-                                                                <language>en-US</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>es-MX</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>fr-CA</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                        </translations>
-                                                    </concept_node>
-                                                    <concept_node>
-                                                        <name>willupdate</name>
-                                                        <definition_loaded>false</definition_loaded>
-                                                        <description></description>
-                                                        <comment></comment>
-                                                        <default_text></default_text>
-                                                        <translations>
-                                                            <translation>
-                                                                <language>en-US</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>es-MX</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                            <translation>
-                                                                <language>fr-CA</language>
-                                                                <approved>false</approved>
-                                                            </translation>
-                                                        </translations>
-                                                    </concept_node>
-                                                </children>
-                                            </folder_node>
                                             <concept_node>
                                                 <name>invoicedatefuture</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -39767,27 +39059,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>early_ro_created</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>exported</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/.env.development.imex b/client/.env.development.imex
index add365e15..1a43b6c7f 100644
--- a/client/.env.development.imex
+++ b/client/.env.development.imex
@@ -18,4 +18,3 @@ VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
 VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
 VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
 VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891
-VITE_APP_ENABLE_RESPONSIVE_TABLE_FILTERING=false
diff --git a/client/.env.development.rome b/client/.env.development.rome
index 56764ec6a..ac5c8e6fe 100644
--- a/client/.env.development.rome
+++ b/client/.env.development.rome
@@ -20,4 +20,3 @@ VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
 VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
 VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
 VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78
-VITE_APP_ENABLE_RESPONSIVE_TABLE_FILTERING=false
diff --git a/client/package-lock.json b/client/package-lock.json
index 02a8f6229..225d2ba06 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -9,9 +9,9 @@
       "version": "0.2.1",
       "hasInstallScript": true,
       "dependencies": {
-        "@amplitude/analytics-browser": "^2.35.3",
+        "@amplitude/analytics-browser": "^2.34.0",
         "@ant-design/pro-layout": "^7.22.6",
-        "@apollo/client": "^4.1.6",
+        "@apollo/client": "^4.1.3",
         "@dnd-kit/core": "^6.3.1",
         "@dnd-kit/modifiers": "^9.0.0",
         "@dnd-kit/sortable": "^10.0.0",
@@ -19,43 +19,43 @@
         "@emotion/is-prop-valid": "^1.4.0",
         "@fingerprintjs/fingerprintjs": "^5.0.1",
         "@firebase/analytics": "^0.10.19",
-        "@firebase/app": "^0.14.8",
+        "@firebase/app": "^0.14.7",
         "@firebase/auth": "^1.12.0",
-        "@firebase/firestore": "^4.11.0",
+        "@firebase/firestore": "^4.10.0",
         "@firebase/messaging": "^0.12.22",
         "@jsreport/browser-client": "^3.1.0",
         "@reduxjs/toolkit": "^2.11.2",
-        "@sentry/cli": "^3.2.2",
-        "@sentry/react": "^10.40.0",
-        "@sentry/vite-plugin": "^4.9.1",
+        "@sentry/cli": "^3.1.0",
+        "@sentry/react": "^10.38.0",
+        "@sentry/vite-plugin": "^4.8.0",
         "@splitsoftware/splitio-react": "^2.6.1",
-        "@tanem/react-nprogress": "^5.0.63",
-        "antd": "^6.3.1",
+        "@tanem/react-nprogress": "^5.0.58",
+        "antd": "^6.2.2",
         "apollo-link-logger": "^3.0.0",
         "autosize": "^6.0.1",
-        "axios": "^1.13.5",
+        "axios": "^1.13.4",
         "classnames": "^2.5.1",
         "css-box-model": "^1.2.1",
         "dayjs": "^1.11.19",
         "dayjs-business-days2": "^1.3.2",
         "dinero.js": "^1.9.1",
-        "dotenv": "^17.3.1",
+        "dotenv": "^17.2.3",
         "env-cmd": "^11.0.0",
         "exifr": "^7.1.3",
-        "graphql": "^16.13.0",
+        "graphql": "^16.12.0",
         "graphql-ws": "^6.0.7",
-        "i18next": "^25.8.13",
-        "i18next-browser-languagedetector": "^8.2.1",
+        "i18next": "^25.8.0",
+        "i18next-browser-languagedetector": "^8.2.0",
         "immutability-helper": "^3.1.1",
-        "libphonenumber-js": "^1.12.38",
+        "libphonenumber-js": "^1.12.36",
         "lightningcss": "^1.31.1",
         "logrocket": "^12.0.0",
         "markerjs2": "^2.32.7",
         "memoize-one": "^6.0.0",
         "normalize-url": "^8.1.1",
         "object-hash": "^3.0.0",
-        "phone": "^3.1.71",
-        "posthog-js": "^1.355.0",
+        "phone": "^3.1.70",
+        "posthog-js": "^1.336.4",
         "prop-types": "^15.8.1",
         "query-string": "^9.3.1",
         "raf-schd": "^4.0.3",
@@ -75,7 +75,7 @@
         "react-product-fruits": "^2.2.62",
         "react-redux": "^9.2.0",
         "react-resizable": "^3.1.3",
-        "react-router-dom": "^7.13.1",
+        "react-router-dom": "^7.13.0",
         "react-sticky": "^6.0.3",
         "react-virtuoso": "^4.18.1",
         "recharts": "^3.7.0",
@@ -88,7 +88,7 @@
         "rxjs": "^7.8.2",
         "sass": "^1.97.3",
         "socket.io-client": "^4.8.3",
-        "styled-components": "^6.3.11",
+        "styled-components": "^6.3.8",
         "vite-plugin-ejs": "^1.7.0",
         "web-vitals": "^5.1.0"
       },
@@ -100,11 +100,11 @@
         "@emotion/babel-plugin": "^11.13.5",
         "@emotion/react": "^11.14.0",
         "@eslint/js": "^9.39.2",
-        "@playwright/test": "^1.58.2",
+        "@playwright/test": "^1.58.0",
         "@testing-library/dom": "^10.4.1",
         "@testing-library/jest-dom": "^6.9.1",
         "@testing-library/react": "^16.3.2",
-        "@vitejs/plugin-react": "^5.1.4",
+        "@vitejs/plugin-react": "^5.1.2",
         "babel-plugin-react-compiler": "^1.0.0",
         "browserslist": "^4.28.1",
         "browserslist-to-esbuild": "^2.1.1",
@@ -112,16 +112,16 @@
         "eslint": "^9.39.2",
         "eslint-plugin-react": "^7.37.5",
         "eslint-plugin-react-compiler": "^19.1.0-rc.2",
-        "globals": "^17.3.0",
-        "jsdom": "^28.1.0",
+        "globals": "^17.2.0",
+        "jsdom": "^27.4.0",
         "memfs": "^4.56.10",
         "os-browserify": "^0.3.0",
-        "playwright": "^1.58.2",
+        "playwright": "^1.58.0",
         "react-error-overlay": "^6.1.0",
         "redux-logger": "^3.0.6",
         "source-map-explorer": "^2.5.3",
         "vite": "^7.3.1",
-        "vite-plugin-babel": "^1.5.1",
+        "vite-plugin-babel": "^1.4.1",
         "vite-plugin-eslint": "^1.8.1",
         "vite-plugin-node-polyfills": "^0.25.0",
         "vite-plugin-pwa": "^1.2.0",
@@ -151,17 +151,17 @@
       "license": "MIT"
     },
     "node_modules/@amplitude/analytics-browser": {
-      "version": "2.35.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.35.3.tgz",
-      "integrity": "sha512-JHUtoDX+iKlpcUDw4A4EEi39sIWXB2q5M9Xb/vNVwNGmIAkPa8XwUYcM22872dvc2aaYo7Y1HHljcj2ETzOCJw==",
+      "version": "2.34.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-browser/-/analytics-browser-2.34.0.tgz",
+      "integrity": "sha512-a5AeUBs6AbgfEPBNVP1/FM8+0ZBjIzbfYcVJq2Lkvb0EaeEI09vrl+zFeJSDcjg5nsDBmz7oKV8j2kbGJHbZ9w==",
       "license": "MIT",
       "dependencies": {
-        "@amplitude/analytics-core": "2.40.1",
-        "@amplitude/plugin-autocapture-browser": "1.22.2",
-        "@amplitude/plugin-network-capture-browser": "1.8.2",
-        "@amplitude/plugin-page-url-enrichment-browser": "0.6.2",
-        "@amplitude/plugin-page-view-tracking-browser": "2.7.2",
-        "@amplitude/plugin-web-vitals-browser": "1.1.13",
+        "@amplitude/analytics-core": "2.37.0",
+        "@amplitude/plugin-autocapture-browser": "1.19.0",
+        "@amplitude/plugin-network-capture-browser": "1.7.8",
+        "@amplitude/plugin-page-url-enrichment-browser": "0.5.14",
+        "@amplitude/plugin-page-view-tracking-browser": "2.6.11",
+        "@amplitude/plugin-web-vitals-browser": "1.1.9",
         "tslib": "^2.4.1"
       }
     },
@@ -172,64 +172,63 @@
       "license": "MIT"
     },
     "node_modules/@amplitude/analytics-core": {
-      "version": "2.40.1",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.40.1.tgz",
-      "integrity": "sha512-7nX+QDsx29rbuNkRyvsqqhgtIAs9qTaKq4svrKv2sR+D8vEPFGuWW2Shb4/S3J5N03n3HSGkkPWWUNuqqEtrog==",
+      "version": "2.37.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/analytics-core/-/analytics-core-2.37.0.tgz",
+      "integrity": "sha512-/2vIyquLMSA29MMM901d5DOhBZ5bc6Qf4s0KVfRk8Avn90mC7KlE5SQiHOAW8+63o5aT1NtB0djrY4cq8Y8Opw==",
       "license": "MIT",
       "dependencies": {
         "@amplitude/analytics-connector": "^1.6.4",
-        "safe-json-stringify": "1.2.0",
         "tslib": "^2.4.1",
         "zen-observable-ts": "^1.1.0"
       }
     },
     "node_modules/@amplitude/plugin-autocapture-browser": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-autocapture-browser/-/plugin-autocapture-browser-1.22.2.tgz",
-      "integrity": "sha512-FvFLsbLNdHYhhFWUYtHHj5LlVYldoDa4musJpqcftqBtWmcRXujrgJeuTU9bbF39JSOeJZrKIxzYaFqbMXgpYQ==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-autocapture-browser/-/plugin-autocapture-browser-1.19.0.tgz",
+      "integrity": "sha512-ga0TXxE87wNMgFvVUPE7a+HGMqMz9/Gy6C7ux3cgcuy8D7Z/Te5iMZmMadK/ztmQ3/pSZjYv9iDvOFsT6ywMZw==",
       "license": "MIT",
       "dependencies": {
-        "@amplitude/analytics-core": "2.40.1",
+        "@amplitude/analytics-core": "2.37.0",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/plugin-network-capture-browser": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-network-capture-browser/-/plugin-network-capture-browser-1.8.2.tgz",
-      "integrity": "sha512-+8OqmhZ5Gy3ldTIT9AWNHwby2YW0+0TSNhbXtlDEphluPPOpDqAAzt1WNgIh8piOHxXhalkF8VM9Ub2sdwZ9VQ==",
+      "version": "1.7.8",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-network-capture-browser/-/plugin-network-capture-browser-1.7.8.tgz",
+      "integrity": "sha512-SZj3m3O8yI040+Nto9uLi5eM0AclEi8hkZttLSKKVCJVIdi5xE1z9oC7lTir1h2b198unTqP2o7cmzEqI1wBoA==",
       "license": "MIT",
       "dependencies": {
-        "@amplitude/analytics-core": "2.40.1",
+        "@amplitude/analytics-core": "2.37.0",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/plugin-page-url-enrichment-browser": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-url-enrichment-browser/-/plugin-page-url-enrichment-browser-0.6.2.tgz",
-      "integrity": "sha512-E/QsgyHg/uOB6GloifGc/LA+iexWTWG6YGwnmD8RQUpdmk8V7Nl5MHJxl9dlC3H5N1tQ2gqJwv+RqRCqu6uW8Q==",
+      "version": "0.5.14",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-url-enrichment-browser/-/plugin-page-url-enrichment-browser-0.5.14.tgz",
+      "integrity": "sha512-vaAGxMgxQbsRKWtIKiMp3kVdg4RSsAzwlffDw7ifTw1yObVV2vVeBPb/O24cLf49NrhZ3ZuJlaxGmRxoY4FWow==",
       "license": "MIT",
       "dependencies": {
-        "@amplitude/analytics-core": "2.40.1",
+        "@amplitude/analytics-core": "2.37.0",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/plugin-page-view-tracking-browser": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.7.2.tgz",
-      "integrity": "sha512-3QIJqoV5jN8QfbUecaD0PQDJ21851+idpINAEqvDFp4fF2E/Ki4KlEFSvcuq3jx85ICqq82Efqh6JlAYj0jsSA==",
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-page-view-tracking-browser/-/plugin-page-view-tracking-browser-2.6.11.tgz",
+      "integrity": "sha512-/UqXipdOWOsmn8Uw1BibOfgLMvjE8YYYI8bXL2vZ6D2mk6c0FdGe17BmccsLr1LVGx3HObZoIGnxje+0X1j07w==",
       "license": "MIT",
       "dependencies": {
-        "@amplitude/analytics-core": "2.40.1",
+        "@amplitude/analytics-core": "2.37.0",
         "tslib": "^2.4.1"
       }
     },
     "node_modules/@amplitude/plugin-web-vitals-browser": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-vitals-browser/-/plugin-web-vitals-browser-1.1.13.tgz",
-      "integrity": "sha512-cNCUyJCXUjq8qNV1uzTyAbX/pKHSrfQ00n+FqNCcUgmizsjBPZh+RQzAKA227DvM6GG3LJ+ze173Fx8SB5u2gg==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@amplitude/plugin-web-vitals-browser/-/plugin-web-vitals-browser-1.1.9.tgz",
+      "integrity": "sha512-hVGsJWtJQpHlpfC+IubCixe7KNmqaDkWO0XkwkLkn4T/FjFgK+rp9edBJr5KSi0enfcN+49DxJ4qQKu7NncIMA==",
       "license": "MIT",
       "dependencies": {
-        "@amplitude/analytics-core": "2.40.1",
+        "@amplitude/analytics-core": "2.37.0",
         "tslib": "^2.4.1",
         "web-vitals": "5.1.0"
       }
@@ -263,12 +262,12 @@
       }
     },
     "node_modules/@ant-design/cssinjs-utils": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@ant-design/cssinjs-utils/-/cssinjs-utils-2.1.1.tgz",
-      "integrity": "sha512-RKxkj5pGFB+FkPJ5NGhoX3DK3xsv0pMltha7Ei1AnY3tILeq38L7tuhaWDPQI/5nlPxOog44wvqpNyyGcUsNMg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@ant-design/cssinjs-utils/-/cssinjs-utils-2.0.2.tgz",
+      "integrity": "sha512-Mq3Hm6fJuQeFNKSp3+yT4bjuhVbdrsyXE2RyfpJFL0xiYNZdaJ6oFaE3zFrzmHbmvTd2Wp3HCbRtkD4fU+v2ZA==",
       "license": "MIT",
       "dependencies": {
-        "@ant-design/cssinjs": "^2.1.0",
+        "@ant-design/cssinjs": "^2.0.1",
         "@babel/runtime": "^7.23.2",
         "@rc-component/util": "^1.4.0"
       },
@@ -278,9 +277,9 @@
       }
     },
     "node_modules/@ant-design/cssinjs-utils/node_modules/@ant-design/cssinjs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@ant-design/cssinjs/-/cssinjs-2.1.0.tgz",
-      "integrity": "sha512-eZFrPCnrYrF3XtL7qA4L75P0qA3TtZta8H3Yggy7UYFh8gZgu5bSMNF+v4UVCzGxzYmx8ZvPdgOce0BJ6PsW9g==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@ant-design/cssinjs/-/cssinjs-2.0.3.tgz",
+      "integrity": "sha512-HAo8SZ3a6G8v6jT0suCz1270na6EA3obeJWM4uzRijBhdwdoMAXWK2f4WWkwB28yUufsfk3CAhN1coGPQq4kNQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.1",
@@ -544,9 +543,9 @@
       }
     },
     "node_modules/@apollo/client": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/@apollo/client/-/client-4.1.6.tgz",
-      "integrity": "sha512-ak8uzqmKeX3u9BziGf83RRyODAJKFkPG72hTNvEj4WjMWFmuKW2gGN1i3OfajKT6yuGjvo+n23ES2zqWDKFCZg==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@apollo/client/-/client-4.1.3.tgz",
+      "integrity": "sha512-2D0eN9R0IHj9qp1RwjM1/brKqcBGldlDfY0YiP5ecCj9FtVrhOtXqMj98SZ1CA0YGDY5X+dxx32Ljh7J0VHTfA==",
       "license": "MIT",
       "workspaces": [
         "dist",
@@ -586,23 +585,23 @@
       }
     },
     "node_modules/@asamuzakjp/css-color": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.2.tgz",
-      "integrity": "sha512-NfBUvBaYgKIuq6E/RBLY1m0IohzNHAYyaJGuTK79Z23uNwmz2jl1mPsC5ZxCCxylinKhT1Amn5oNTlx1wN8cQg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.1.tgz",
+      "integrity": "sha512-B0Hv6G3gWGMn0xKJ0txEi/jM5iFpT3MfDxmhZFb4W047GvytCf1DHQ1D69W3zHI4yWe2aTZAA0JnbMZ7Xc8DuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@csstools/css-calc": "^3.0.0",
-        "@csstools/css-color-parser": "^4.0.1",
-        "@csstools/css-parser-algorithms": "^4.0.0",
-        "@csstools/css-tokenizer": "^4.0.0",
-        "lru-cache": "^11.2.5"
+        "@csstools/css-calc": "^2.1.4",
+        "@csstools/css-color-parser": "^3.1.0",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "lru-cache": "^11.2.4"
       }
     },
     "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
-      "version": "11.2.6",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
-      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
+      "version": "11.2.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.5.tgz",
+      "integrity": "sha512-vFrFJkWtJvJnD5hg+hJvVE8Lh/TcMzKnTgCWmtBipwI5yLX/iX+5UB2tfuyODF5E7k9xEzMdYgGqaSb1c0c5Yw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -610,9 +609,9 @@
       }
     },
     "node_modules/@asamuzakjp/dom-selector": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.8.1.tgz",
-      "integrity": "sha512-MvRz1nCqW0fsy8Qz4dnLIvhOlMzqDVBabZx6lH+YywFDdjXhMY37SmpV1XFX3JzG5GWHn63j6HX6QPr3lZXHvQ==",
+      "version": "6.7.6",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.7.6.tgz",
+      "integrity": "sha512-hBaJER6A9MpdG3WgdlOolHmbOYvSk46y7IQN/1+iqiCuUu6iWdQrs9DGKF8ocqsEqWujWf/V7b7vaDgiUmIvUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -620,13 +619,13 @@
         "bidi-js": "^1.0.3",
         "css-tree": "^3.1.0",
         "is-potential-custom-element-name": "^1.0.1",
-        "lru-cache": "^11.2.6"
+        "lru-cache": "^11.2.4"
       }
     },
     "node_modules/@asamuzakjp/dom-selector/node_modules/lru-cache": {
-      "version": "11.2.6",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
-      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
+      "version": "11.2.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.5.tgz",
+      "integrity": "sha512-vFrFJkWtJvJnD5hg+hJvVE8Lh/TcMzKnTgCWmtBipwI5yLX/iX+5UB2tfuyODF5E7k9xEzMdYgGqaSb1c0c5Yw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -641,9 +640,9 @@
       "license": "MIT"
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
-      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.28.6.tgz",
+      "integrity": "sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.28.5",
@@ -664,20 +663,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
-      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.6.tgz",
+      "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.29.0",
-        "@babel/generator": "^7.29.0",
+        "@babel/code-frame": "^7.28.6",
+        "@babel/generator": "^7.28.6",
         "@babel/helper-compilation-targets": "^7.28.6",
         "@babel/helper-module-transforms": "^7.28.6",
         "@babel/helpers": "^7.28.6",
-        "@babel/parser": "^7.29.0",
+        "@babel/parser": "^7.28.6",
         "@babel/template": "^7.28.6",
-        "@babel/traverse": "^7.29.0",
-        "@babel/types": "^7.29.0",
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6",
         "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -700,13 +699,13 @@
       "license": "MIT"
     },
     "node_modules/@babel/generator": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.0.tgz",
-      "integrity": "sha512-vSH118/wwM/pLR38g/Sgk05sNtro6TlTJKuiMXDaZqPUfjTFcudpCOt00IhOfj+1BFAX+UFAlzCU+6WXr3GLFQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.6.tgz",
+      "integrity": "sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.29.0",
-        "@babel/types": "^7.29.0",
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -983,12 +982,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
-      "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.6.tgz",
+      "integrity": "sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.29.0"
+        "@babel/types": "^7.28.6"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -2315,17 +2314,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
-      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.6.tgz",
+      "integrity": "sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.29.0",
-        "@babel/generator": "^7.29.0",
+        "@babel/code-frame": "^7.28.6",
+        "@babel/generator": "^7.28.6",
         "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.29.0",
+        "@babel/parser": "^7.28.6",
         "@babel/template": "^7.28.6",
-        "@babel/types": "^7.29.0",
+        "@babel/types": "^7.28.6",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -2333,9 +2332,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
-      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.6.tgz",
+      "integrity": "sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -2345,19 +2344,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@bramus/specificity": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@bramus/specificity/-/specificity-2.4.2.tgz",
-      "integrity": "sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "css-tree": "^3.0.0"
-      },
-      "bin": {
-        "specificity": "bin/cli.js"
-      }
-    },
     "node_modules/@commander-js/extra-typings": {
       "version": "13.1.0",
       "resolved": "https://registry.npmjs.org/@commander-js/extra-typings/-/extra-typings-13.1.0.tgz",
@@ -2368,9 +2354,9 @@
       }
     },
     "node_modules/@csstools/color-helpers": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.0.1.tgz",
-      "integrity": "sha512-NmXRccUJMk2AWA5A7e5a//3bCIMyOu2hAtdRYrhPPHjDxINuCwX1w6rnIZ4xjLcp0ayv6h8Pc3X0eJUGiAAXHQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
+      "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
       "dev": true,
       "funding": [
         {
@@ -2384,13 +2370,13 @@
       ],
       "license": "MIT-0",
       "engines": {
-        "node": ">=20.19.0"
+        "node": ">=18"
       }
     },
     "node_modules/@csstools/css-calc": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.1.1.tgz",
-      "integrity": "sha512-HJ26Z/vmsZQqs/o3a6bgKslXGFAungXGbinULZO3eMsOyNJHeBBZfup5FiZInOghgoM4Hwnmw+OgbJCNg1wwUQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
+      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
       "dev": true,
       "funding": [
         {
@@ -2404,17 +2390,17 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=20.19.0"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^4.0.0",
-        "@csstools/css-tokenizer": "^4.0.0"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.0.1.tgz",
-      "integrity": "sha512-vYwO15eRBEkeF6xjAno/KQ61HacNhfQuuU/eGwH67DplL0zD5ZixUa563phQvUelA07yDczIXdtmYojCphKJcw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
+      "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
       "dev": true,
       "funding": [
         {
@@ -2428,21 +2414,21 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/color-helpers": "^6.0.1",
-        "@csstools/css-calc": "^3.0.0"
+        "@csstools/color-helpers": "^5.1.0",
+        "@csstools/css-calc": "^2.1.4"
       },
       "engines": {
-        "node": ">=20.19.0"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^4.0.0",
-        "@csstools/css-tokenizer": "^4.0.0"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.0.tgz",
-      "integrity": "sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
       "dev": true,
       "funding": [
         {
@@ -2456,16 +2442,16 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=20.19.0"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^4.0.0"
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-syntax-patches-for-csstree": {
-      "version": "1.0.27",
-      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.27.tgz",
-      "integrity": "sha512-sxP33Jwg1bviSUXAV43cVYdmjt2TLnLXNqCWl9xmxHawWVjGz/kEbdkr7F9pxJNBN2Mh+dq0crgItbW6tQvyow==",
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.25.tgz",
+      "integrity": "sha512-g0Kw9W3vjx5BEBAF8c5Fm2NcB/Fs8jJXh85aXqwEXiL+tqtOut07TWgyaGzAAfTM+gKckrrncyeGEZPcaRgm2Q==",
       "dev": true,
       "funding": [
         {
@@ -2477,12 +2463,15 @@
           "url": "https://opencollective.com/csstools"
         }
       ],
-      "license": "MIT-0"
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.0.tgz",
-      "integrity": "sha512-QxULHAm7cNu72w97JUNCBFODFaXpbDg+dP8b/oWFAZ2MTRppA3U00Y2L1HqaS4J6yBqxwa/Y3nMBaxVKbB/NsA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
       "dev": true,
       "funding": [
         {
@@ -2496,7 +2485,7 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=20.19.0"
+        "node": ">=18"
       }
     },
     "node_modules/@ctrl/tinycolor": {
@@ -3255,9 +3244,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.12.2",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
-      "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3306,9 +3295,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz",
-      "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3318,7 +3307,7 @@
         "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.1",
+        "js-yaml": "^4.1.0",
         "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
@@ -3400,19 +3389,19 @@
       }
     },
     "node_modules/@exodus/bytes": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.11.0.tgz",
-      "integrity": "sha512-wO3vd8nsEHdumsXrjGO/v4p6irbg7hy9kvIeR6i2AwylZSk4HJdWgL0FNaVquW1+AweJcdvU1IEpuIWk/WaPnA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.8.0.tgz",
+      "integrity": "sha512-8JPn18Bcp8Uo1T82gR8lh2guEOa5KKU/IEKvvdp0sgmi7coPBWf1Doi1EXsGZb2ehc8ym/StJCjffYV+ne7sXQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       },
       "peerDependencies": {
-        "@noble/hashes": "^1.8.0 || ^2.0.0"
+        "@exodus/crypto": "^1.0.0-rc.4"
       },
       "peerDependenciesMeta": {
-        "@noble/hashes": {
+        "@exodus/crypto": {
           "optional": true
         }
       }
@@ -3440,9 +3429,9 @@
       }
     },
     "node_modules/@firebase/app": {
-      "version": "0.14.8",
-      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.14.8.tgz",
-      "integrity": "sha512-WiE9uCGRLUnShdjb9iP20sA3ToWrBbNXr14/N5mow7Nls9dmKgfGaGX5cynLvrltxq2OrDLh1VDNaUgsnS/k/g==",
+      "version": "0.14.7",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.14.7.tgz",
+      "integrity": "sha512-o3ZfnOx0AWBD5n/36p2zPoB0rDDxQP8H/A60zDLvvfRLtW8b3LfCyV97GKpJaAVV1JMMl/BC89EDzMyzxFZxTw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@firebase/component": "0.7.0",
@@ -3493,9 +3482,9 @@
       }
     },
     "node_modules/@firebase/firestore": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.11.0.tgz",
-      "integrity": "sha512-Zb88s8rssBd0J2Tt+NUXMPt2sf+Dq7meatKiJf5t9oto1kZ8w9gK59Koe1uPVbaKfdgBp++N/z0I4G/HamyEhg==",
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.10.0.tgz",
+      "integrity": "sha512-fgF6EbpoagGWh5Vwfu/7/jYgBFwUCwTlPNVF/aSjHcoEDRXpRsIqVfAFTp1LD+dWAUcAKEK3h+osk8spMJXtxA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@firebase/component": "0.7.0",
@@ -3714,9 +3703,9 @@
       }
     },
     "node_modules/@isaacs/brace-expansion": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz",
-      "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4826,13 +4815,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz",
-      "integrity": "sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==",
+      "version": "1.58.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.0.tgz",
+      "integrity": "sha512-fWza+Lpbj6SkQKCrU6si4iu+fD2dD3gxNHFhUPxsfXBPhnv3rRSQVd0NtBUT9Z/RhF/boCBcuUaMUSTRTopjZg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.58.2"
+        "playwright": "1.58.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -4852,18 +4841,18 @@
       }
     },
     "node_modules/@posthog/core": {
-      "version": "1.23.1",
-      "resolved": "https://registry.npmjs.org/@posthog/core/-/core-1.23.1.tgz",
-      "integrity": "sha512-GViD5mOv/mcbZcyzz3z9CS0R79JzxVaqEz4sP5Dsea178M/j3ZWe6gaHDZB9yuyGfcmIMQ/8K14yv+7QrK4sQQ==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@posthog/core/-/core-1.17.0.tgz",
+      "integrity": "sha512-8pDNL+/u9ojzXloA5wILVDXBCV5daJ7w2ipCALQlEEZmL752cCKhRpbyiHn3tjKXh3Hy6aOboJneYa1JdlVHrQ==",
       "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.6"
       }
     },
     "node_modules/@posthog/types": {
-      "version": "1.355.0",
-      "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.355.0.tgz",
-      "integrity": "sha512-g9YNcIzSe+BJFKjuea7Hr0DiN83XlmqBXRpIyEJ7t9jVAK2Srf67Y2rI0ZjeNXe2LasOyOvoy7RgnSPBXbNZGw==",
+      "version": "1.336.4",
+      "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.336.4.tgz",
+      "integrity": "sha512-BY3cq/8segbXEvHbEXx9SWmaKJEM0AGgsOgMFH2yy13AV+rUHsGcp4Z5LDI5pU25DURN9EAZvzcoVyYy/Iokmw==",
       "license": "MIT"
     },
     "node_modules/@protobufjs/aspromise": {
@@ -4943,13 +4932,13 @@
       }
     },
     "node_modules/@rc-component/cascader": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/@rc-component/cascader/-/cascader-1.14.0.tgz",
-      "integrity": "sha512-Ip9356xwZUR2nbW5PRVGif4B/bDve4pLa/N+PGbvBaTnjbvmN4PFMBGQSmlDlzKP1ovxaYMvwF/dI9lXNLT4iQ==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/cascader/-/cascader-1.11.0.tgz",
+      "integrity": "sha512-VDiEsskThWi8l0/1Nquc9I4ytcMKQYAb9Jkm6wiX5O5fpcMRsm+b8OulBMbr/b4rFTl/2y2y4GdKqQ+2whD+XQ==",
       "license": "MIT",
       "dependencies": {
-        "@rc-component/select": "~1.6.0",
-        "@rc-component/tree": "~1.2.0",
+        "@rc-component/select": "~1.5.0",
+        "@rc-component/tree": "~1.1.0",
         "@rc-component/util": "^1.4.0",
         "clsx": "^2.1.1"
       },
@@ -4968,9 +4957,9 @@
       }
     },
     "node_modules/@rc-component/checkbox": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@rc-component/checkbox/-/checkbox-2.0.0.tgz",
-      "integrity": "sha512-3CXGPpAR9gsPKeO2N78HAPOzU30UdemD6HGJoWVJOpa6WleaGB5kzZj3v6bdTZab31YuWgY/RxV3VKPctn0DwQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@rc-component/checkbox/-/checkbox-1.0.1.tgz",
+      "integrity": "sha512-08yTH8m+bSm8TOqbybbJ9KiAuIATti6bDs2mVeSfu4QfEnyeF6X0enHVvD1NEAyuBWEAo56QtLe++MYs2D9XiQ==",
       "license": "MIT",
       "dependencies": {
         "@rc-component/util": "^1.3.0",
@@ -5016,9 +5005,9 @@
       }
     },
     "node_modules/@rc-component/color-picker": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@rc-component/color-picker/-/color-picker-3.1.0.tgz",
-      "integrity": "sha512-o7Vavj7yyfVxFmeynXf0fCHVlC0UTE9al74c6nYuLck+gjuVdQNWSVXR8Efq/mmWFy7891SCOsfaPq6Eqe1s/g==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@rc-component/color-picker/-/color-picker-3.0.3.tgz",
+      "integrity": "sha512-V7gFF9O7o5XwIWafdbOtqI4BUUkEUkgdBwp6favy3xajMX/2dDqytFaiXlcwrpq6aRyPLp5dKLAG5RFKLXMeGA==",
       "license": "MIT",
       "dependencies": {
         "@ant-design/fast-color": "^3.0.0",
@@ -5053,14 +5042,14 @@
       }
     },
     "node_modules/@rc-component/dialog": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/@rc-component/dialog/-/dialog-1.8.4.tgz",
-      "integrity": "sha512-Ay6PM7phkTkquplG8fWfUGFZ2GTLx9diTl4f0d8Eqxd7W1u1KjE9AQooFQHOHnhZf0Ya3z51+5EKCWHmt/dNEw==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/dialog/-/dialog-1.8.0.tgz",
+      "integrity": "sha512-zGksezfULKixYCIWctIhUC2M3zUJrc81JKWbi9dJrQdPaM7J+8vSOrhLoOHHkZFpBpb2Ri6JqnSuGYb2N+FrRA==",
       "license": "MIT",
       "dependencies": {
         "@rc-component/motion": "^1.1.3",
         "@rc-component/portal": "^2.1.0",
-        "@rc-component/util": "^1.9.0",
+        "@rc-component/util": "^1.5.0",
         "clsx": "^2.1.1"
       },
       "peerDependencies": {
@@ -5078,14 +5067,14 @@
       }
     },
     "node_modules/@rc-component/drawer": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@rc-component/drawer/-/drawer-1.4.2.tgz",
-      "integrity": "sha512-1ib+fZEp6FBu+YvcIktm+nCQ+Q+qIpwpoaJH6opGr4ofh2QMq+qdr5DLC4oCf5qf3pcWX9lUWPYX652k4ini8Q==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/drawer/-/drawer-1.4.0.tgz",
+      "integrity": "sha512-Zr1j1LRLDauz4a5JXHEmeYQfvEzfh4CddNa7tszyJnfd5GySYdZ5qLO63Tt2tgG4k+qi6tkFDKmcT46ikZfzbQ==",
       "license": "MIT",
       "dependencies": {
         "@rc-component/motion": "^1.1.4",
         "@rc-component/portal": "^2.1.3",
-        "@rc-component/util": "^1.9.0",
+        "@rc-component/util": "^1.2.1",
         "clsx": "^2.1.1"
       },
       "peerDependencies": {
@@ -5291,9 +5280,9 @@
       }
     },
     "node_modules/@rc-component/motion": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@rc-component/motion/-/motion-1.3.1.tgz",
-      "integrity": "sha512-Wo1mkd0tCcHtvYvpPOmlYJz546z16qlsiwaygmW7NPJpOZOF9GBjhGzdzZSsC2lEJ1IUkWLF4gMHlRA1aSA+Yw==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@rc-component/motion/-/motion-1.1.6.tgz",
+      "integrity": "sha512-aEQobs/YA0kqRvHIPjQvOytdtdRVyhf/uXAal4chBjxDu6odHckExJzjn2D+Ju1aKK6hx3pAs6BXdV9+86xkgQ==",
       "license": "MIT",
       "dependencies": {
         "@rc-component/util": "^1.2.0",
@@ -5581,9 +5570,9 @@
       }
     },
     "node_modules/@rc-component/select": {
-      "version": "1.6.12",
-      "resolved": "https://registry.npmjs.org/@rc-component/select/-/select-1.6.12.tgz",
-      "integrity": "sha512-jYXAglYdOb54BrpWAcjjhdBP16NyCv/HbEaWFMbEHZQAJVmGHPAtmBqbFuPPuvInAVsIwLbCj4Agag9udOamiQ==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@rc-component/select/-/select-1.5.1.tgz",
+      "integrity": "sha512-ARXtwfCVnpDJj1bQjh1cimUlNQkZiN72hvtL2G4mKXIYfkokYdA2Vyu2deAfY7kuHSWpmZygVuohQt6TxOYjnA==",
       "license": "MIT",
       "dependencies": {
         "@rc-component/overflow": "^1.0.0",
@@ -5821,13 +5810,13 @@
       }
     },
     "node_modules/@rc-component/tree": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@rc-component/tree/-/tree-1.2.3.tgz",
-      "integrity": "sha512-mG8hF2ogQcKaEpfyxzPvMWqqkptofd7Sf+YiXOpPzuXLTLwNKfLDJtysc1/oybopbnzxNqWh2Vgwi+GYwNIb7w==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/tree/-/tree-1.1.0.tgz",
+      "integrity": "sha512-HZs3aOlvFgQdgrmURRc/f4IujiNBf4DdEeXUlkS0lPoLlx9RoqsZcF0caXIAMVb+NaWqKtGQDnrH8hqLCN5zlA==",
       "license": "MIT",
       "dependencies": {
         "@rc-component/motion": "^1.0.0",
-        "@rc-component/util": "^1.8.1",
+        "@rc-component/util": "^1.2.1",
         "@rc-component/virtual-list": "^1.0.1",
         "clsx": "^2.1.1"
       },
@@ -5840,13 +5829,13 @@
       }
     },
     "node_modules/@rc-component/tree-select": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@rc-component/tree-select/-/tree-select-1.8.0.tgz",
-      "integrity": "sha512-iYsPq3nuLYvGqdvFAW+l+I9ASRIOVbMXyA8FGZg2lGym/GwkaWeJGzI4eJ7c9IOEhRj0oyfIN4S92Fl3J05mjQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/tree-select/-/tree-select-1.6.0.tgz",
+      "integrity": "sha512-UvEGmZT+gcVvRwImAZg3/sXw9nUdn4FmCs1rSIMWjEXEIAo0dTGmIyWuLCvs+1rGe9AZ7CHMPiQUEbdadwV0fw==",
       "license": "MIT",
       "dependencies": {
-        "@rc-component/select": "~1.6.0",
-        "@rc-component/tree": "~1.2.0",
+        "@rc-component/select": "~1.5.0",
+        "@rc-component/tree": "~1.1.0",
         "@rc-component/util": "^1.4.0",
         "clsx": "^2.1.1"
       },
@@ -5926,9 +5915,9 @@
       }
     },
     "node_modules/@rc-component/util": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@rc-component/util/-/util-1.9.0.tgz",
-      "integrity": "sha512-5uW6AfhIigCWeEQDthTozlxiT4Prn6xYQWeO0xokjcaa186OtwPRHBZJ2o0T0FhbjGhZ3vXdbkv0sx3gAYW7Vg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@rc-component/util/-/util-1.7.0.tgz",
+      "integrity": "sha512-tIvIGj4Vl6fsZFvWSkYw9sAfiCKUXMyhVz6kpKyZbwyZyRPqv2vxYZROdaO1VB4gqTNvUZFXh6i3APUiterw5g==",
       "license": "MIT",
       "dependencies": {
         "is-mobile": "^5.0.0",
@@ -6062,9 +6051,9 @@
       }
     },
     "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-rc.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.3.tgz",
-      "integrity": "sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==",
+      "version": "1.0.0-beta.53",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.53.tgz",
+      "integrity": "sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -6700,88 +6689,88 @@
       ]
     },
     "node_modules/@sentry-internal/browser-utils": {
-      "version": "10.40.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.40.0.tgz",
-      "integrity": "sha512-3CDeVNBXYOIvBVdT0SOdMZx5LzYDLuhGK/z7A14sYZz4Cd2+f4mSeFDaEOoH/g2SaY2CKR5KGkAADy8IyjZ21w==",
+      "version": "10.38.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.38.0.tgz",
+      "integrity": "sha512-UOJtYmdcxHCcV0NPfXFff/a95iXl/E0EhuQ1y0uE0BuZDMupWSF5t2BgC4HaE5Aw3RTjDF3XkSHWoIF6ohy7eA==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/core": "10.40.0"
+        "@sentry/core": "10.38.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/feedback": {
-      "version": "10.40.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.40.0.tgz",
-      "integrity": "sha512-V/ixkcdCNMo04KgsCEeNEu966xUUTD6czKT2LOAO5siZACqFjT/Rp9VR1n7QQrVo3sL7P3QNiTHtX0jaeWbwzg==",
+      "version": "10.38.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.38.0.tgz",
+      "integrity": "sha512-JXneg9zRftyfy1Fyfc39bBlF/Qd8g4UDublFFkVvdc1S6JQPlK+P6q22DKz3Pc8w3ySby+xlIq/eTu9Pzqi4KA==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/core": "10.40.0"
+        "@sentry/core": "10.38.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/replay": {
-      "version": "10.40.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.40.0.tgz",
-      "integrity": "sha512-vsH2Ut0KIIQIHNdS3zzEGLJ2C9btbpvJIWAVk7l7oft66JzlUNC89qNaQ5SAypjLQx4Ln2V/ZTqfEoNzXOAsoQ==",
+      "version": "10.38.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.38.0.tgz",
+      "integrity": "sha512-YWIkL6/dnaiQyFiZXJ/nN+NXGv/15z45ia86bE/TMq01CubX/DUOilgsFz0pk2v/pg3tp/U2MskLO9Hz0cnqeg==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/browser-utils": "10.40.0",
-        "@sentry/core": "10.40.0"
+        "@sentry-internal/browser-utils": "10.38.0",
+        "@sentry/core": "10.38.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry-internal/replay-canvas": {
-      "version": "10.40.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.40.0.tgz",
-      "integrity": "sha512-wzQwilFHO2baeCt0dTMf0eW+rgK8O+mkisf9sQzPXzG3Krr/iVtFg1T5T1Th3YsCsEdn6yQ3hcBPLEXjMSvccg==",
+      "version": "10.38.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.38.0.tgz",
+      "integrity": "sha512-OXWM9jEqNYh4VTvrMu7v+z1anz+QKQ/fZXIZdsO7JTT2lGNZe58UUMeoq386M+Saxen8F9SUH7yTORy/8KI5qw==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/replay": "10.40.0",
-        "@sentry/core": "10.40.0"
+        "@sentry-internal/replay": "10.38.0",
+        "@sentry/core": "10.38.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry/babel-plugin-component-annotate": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.9.1.tgz",
-      "integrity": "sha512-0gEoi2Lb54MFYPOmdTfxlNKxI7kCOvNV7gP8lxMXJ7nCazF5OqOOZIVshfWjDLrc0QrSV6XdVvwPV9GDn4wBMg==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.8.0.tgz",
+      "integrity": "sha512-cy/9Eipkv23MsEJ4IuB4dNlVwS9UqOzI3Eu+QPake5BVFgPYCX0uP0Tr3Z43Ime6Rb+BiDnWC51AJK9i9afHYw==",
       "license": "MIT",
       "engines": {
         "node": ">= 14"
       }
     },
     "node_modules/@sentry/browser": {
-      "version": "10.40.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.40.0.tgz",
-      "integrity": "sha512-nCt3FKUMFad0C6xl5wCK0Jz+qT4Vev4fv6HJRn0YoNRRDQCfsUVxAz7pNyyiPNGM/WCDp9wJpGJsRvbBRd2anw==",
+      "version": "10.38.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.38.0.tgz",
+      "integrity": "sha512-3phzp1YX4wcQr9mocGWKbjv0jwtuoDBv7+Y6Yfrys/kwyaL84mDLjjQhRf4gL5SX7JdYkhBp4WaiNlR0UC4kTA==",
       "license": "MIT",
       "dependencies": {
-        "@sentry-internal/browser-utils": "10.40.0",
-        "@sentry-internal/feedback": "10.40.0",
-        "@sentry-internal/replay": "10.40.0",
-        "@sentry-internal/replay-canvas": "10.40.0",
-        "@sentry/core": "10.40.0"
+        "@sentry-internal/browser-utils": "10.38.0",
+        "@sentry-internal/feedback": "10.38.0",
+        "@sentry-internal/replay": "10.38.0",
+        "@sentry-internal/replay-canvas": "10.38.0",
+        "@sentry/core": "10.38.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry/bundler-plugin-core": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-4.9.1.tgz",
-      "integrity": "sha512-moii+w7N8k8WdvkX7qCDY9iRBlhgHlhTHTUQwF2FNMhBHuqlNpVcSJJqJMjFUQcjYMBDrZgxhfKV18bt5ixwlQ==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-4.8.0.tgz",
+      "integrity": "sha512-QaXd/NzaZ2vmiA2FNu2nBkgQU+17N3fE+zVOTzG0YK54QDSJMd4n3AeJIEyPhSzkOob+GqtO22nbYf6AATFMAw==",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.18.5",
-        "@sentry/babel-plugin-component-annotate": "4.9.1",
+        "@sentry/babel-plugin-component-annotate": "4.8.0",
         "@sentry/cli": "^2.57.0",
         "dotenv": "^16.3.1",
         "find-up": "^5.0.0",
@@ -6992,9 +6981,9 @@
       }
     },
     "node_modules/@sentry/cli": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-3.2.2.tgz",
-      "integrity": "sha512-qmjsm9+Bq/3QGTnIfOsJdhq+8LI3imxAPbGNBpRj4R0YFk+b1ry9huRHCLgkMcRFWtPkJmGZwEq2Z7e+02QPLA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-3.1.0.tgz",
+      "integrity": "sha512-ngnx6E8XjXpg1uzma45INfKCS8yurb/fl3cZdXTCa2wmek8b4N6WIlmOlTKFTBrV54OauF6mloJxAlpuzoQR6g==",
       "hasInstallScript": true,
       "license": "FSL-1.1-MIT",
       "dependencies": {
@@ -7010,20 +6999,20 @@
         "node": ">= 18"
       },
       "optionalDependencies": {
-        "@sentry/cli-darwin": "3.2.2",
-        "@sentry/cli-linux-arm": "3.2.2",
-        "@sentry/cli-linux-arm64": "3.2.2",
-        "@sentry/cli-linux-i686": "3.2.2",
-        "@sentry/cli-linux-x64": "3.2.2",
-        "@sentry/cli-win32-arm64": "3.2.2",
-        "@sentry/cli-win32-i686": "3.2.2",
-        "@sentry/cli-win32-x64": "3.2.2"
+        "@sentry/cli-darwin": "3.1.0",
+        "@sentry/cli-linux-arm": "3.1.0",
+        "@sentry/cli-linux-arm64": "3.1.0",
+        "@sentry/cli-linux-i686": "3.1.0",
+        "@sentry/cli-linux-x64": "3.1.0",
+        "@sentry/cli-win32-arm64": "3.1.0",
+        "@sentry/cli-win32-i686": "3.1.0",
+        "@sentry/cli-win32-x64": "3.1.0"
       }
     },
     "node_modules/@sentry/cli-darwin": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-3.2.2.tgz",
-      "integrity": "sha512-y1uglMBbo9dYqC92hTQBkuGk7SegLPo1cVwJzX0dhplJoBMuanLMhOMYd1J20qhkDdBhguflCHGf0tOzNTGWhg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-3.1.0.tgz",
+      "integrity": "sha512-xT1WlCHenGGO29Lq/wKaIthdqZzNzZhlPs7dXrzlBx9DyA2Jnl0g7WEau0oWi8GyJGVRXCJMiCydR//Tb5qVwA==",
       "license": "FSL-1.1-MIT",
       "optional": true,
       "os": [
@@ -7034,9 +7023,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-arm": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-3.2.2.tgz",
-      "integrity": "sha512-CC7N3hjOgs3cwrW0T9hqirFVUpKO6ASjdd0JT4DQHaAn34pruv8J+OoSnj1jkrT2DHxDkNNZPOFSK05AnHr8wA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-3.1.0.tgz",
+      "integrity": "sha512-kbP3/8/Ct/Jbm569KDXbFIyMyPypIegObvIT7LdSsfdYSZdBd396GV7vUpSGKiLUVVN0xjn8OqQ48AVGfjmuMg==",
       "cpu": [
         "arm"
       ],
@@ -7052,9 +7041,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-arm64": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-3.2.2.tgz",
-      "integrity": "sha512-SIGJknEQNDw9S/8QPTl8QLVe2IEiTKH3NeeHQ/Q2XWXig1ZebJfm4iTrdu47ypszIfxHeLvQkkVrr8mRKq16xA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-3.1.0.tgz",
+      "integrity": "sha512-Jm/iHLKiHxrZYlAq2tT07amiegEVCOAQT9Unilr6djjcZzS2tcI9ThSRQvjP9tFpFRKop+NyNGE3XHXf69r00g==",
       "cpu": [
         "arm64"
       ],
@@ -7070,9 +7059,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-i686": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-3.2.2.tgz",
-      "integrity": "sha512-W2hQ2DvIlZI05j2JN/87lfeo51F24zmQOJU6Uz+fZz/mkSvpnjeWxjAvfDNVGlLxp7XSoDbhHfrLBxdIh6jMeg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-3.1.0.tgz",
+      "integrity": "sha512-f/PK/EGK5vFOy7LC4Riwb+BEE20Nk7RbEFEMjvRq26DpETCrZYUGlbpIKvJFKOaUmr79aAkFCA/EjJiYfcQP2Q==",
       "cpu": [
         "x86",
         "ia32"
@@ -7089,9 +7078,9 @@
       }
     },
     "node_modules/@sentry/cli-linux-x64": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-3.2.2.tgz",
-      "integrity": "sha512-4mh3yvOUxO63lq3teexRvalD1mWaRVjpgL2cCMKA2wkB69lcL5nK2gkdzDUKx2y/elluVdvGPPZaqOr1bfNI0w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-3.1.0.tgz",
+      "integrity": "sha512-T+v8x1ujhixZrOrH0sVhsW6uLwK4n0WS+B+5xV46WqUKe32cbYotursp2y53ROjgat8SQDGeP/VnC0Qa3Y2fEA==",
       "cpu": [
         "x64"
       ],
@@ -7107,9 +7096,9 @@
       }
     },
     "node_modules/@sentry/cli-win32-arm64": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-arm64/-/cli-win32-arm64-3.2.2.tgz",
-      "integrity": "sha512-TQgfkdJgd8Y/lPzDibqc5Hamg8Hl5rN1sZwX80n4r9Ly46Yzu8Bv6KUhoNL/ktAvw9Aeko6Bx54rwZnzxFZHwg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-arm64/-/cli-win32-arm64-3.1.0.tgz",
+      "integrity": "sha512-2DIPq6aW2DC34EDC9J0xwD+9BpFnKdFGdIcQUZMS+5pXlU6V7o8wpZxZAM8TdYNmsPkkQGKp7Dhl/arWpvNgrw==",
       "cpu": [
         "arm64"
       ],
@@ -7123,9 +7112,9 @@
       }
     },
     "node_modules/@sentry/cli-win32-i686": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-3.2.2.tgz",
-      "integrity": "sha512-vAcnq0SdYuvwIdREgF5APocjW3d9Z17xLwugpaAz8wpOjCeC1iMEFWqbz5k49i4iDkDVNFRMENiVvWVSu1kEnA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-3.1.0.tgz",
+      "integrity": "sha512-2NuywEiiZn6xJ1yAV2xjv/nuHiy6kZU5XR3RSAIrPdEZD1nBoMsH/gB2FufQw58Ziz/7otFcX+vtGpJjbIT5mQ==",
       "cpu": [
         "x86",
         "ia32"
@@ -7140,9 +7129,9 @@
       }
     },
     "node_modules/@sentry/cli-win32-x64": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-3.2.2.tgz",
-      "integrity": "sha512-xWPTXjSSdmoyG/0ee7A9KSfsScGHCdaXMP6ASt4bMx3yYJO7ziEoZzfJE2M6oglz+woAm0LV9+O/n7g80tixlQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-3.1.0.tgz",
+      "integrity": "sha512-Ip405Yqdrr+l9TImsZOJz6c9Nb4zvXcmtOIBKLHc9cowpfXfmlqsHbDp7Xh4+k4L0uLr9i+8ilgQ6ypcuF4UCg==",
       "cpu": [
         "x64"
       ],
@@ -7177,22 +7166,22 @@
       }
     },
     "node_modules/@sentry/core": {
-      "version": "10.40.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.40.0.tgz",
-      "integrity": "sha512-/wrcHPp9Avmgl6WBimPjS4gj810a1wU5oX9fF1bzJfeIIbF3jTsAbv0oMbgDp0cSDnkwv2+NvcPnn3+c5J6pBA==",
+      "version": "10.38.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.38.0.tgz",
+      "integrity": "sha512-1pubWDZE5y5HZEPMAZERP4fVl2NH3Ihp1A+vMoVkb3Qc66Diqj1WierAnStlZP7tCx0TBa0dK85GTW/ZFYyB9g==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@sentry/react": {
-      "version": "10.40.0",
-      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-10.40.0.tgz",
-      "integrity": "sha512-3T5W/e3QJMimXRIOx8xMEZbxeIuFiKlXvHLcMTLGygGBYnxQGeb8Oz/8heov+3zF1JoCIxeVQNFW0woySApfyA==",
+      "version": "10.38.0",
+      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-10.38.0.tgz",
+      "integrity": "sha512-3UiKo6QsqTyPGUt0XWRY9KLaxc/cs6Kz4vlldBSOXEL6qPDL/EfpwNJT61osRo81VFWu8pKu7ZY2bvLPryrnBQ==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/browser": "10.40.0",
-        "@sentry/core": "10.40.0"
+        "@sentry/browser": "10.38.0",
+        "@sentry/core": "10.38.0"
       },
       "engines": {
         "node": ">=18"
@@ -7202,12 +7191,12 @@
       }
     },
     "node_modules/@sentry/vite-plugin": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-4.9.1.tgz",
-      "integrity": "sha512-Tlyg2cyFYp/icX58GWvfpvZr9NLdLs2/xyFVyS8pQ0faZWmoXic3FMzoXYHV1gsdMbL1Yy5WQvGJy8j1rS8LGA==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-4.8.0.tgz",
+      "integrity": "sha512-/YZJitGsx/o72FFQYy3tucUfs4w3COvSI1d2NYyAhIzay4tjLLRjpM5PdwFnoBT7Uj/7jSbuHkg87PAliLiu2g==",
       "license": "MIT",
       "dependencies": {
-        "@sentry/bundler-plugin-core": "4.9.1",
+        "@sentry/bundler-plugin-core": "4.8.0",
         "unplugin": "1.0.1"
       },
       "engines": {
@@ -7313,9 +7302,9 @@
       }
     },
     "node_modules/@tanem/react-nprogress": {
-      "version": "5.0.63",
-      "resolved": "https://registry.npmjs.org/@tanem/react-nprogress/-/react-nprogress-5.0.63.tgz",
-      "integrity": "sha512-bWkOhMBvwAe8GlqgkXdAyAeUDtWv7NknoDnlZXdVJb8M/1tP+JcsHq/xc3zUTQ0jcT3AT0uSB7Hlt27lJMHtDQ==",
+      "version": "5.0.58",
+      "resolved": "https://registry.npmjs.org/@tanem/react-nprogress/-/react-nprogress-5.0.58.tgz",
+      "integrity": "sha512-VbO2PF/lYwyV5axQTLQWrC2l7amVadCikg/WnpncdgkGHzcWgkdV/h+SoYgkB2cfc8yQm0Qpv9DCGK8q4wWvsw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.28.6",
@@ -7718,16 +7707,16 @@
       "license": "ISC"
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.4.tgz",
-      "integrity": "sha512-VIcFLdRi/VYRU8OL/puL7QXMYafHmqOnwTZY50U1JPlCNj30PxCMx65c494b1K9be9hX83KVt0+gTEwTWLqToA==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.2.tgz",
+      "integrity": "sha512-EcA07pHJouywpzsoTUqNh5NwGayl2PPVEJKUSinGGSxFGYn+shYbqMGBg6FXDqgXum9Ou/ecb+411ssw8HImJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.29.0",
+        "@babel/core": "^7.28.5",
         "@babel/plugin-transform-react-jsx-self": "^7.27.1",
         "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-        "@rolldown/pluginutils": "1.0.0-rc.3",
+        "@rolldown/pluginutils": "1.0.0-beta.53",
         "@types/babel__core": "^7.20.5",
         "react-refresh": "^0.18.0"
       },
@@ -8015,24 +8004,24 @@
       }
     },
     "node_modules/antd": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-6.3.1.tgz",
-      "integrity": "sha512-8pRjvxitZFyrYAtgwml93Km7fCXjw9IeqlmzpIsusRsmO3eWFVrOMum6+0TsGCtR/WrXVnPwfsgrFg3ChzGCeA==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/antd/-/antd-6.2.2.tgz",
+      "integrity": "sha512-f5RvWnhjt2gZTpBMW3msHwA3IeaCJBHDwVyEsskYGp0EXcRhhklWrltkybDki0ysBNywkjLPp3wuuWhIKfplcQ==",
       "license": "MIT",
       "dependencies": {
         "@ant-design/colors": "^8.0.1",
-        "@ant-design/cssinjs": "^2.1.0",
-        "@ant-design/cssinjs-utils": "^2.1.1",
+        "@ant-design/cssinjs": "^2.0.3",
+        "@ant-design/cssinjs-utils": "^2.0.2",
         "@ant-design/fast-color": "^3.0.1",
         "@ant-design/icons": "^6.1.0",
         "@ant-design/react-slick": "~2.0.0",
         "@babel/runtime": "^7.28.4",
-        "@rc-component/cascader": "~1.14.0",
-        "@rc-component/checkbox": "~2.0.0",
+        "@rc-component/cascader": "~1.11.0",
+        "@rc-component/checkbox": "~1.0.1",
         "@rc-component/collapse": "~1.2.0",
-        "@rc-component/color-picker": "~3.1.0",
-        "@rc-component/dialog": "~1.8.4",
-        "@rc-component/drawer": "~1.4.2",
+        "@rc-component/color-picker": "~3.0.3",
+        "@rc-component/dialog": "~1.8.0",
+        "@rc-component/drawer": "~1.4.0",
         "@rc-component/dropdown": "~1.0.2",
         "@rc-component/form": "~1.6.2",
         "@rc-component/image": "~1.6.0",
@@ -8040,7 +8029,7 @@
         "@rc-component/input-number": "~1.6.2",
         "@rc-component/mentions": "~1.6.0",
         "@rc-component/menu": "~1.2.0",
-        "@rc-component/motion": "^1.3.1",
+        "@rc-component/motion": "~1.1.6",
         "@rc-component/mutate-observer": "^2.0.1",
         "@rc-component/notification": "~1.2.0",
         "@rc-component/pagination": "~1.2.0",
@@ -8050,7 +8039,7 @@
         "@rc-component/rate": "~1.0.1",
         "@rc-component/resize-observer": "^1.1.1",
         "@rc-component/segmented": "~1.3.0",
-        "@rc-component/select": "~1.6.12",
+        "@rc-component/select": "~1.5.1",
         "@rc-component/slider": "~1.0.1",
         "@rc-component/steps": "~1.2.2",
         "@rc-component/switch": "~1.0.3",
@@ -8059,11 +8048,11 @@
         "@rc-component/textarea": "~1.1.2",
         "@rc-component/tooltip": "~1.4.0",
         "@rc-component/tour": "~2.3.0",
-        "@rc-component/tree": "~1.2.3",
-        "@rc-component/tree-select": "~1.8.0",
+        "@rc-component/tree": "~1.1.0",
+        "@rc-component/tree-select": "~1.6.0",
         "@rc-component/trigger": "^3.9.0",
         "@rc-component/upload": "~1.1.0",
-        "@rc-component/util": "^1.9.0",
+        "@rc-component/util": "^1.7.0",
         "clsx": "^2.1.1",
         "dayjs": "^1.11.11",
         "scroll-into-view-if-needed": "^3.1.0",
@@ -8079,9 +8068,9 @@
       }
     },
     "node_modules/antd/node_modules/@ant-design/cssinjs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@ant-design/cssinjs/-/cssinjs-2.1.0.tgz",
-      "integrity": "sha512-eZFrPCnrYrF3XtL7qA4L75P0qA3TtZta8H3Yggy7UYFh8gZgu5bSMNF+v4UVCzGxzYmx8ZvPdgOce0BJ6PsW9g==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@ant-design/cssinjs/-/cssinjs-2.0.3.tgz",
+      "integrity": "sha512-HAo8SZ3a6G8v6jT0suCz1270na6EA3obeJWM4uzRijBhdwdoMAXWK2f4WWkwB28yUufsfk3CAhN1coGPQq4kNQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.1",
@@ -8399,13 +8388,13 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.13.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
-      "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.4.tgz",
+      "integrity": "sha512-1wVkUaAO6WyaYtCkcYCOx12ZgpGf9Zif+qXa4n+oYzK558YryKqiL6UWwd5DqiH3VRW0GYhTZQ/vlgJrCoNQlg==",
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.11",
-        "form-data": "^4.0.5",
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.4",
         "proxy-from-env": "^1.1.0"
       }
     },
@@ -9478,25 +9467,25 @@
       "license": "MIT"
     },
     "node_modules/cssstyle": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-6.0.1.tgz",
-      "integrity": "sha512-IoJs7La+oFp/AB033wBStxNOJt4+9hHMxsXUPANcoXL2b3W4DZKghlJ2cI/eyeRZIQ9ysvYEorVhjrcYctWbog==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.7.tgz",
+      "integrity": "sha512-7D2EPVltRrsTkhpQmksIu+LxeWAIEk6wRDMJ1qljlv+CKHJM+cJLlfhWIzNA44eAsHXSNe3+vO6DW1yCYx8SuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@asamuzakjp/css-color": "^4.1.2",
-        "@csstools/css-syntax-patches-for-csstree": "^1.0.26",
+        "@asamuzakjp/css-color": "^4.1.1",
+        "@csstools/css-syntax-patches-for-csstree": "^1.0.21",
         "css-tree": "^3.1.0",
-        "lru-cache": "^11.2.5"
+        "lru-cache": "^11.2.4"
       },
       "engines": {
         "node": ">=20"
       }
     },
     "node_modules/cssstyle/node_modules/lru-cache": {
-      "version": "11.2.6",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
-      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
+      "version": "11.2.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.5.tgz",
+      "integrity": "sha512-vFrFJkWtJvJnD5hg+hJvVE8Lh/TcMzKnTgCWmtBipwI5yLX/iX+5UB2tfuyODF5E7k9xEzMdYgGqaSb1c0c5Yw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -9637,17 +9626,17 @@
       }
     },
     "node_modules/data-urls": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-7.0.0.tgz",
-      "integrity": "sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.0.tgz",
+      "integrity": "sha512-BnBS08aLUM+DKamupXs3w2tJJoqU+AkaE/+6vQxi/G/DPmIZFJJp9Dkb1kM03AZx8ADehDUZgsNxju3mPXZYIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "whatwg-mimetype": "^5.0.0",
-        "whatwg-url": "^16.0.0"
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^15.0.0"
       },
       "engines": {
-        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+        "node": ">=20"
       }
     },
     "node_modules/data-view-buffer": {
@@ -9995,9 +9984,9 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "17.3.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.3.1.tgz",
-      "integrity": "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==",
+      "version": "17.2.3",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
+      "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -10698,9 +10687,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
-      "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -11077,9 +11066,9 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -11264,7 +11253,6 @@
       "version": "10.5.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
       "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -11341,9 +11329,9 @@
       "integrity": "sha512-5e01v8eLGfuQSOvx2MsDMOWS0GFtCx1wPzQSmcHw4hkxFzrQDBO3Xwg/m8Hr/7qXMrHeOIE29qWVzyv06u1TZA=="
     },
     "node_modules/globals": {
-      "version": "17.3.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-17.3.0.tgz",
-      "integrity": "sha512-yMqGUQVVCkD4tqjOJf3TnrvaaHDMYp4VlUSObbkIiuCPe/ofdMBFIAcBbCSRFWOnos6qRiTVStDwqPLUclaxIw==",
+      "version": "17.2.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.2.0.tgz",
+      "integrity": "sha512-tovnCz/fEq+Ripoq+p/gN1u7l6A7wwkoBT9pRCzTHzsD/LvADIzXZdjmRymh5Ztf0DYC3Rwg5cZRYjxzBmzbWg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11390,9 +11378,9 @@
       "license": "ISC"
     },
     "node_modules/graphql": {
-      "version": "16.13.0",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.13.0.tgz",
-      "integrity": "sha512-uSisMYERbaB9bkA9M4/4dnqyktaEkf1kMHNKq/7DHyxVeWqHQ2mBmVqm5u6/FVHwF3iCNalKcg82Zfl+tffWoA==",
+      "version": "16.12.0",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.12.0.tgz",
+      "integrity": "sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ==",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
@@ -11763,9 +11751,9 @@
       }
     },
     "node_modules/i18next": {
-      "version": "25.8.13",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.13.tgz",
-      "integrity": "sha512-E0vzjBY1yM+nsFrtgkjLhST2NBkirkvOVoQa0MSldhsuZ3jUge7ZNpuwG0Cfc74zwo5ZwRzg3uOgT+McBn32iA==",
+      "version": "25.8.0",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.0.tgz",
+      "integrity": "sha512-urrg4HMFFMQZ2bbKRK7IZ8/CTE7D8H4JRlAwqA2ZwDRFfdd0K/4cdbNNLgfn9mo+I/h9wJu61qJzH7jCFAhUZQ==",
       "funding": [
         {
           "type": "individual",
@@ -11794,9 +11782,9 @@
       }
     },
     "node_modules/i18next-browser-languagedetector": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.2.1.tgz",
-      "integrity": "sha512-bZg8+4bdmaOiApD7N7BPT9W8MLZG+nPTOFlLiJiT8uzKXFjhxw4v2ierCXOwB5sFDMtuA5G4kgYZ0AznZxQ/cw==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.2.0.tgz",
+      "integrity": "sha512-P+3zEKLnOF0qmiesW383vsLdtQVyKtCNA9cjSoKCppTKPQVfKd2W8hbVo5ZhNJKDqeM7BOcvNoKJOjpHh4Js9g==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.2"
@@ -12684,18 +12672,17 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-28.1.0.tgz",
-      "integrity": "sha512-0+MoQNYyr2rBHqO1xilltfDjV9G7ymYGlAUazgcDLQaUf8JDHbuGwsxN6U9qWaElZ4w1B2r7yEGIL3GdeW3Rug==",
+      "version": "27.4.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-27.4.0.tgz",
+      "integrity": "sha512-mjzqwWRD9Y1J1KUi7W97Gja1bwOOM5Ug0EZ6UDK3xS7j7mndrkwozHtSblfomlzyB4NepioNt+B2sOSzczVgtQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@acemir/cssom": "^0.9.31",
-        "@asamuzakjp/dom-selector": "^6.8.1",
-        "@bramus/specificity": "^2.4.2",
-        "@exodus/bytes": "^1.11.0",
-        "cssstyle": "^6.0.1",
-        "data-urls": "^7.0.0",
+        "@acemir/cssom": "^0.9.28",
+        "@asamuzakjp/dom-selector": "^6.7.6",
+        "@exodus/bytes": "^1.6.0",
+        "cssstyle": "^5.3.4",
+        "data-urls": "^6.0.0",
         "decimal.js": "^10.6.0",
         "html-encoding-sniffer": "^6.0.0",
         "http-proxy-agent": "^7.0.2",
@@ -12705,11 +12692,11 @@
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
         "tough-cookie": "^6.0.0",
-        "undici": "^7.21.0",
         "w3c-xmlserializer": "^5.0.0",
-        "webidl-conversions": "^8.0.1",
-        "whatwg-mimetype": "^5.0.0",
-        "whatwg-url": "^16.0.0",
+        "webidl-conversions": "^8.0.0",
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^15.1.0",
+        "ws": "^8.18.3",
         "xml-name-validator": "^5.0.0"
       },
       "engines": {
@@ -12748,16 +12735,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/jsdom/node_modules/undici": {
-      "version": "7.22.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.22.0.tgz",
-      "integrity": "sha512-RqslV2Us5BrllB+JeiZnK4peryVTndy9Dnqq62S3yYRRTj0tFQCwEniUy2167skdGOy3vqRzEvl1Dm4sV2ReDg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=20.18.1"
-      }
-    },
     "node_modules/jsesc": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
@@ -12906,9 +12883,9 @@
       }
     },
     "node_modules/libphonenumber-js": {
-      "version": "1.12.38",
-      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.38.tgz",
-      "integrity": "sha512-vwzxmasAy9hZigxtqTbFEwp8ZdZ975TiqVDwj5bKx5sR+zi5ucUQy9mbVTkKM9GzqdLdxux/hTw2nmN5J7POMA==",
+      "version": "1.12.36",
+      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.36.tgz",
+      "integrity": "sha512-woWhKMAVx1fzzUnMCyOzglgSgf6/AFHLASdOBcchYCyvWSGWt12imw3iu2hdI5d4dGZRsNWAmWiz37sDKUPaRQ==",
       "license": "MIT"
     },
     "node_modules/lightningcss": {
@@ -14917,9 +14894,9 @@
       "license": "MIT"
     },
     "node_modules/phone": {
-      "version": "3.1.71",
-      "resolved": "https://registry.npmjs.org/phone/-/phone-3.1.71.tgz",
-      "integrity": "sha512-hY+mk9CyQovdaG8QpcsbtNP3hI7oPW7gv2yghQkkWBMsPRxeJYwnggqLYdZAAz7nGxli5SJ7Zvkf/HoxPaHjpQ==",
+      "version": "3.1.70",
+      "resolved": "https://registry.npmjs.org/phone/-/phone-3.1.70.tgz",
+      "integrity": "sha512-MFRQaIe8UJmkosaU/OlLRDhSoLw9wJRwqtacNHy8cZjDomTQ9ic8+8nKdGFLpRsaqnLHAXSuiIYTzWggMkSG5Q==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -14958,13 +14935,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz",
-      "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==",
+      "version": "1.58.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.0.tgz",
+      "integrity": "sha512-2SVA0sbPktiIY/MCOPX8e86ehA/e+tDNq+e5Y8qjKYti2Z/JG7xnronT/TXTIkKbYGWlCbuucZ6dziEgkoEjQQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.58.2"
+        "playwright-core": "1.58.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -14977,9 +14954,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.58.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz",
-      "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==",
+      "version": "1.58.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.0.tgz",
+      "integrity": "sha512-aaoB1RWrdNi3//rOeKuMiS65UCcgOVljU46At6eFcOFPFHWtd2weHRRow6z/n+Lec0Lvu0k9ZPKJSjPugikirw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -15049,9 +15026,9 @@
       "license": "MIT"
     },
     "node_modules/posthog-js": {
-      "version": "1.355.0",
-      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.355.0.tgz",
-      "integrity": "sha512-RpxHyodlr9wuqoZOct8DDg50SGq3SQmUWxYu+G1eOO+PvWsr5N2ZZdhE/rpv2zZccPdbXdgIy3M1pa574Nps7w==",
+      "version": "1.336.4",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.336.4.tgz",
+      "integrity": "sha512-NX81XaqOjS/gue3UsbAAuJxi6vD0AGy1HUvywBIhAArCwbTXKS04NhEFwUcYJdrmwXUf94MntEIWGoc1pTFDtg==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@opentelemetry/api": "^1.9.0",
@@ -15059,8 +15036,8 @@
         "@opentelemetry/exporter-logs-otlp-http": "^0.208.0",
         "@opentelemetry/resources": "^2.2.0",
         "@opentelemetry/sdk-logs": "^0.208.0",
-        "@posthog/core": "1.23.1",
-        "@posthog/types": "1.355.0",
+        "@posthog/core": "1.17.0",
+        "@posthog/types": "1.336.4",
         "core-js": "^3.38.1",
         "dompurify": "^3.3.1",
         "fflate": "^0.4.8",
@@ -15738,9 +15715,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.13.1",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.13.1.tgz",
-      "integrity": "sha512-td+xP4X2/6BJvZoX6xw++A2DdEi++YypA69bJUV5oVvqf6/9/9nNlD70YO1e9d3MyamJEBQFEzk6mbfDYbqrSA==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.13.0.tgz",
+      "integrity": "sha512-PZgus8ETambRT17BUm/LL8lX3Of+oiLaPuVTRH3l1eLvSPpKO3AvhAEb5N7ihAFZQrYDqkvvWfFh9p0z9VsjLw==",
       "license": "MIT",
       "dependencies": {
         "cookie": "^1.0.1",
@@ -15760,12 +15737,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.13.1",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.13.1.tgz",
-      "integrity": "sha512-UJnV3Rxc5TgUPJt2KJpo1Jpy0OKQr0AjgbZzBFjaPJcFOb2Y8jA5H3LT8HUJAiRLlWrEXWHbF1Z4SCZaQjWDHw==",
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.13.0.tgz",
+      "integrity": "sha512-5CO/l5Yahi2SKC6rGZ+HDEjpjkGaG/ncEP7eWFTvFxbHP8yeeI0PxTDjimtpXYlR3b3i9/WIL4VJttPrESIf2g==",
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.13.1"
+        "react-router": "7.13.0"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -16397,12 +16374,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/safe-json-stringify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
-      "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
-      "license": "MIT"
-    },
     "node_modules/safe-push-apply": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
@@ -17342,9 +17313,9 @@
       }
     },
     "node_modules/styled-components": {
-      "version": "6.3.11",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.3.11.tgz",
-      "integrity": "sha512-opzgceGlQ5rdZdGwf9ddLW7EM2F4L7tgsgLn6fFzQ2JgE5EVQ4HZwNkcgB1p8WfOBx1GEZP3fa66ajJmtXhSrA==",
+      "version": "6.3.8",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.3.8.tgz",
+      "integrity": "sha512-Kq/W41AKQloOqKM39zfaMdJ4BcYDw/N5CIq4/GTI0YjU6pKcZ1KKhk6b4du0a+6RA9pIfOP/eu94Ge7cu+PDCA==",
       "license": "MIT",
       "dependencies": {
         "@emotion/is-prop-valid": "1.4.0",
@@ -18431,9 +18402,9 @@
       }
     },
     "node_modules/vite-plugin-babel": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/vite-plugin-babel/-/vite-plugin-babel-1.5.1.tgz",
-      "integrity": "sha512-TBBBsAYYg7V5yR+xPeZYHwritMmc2QvZrZKFSS26it7ZQ0Y8ESKwJJm2KUUcmHQZU/owvA4yKk4ibPVrfhlwJw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/vite-plugin-babel/-/vite-plugin-babel-1.4.1.tgz",
+      "integrity": "sha512-quO+viHGSv1cjbfhbeiMZ7SZpo8P29NiUh9LJfKhpmIDwy0THRiTRUbanBbkNcZcSyHFgp1n7TByd1C2kanqLQ==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -18763,28 +18734,27 @@
       "license": "MIT"
     },
     "node_modules/whatwg-mimetype": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz",
-      "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=20"
+        "node": ">=18"
       }
     },
     "node_modules/whatwg-url": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-16.0.0.tgz",
-      "integrity": "sha512-9CcxtEKsf53UFwkSUZjG+9vydAsFO4lFHBpJUtjBcoJOCJpKnSJNwCw813zrYJHpCJ7sgfbtOe0V5Ku7Pa1XMQ==",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz",
+      "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@exodus/bytes": "^1.11.0",
         "tr46": "^6.0.0",
-        "webidl-conversions": "^8.0.1"
+        "webidl-conversions": "^8.0.0"
       },
       "engines": {
-        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+        "node": ">=20"
       }
     },
     "node_modules/which": {
@@ -19392,6 +19362,28 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "license": "ISC"
     },
+    "node_modules/ws": {
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
+      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/xml-name-validator": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
diff --git a/client/package.json b/client/package.json
index 1f14bec96..b0cbdf6b8 100644
--- a/client/package.json
+++ b/client/package.json
@@ -8,9 +8,9 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@amplitude/analytics-browser": "^2.35.3",
+    "@amplitude/analytics-browser": "^2.34.0",
     "@ant-design/pro-layout": "^7.22.6",
-    "@apollo/client": "^4.1.6",
+    "@apollo/client": "^4.1.3",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
@@ -18,43 +18,43 @@
     "@emotion/is-prop-valid": "^1.4.0",
     "@fingerprintjs/fingerprintjs": "^5.0.1",
     "@firebase/analytics": "^0.10.19",
-    "@firebase/app": "^0.14.8",
+    "@firebase/app": "^0.14.7",
     "@firebase/auth": "^1.12.0",
-    "@firebase/firestore": "^4.11.0",
+    "@firebase/firestore": "^4.10.0",
     "@firebase/messaging": "^0.12.22",
     "@jsreport/browser-client": "^3.1.0",
     "@reduxjs/toolkit": "^2.11.2",
-    "@sentry/cli": "^3.2.2",
-    "@sentry/react": "^10.40.0",
-    "@sentry/vite-plugin": "^4.9.1",
+    "@sentry/cli": "^3.1.0",
+    "@sentry/react": "^10.38.0",
+    "@sentry/vite-plugin": "^4.8.0",
     "@splitsoftware/splitio-react": "^2.6.1",
-    "@tanem/react-nprogress": "^5.0.63",
-    "antd": "^6.3.1",
+    "@tanem/react-nprogress": "^5.0.58",
+    "antd": "^6.2.2",
     "apollo-link-logger": "^3.0.0",
     "autosize": "^6.0.1",
-    "axios": "^1.13.5",
+    "axios": "^1.13.4",
     "classnames": "^2.5.1",
     "css-box-model": "^1.2.1",
     "dayjs": "^1.11.19",
     "dayjs-business-days2": "^1.3.2",
     "dinero.js": "^1.9.1",
-    "dotenv": "^17.3.1",
+    "dotenv": "^17.2.3",
     "env-cmd": "^11.0.0",
     "exifr": "^7.1.3",
-    "graphql": "^16.13.0",
+    "graphql": "^16.12.0",
     "graphql-ws": "^6.0.7",
-    "i18next": "^25.8.13",
-    "i18next-browser-languagedetector": "^8.2.1",
+    "i18next": "^25.8.0",
+    "i18next-browser-languagedetector": "^8.2.0",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.38",
+    "libphonenumber-js": "^1.12.36",
     "lightningcss": "^1.31.1",
     "logrocket": "^12.0.0",
     "markerjs2": "^2.32.7",
     "memoize-one": "^6.0.0",
     "normalize-url": "^8.1.1",
     "object-hash": "^3.0.0",
-    "phone": "^3.1.71",
-    "posthog-js": "^1.355.0",
+    "phone": "^3.1.70",
+    "posthog-js": "^1.336.4",
     "prop-types": "^15.8.1",
     "query-string": "^9.3.1",
     "raf-schd": "^4.0.3",
@@ -74,7 +74,7 @@
     "react-product-fruits": "^2.2.62",
     "react-redux": "^9.2.0",
     "react-resizable": "^3.1.3",
-    "react-router-dom": "^7.13.1",
+    "react-router-dom": "^7.13.0",
     "react-sticky": "^6.0.3",
     "react-virtuoso": "^4.18.1",
     "recharts": "^3.7.0",
@@ -87,7 +87,7 @@
     "rxjs": "^7.8.2",
     "sass": "^1.97.3",
     "socket.io-client": "^4.8.3",
-    "styled-components": "^6.3.11",
+    "styled-components": "^6.3.8",
     "vite-plugin-ejs": "^1.7.0",
     "web-vitals": "^5.1.0"
   },
@@ -144,11 +144,11 @@
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
     "@eslint/js": "^9.39.2",
-    "@playwright/test": "^1.58.2",
+    "@playwright/test": "^1.58.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
-    "@vitejs/plugin-react": "^5.1.4",
+    "@vitejs/plugin-react": "^5.1.2",
     "babel-plugin-react-compiler": "^1.0.0",
     "browserslist": "^4.28.1",
     "browserslist-to-esbuild": "^2.1.1",
@@ -156,16 +156,16 @@
     "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-compiler": "^19.1.0-rc.2",
-    "globals": "^17.3.0",
-    "jsdom": "^28.1.0",
+    "globals": "^17.2.0",
+    "jsdom": "^27.4.0",
     "memfs": "^4.56.10",
     "os-browserify": "^0.3.0",
-    "playwright": "^1.58.2",
+    "playwright": "^1.58.0",
     "react-error-overlay": "^6.1.0",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.3",
     "vite": "^7.3.1",
-    "vite-plugin-babel": "^1.5.1",
+    "vite-plugin-babel": "^1.4.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-node-polyfills": "^0.25.0",
     "vite-plugin-pwa": "^1.2.0",
diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx
index bcfc39fa1..8abf59242 100644
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -1,7 +1,7 @@
 import { ApolloProvider } from "@apollo/client/react";
 import * as Sentry from "@sentry/react";
 import { SplitFactoryProvider, useSplitClient } from "@splitsoftware/splitio-react";
-import { ConfigProvider, Grid } from "antd";
+import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
 import { useEffect, useMemo } from "react";
 import { CookiesProvider } from "react-cookie";
@@ -43,47 +43,10 @@ function AppContainer() {
 
   const currentUser = useSelector(selectCurrentUser);
   const isDarkMode = useSelector(selectDarkMode);
-  const screens = Grid.useBreakpoint();
-  const isPhone = !screens.md;
-  const isUltraWide = Boolean(screens.xxxl);
 
-  const theme = useMemo(() => {
-    const baseTheme = getTheme(isDarkMode);
-
-    return {
-      ...baseTheme,
-      token: {
-        ...(baseTheme.token || {}),
-        screenXXXL: 2160
-      },
-      components: {
-        ...(baseTheme.components || {}),
-        Table: {
-          ...(baseTheme.components?.Table || {}),
-          cellFontSizeSM: isPhone ? 12 : 13,
-          cellFontSizeMD: isPhone ? 13 : isUltraWide ? 15 : 14,
-          cellFontSize: isUltraWide ? 15 : 14,
-          cellPaddingInlineSM: isPhone ? 8 : 10,
-          cellPaddingInlineMD: isPhone ? 10 : 14,
-          cellPaddingInline: isUltraWide ? 20 : 16,
-          cellPaddingBlockSM: isPhone ? 8 : 10,
-          cellPaddingBlockMD: isPhone ? 10 : 12,
-          cellPaddingBlock: isUltraWide ? 14 : 12,
-          selectionColumnWidth: isPhone ? 44 : 52
-        }
-      }
-    };
-  }, [isDarkMode, isPhone, isUltraWide]);
+  const theme = useMemo(() => getTheme(isDarkMode), [isDarkMode]);
 
   const antdInput = useMemo(() => ({ autoComplete: "new-password" }), []);
-  const antdTable = useMemo(() => ({ scroll: { x: "max-content" } }), []);
-  const antdPagination = useMemo(
-    () => ({
-      showSizeChanger: !isPhone,
-      totalBoundaryShowSizeChanger: 100
-    }),
-    [isPhone]
-  );
 
   const antdForm = useMemo(
     () => ({
@@ -159,16 +122,7 @@ function AppContainer() {
   return (
     <CookiesProvider>
       <ApolloProvider client={client}>
-        <ConfigProvider
-          input={antdInput}
-          locale={enLocale}
-          theme={theme}
-          form={antdForm}
-          table={antdTable}
-          pagination={antdPagination}
-          componentSize={isPhone ? "small" : isUltraWide ? "large" : "middle"}
-          popupOverflow="viewport"
-        >
+        <ConfigProvider input={antdInput} locale={enLocale} theme={theme} form={antdForm}>
           <GlobalLoadingBar />
           <SplitFactoryProvider config={config}>
             <SplitClientProvider>
diff --git a/client/src/App/App.styles.scss b/client/src/App/App.styles.scss
index aedfbd15c..657520e49 100644
--- a/client/src/App/App.styles.scss
+++ b/client/src/App/App.styles.scss
@@ -443,30 +443,6 @@
   flex-direction: column;
 }
 
-/* DMS top panels: prevent card/table overflow into adjacent column at desktop+zoom */
-.dms-top-panel-col {
-  min-width: 0;
-}
-
-.dms-top-panel-col > .ant-card {
-  width: 100%;
-  min-width: 0;
-  max-width: 100%;
-}
-
-.dms-top-panel-col > .ant-card .ant-card-body {
-  min-width: 0;
-  max-width: 100%;
-}
-
-.dms-top-panel-col .ant-table-wrapper,
-.dms-top-panel-col .ant-tabs,
-.dms-top-panel-col .ant-tabs-content,
-.dms-top-panel-col .ant-tabs-tabpane {
-  min-width: 0;
-  max-width: 100%;
-}
-
 //.rbc-time-header-gutter {
 //  padding: 0;
 //}
@@ -499,13 +475,3 @@
   margin-left: auto;
   flex: 0 0 auto;
 }
-
-
-.global-search-autocomplete-fix {
-  // This is the extra value render that causes the “duplicate text”
-  .ant-select-selection-item {
-    position: absolute !important;
-    left: -10000px !important;
-    pointer-events: none !important;
-  }
-}
diff --git a/client/src/App/themeProvider.js b/client/src/App/themeProvider.js
index b05671c1f..06ea72e18 100644
--- a/client/src/App/themeProvider.js
+++ b/client/src/App/themeProvider.js
@@ -68,7 +68,7 @@ const currentTheme = import.meta.env.DEV ? devTheme : prodTheme;
 
 const getTheme = (isDarkMode) => ({
   algorithm: isDarkMode ? darkAlgorithm : defaultAlgorithm,
-  ...defaultsDeep({}, currentTheme, defaultTheme(isDarkMode))
+  ...defaultsDeep(currentTheme, defaultTheme)
 });
 
 export default getTheme;
diff --git a/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
index aaf81c2a6..e6d7d9b1e 100644
--- a/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
+++ b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
@@ -1,4 +1,4 @@
-import { Card, Checkbox, Input, Space } from "antd";
+import { Card, Checkbox, Input, Space, Table } from "antd";
 import queryString from "query-string";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -16,7 +16,6 @@ import PayableExportAll from "../payable-export-all-button/payable-export-all-bu
 import PayableExportButton from "../payable-export-button/payable-export-button.component";
 import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 import useLocalStorage from "./../../utils/useLocalStorage";
 
 const mapStateToProps = createStructuredSelector({
@@ -180,12 +179,11 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         dataSource={dataSource}
         pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
         columns={columns}
-        mobileColumnKeys={["vendorname", "invoice_number", "ro_number", "total", "actions"]}
         rowKey="id"
         onChange={handleTableChange}
         rowSelection={{
diff --git a/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx b/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
index 54fb83c68..f74cf54df 100644
--- a/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
+++ b/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
@@ -1,4 +1,4 @@
-import { Card, Input, Space } from "antd";
+import { Card, Input, Space, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -17,7 +17,6 @@ import PaymentExportButton from "../payment-export-button/payment-export-button.
 import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -193,12 +192,11 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, payments,
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         dataSource={dataSource}
         pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
         columns={columns}
-        mobileColumnKeys={["ro_number", "date", "owner", "amount", "actions"]}
         rowKey="id"
         onChange={handleTableChange}
         rowSelection={{
diff --git a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
index 6c07976d1..d4802fe29 100644
--- a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
+++ b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
@@ -1,4 +1,4 @@
-import { Button, Card, Input, Space } from "antd";
+import { Button, Card, Input, Space, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -17,7 +17,6 @@ import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-butto
 import JobMarkSelectedExported from "../jobs-mark-selected-exported/jobs-mark-selected-exported";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -210,12 +209,11 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         dataSource={dataSource}
         pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
         columns={columns}
-        mobileColumnKeys={["ro_number", "status", "owner", "clm_total", "actions"]}
         rowKey="id"
         onChange={handleTableChange}
         rowSelection={{
diff --git a/client/src/components/allocations-assignment/allocations-assignment.component.jsx b/client/src/components/allocations-assignment/allocations-assignment.component.jsx
index 0f00cf159..de8089370 100644
--- a/client/src/components/allocations-assignment/allocations-assignment.component.jsx
+++ b/client/src/components/allocations-assignment/allocations-assignment.component.jsx
@@ -29,18 +29,19 @@ export function AllocationsAssignmentComponent({
       <Select
         id="employeeSelector"
         showSearch={{
-          optionFilterProp: "label",
-          filterOption: (input, option) => option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          optionFilterProp: "children",
+          filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
         }}
         style={{ width: 200 }}
         placeholder="Select a person"
         onChange={onChange}
-        options={bodyshop.employees.map((emp) => ({
-          value: emp.id,
-          key: emp.id,
-          label: `${emp.first_name} ${emp.last_name}`
-        }))}
-      />
+      >
+        {bodyshop.employees.map((emp) => (
+          <Select.Option value={emp.id} key={emp.id}>
+            {`${emp.first_name} ${emp.last_name}`}
+          </Select.Option>
+        ))}
+      </Select>
       <InputNumber
         defaultValue={assignment.hours}
         placeholder={t("joblines.fields.mod_lb_hrs")}
diff --git a/client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.component.jsx b/client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.component.jsx
index 1bb47f455..f7bd86df9 100644
--- a/client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.component.jsx
+++ b/client/src/components/allocations-bulk-assignment/allocations-bulk-assignment.component.jsx
@@ -31,17 +31,19 @@ export default connect(
     <div>
       <Select
         showSearch={{
-          optionFilterProp: "label",
-          filterOption: (input, option) => option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          optionFilterProp: "children",
+          filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
         }}
         style={{ width: 200 }}
         placeholder="Select a person"
         onChange={onChange}
-        options={bodyshop.employees.map((emp) => ({
-          value: emp.id,
-          label: `${emp.first_name} ${emp.last_name}`
-        }))}
-      />
+      >
+        {bodyshop.employees.map((emp) => (
+          <Select.Option value={emp.id} key={emp.id}>
+            {`${emp.first_name} ${emp.last_name}`}
+          </Select.Option>
+        ))}
+      </Select>
 
       <Button type="primary" disabled={!assignment.employeeid} onClick={handleAssignment}>
         Assign
diff --git a/client/src/components/audit-trail-list/audit-trail-list.component.jsx b/client/src/components/audit-trail-list/audit-trail-list.component.jsx
index 3ff5b21fa..c114b8554 100644
--- a/client/src/components/audit-trail-list/audit-trail-list.component.jsx
+++ b/client/src/components/audit-trail-list/audit-trail-list.component.jsx
@@ -1,5 +1,5 @@
 import { useState } from "react";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Table } from "antd";
 import { alphaSort } from "../../utils/sorters";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { useTranslation } from "react-i18next";
@@ -62,12 +62,11 @@ export default function AuditTrailListComponent({ loading, data }) {
   };
 
   return (
-    <ResponsiveTable
+    <Table
       {...formItemLayout}
       loading={loading}
       pagination={{ placement: "top", defaultPageSize: pageLimit }}
       columns={columns}
-      mobileColumnKeys={[" created", "operation", " old_val", "useremail"]}
       rowKey="id"
       dataSource={data}
       onChange={handleTableChange}
diff --git a/client/src/components/audit-trail-list/email-audit-trail-list.component.jsx b/client/src/components/audit-trail-list/email-audit-trail-list.component.jsx
index c55841b07..77e772187 100644
--- a/client/src/components/audit-trail-list/email-audit-trail-list.component.jsx
+++ b/client/src/components/audit-trail-list/email-audit-trail-list.component.jsx
@@ -1,4 +1,4 @@
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
@@ -47,12 +47,11 @@ export default function EmailAuditTrailListComponent({ loading, data }) {
   };
 
   return (
-    <ResponsiveTable
+    <Table
       {...formItemLayout}
       loading={loading}
       pagination={{ placement: "top", defaultPageSize: pageLimit }}
       columns={columns}
-      mobileColumnKeys={[" created", "useremail"]}
       rowKey="id"
       dataSource={data}
       onChange={handleTableChange}
diff --git a/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx b/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
index ee480a694..ed9743c2d 100644
--- a/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
@@ -28,20 +28,6 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const [open, setOpen] = useState(false);
-  const initialValues =
-    data && data.bills_by_pk
-      ? {
-          ...data.bills_by_pk,
-          billlines: (data.bills_by_pk.billlines || []).map((bl) => {
-            const oem = bl.oem_partno || (bl.jobline && bl.jobline.oem_partno) || "";
-            const alt = bl.alt_partno || (bl.jobline && bl.jobline.alt_partno) || "";
-            return {
-              ...bl,
-              oem_partno: `${oem || ""} ${alt ? `(${alt})` : ""}`.trim()
-            };
-          })
-        }
-      : undefined;
 
   const handleFinish = ({ billlines }) => {
     const selectedLines = billlines.filter((l) => l.selected).map((l) => l.id);
@@ -88,9 +74,8 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
         destroyOnHidden
         title={t("bills.actions.return")}
         onOk={() => form.submit()}
-        width={700}
       >
-        <Form initialValues={initialValues} onFinish={handleFinish} form={form}>
+        <Form initialValues={data?.bills_by_pk} onFinish={handleFinish} form={form}>
           <Form.List name={["billlines"]}>
             {(fields) => {
               return (
@@ -110,10 +95,9 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
                         />
                       </td>
                       <td>{t("billlines.fields.line_desc")}</td>
-                      <td>{t("billlines.fields.oem_partno")}</td>
-                      <td style={{ textAlign: "right" }}>{t("billlines.fields.quantity")}</td>
-                      <td style={{ textAlign: "right" }}>{t("billlines.fields.actual_price")}</td>
-                      <td style={{ textAlign: "right" }}>{t("billlines.fields.actual_cost")}</td>
+                      <td>{t("billlines.fields.quantity")}</td>
+                      <td>{t("billlines.fields.actual_price")}</td>
+                      <td>{t("billlines.fields.actual_cost")}</td>
                     </tr>
                   </thead>
                   <tbody>
@@ -143,15 +127,6 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
                           </Form.Item>
                         </td>
                         <td>
-                          <Form.Item
-                            //   label={t("joblines.fields.oem_partno")}
-                            key={`${index}jobline.oem_partno`}
-                            name={[field.name, "oem_partno"]}
-                          >
-                            <ReadOnlyFormItemComponent />
-                          </Form.Item>
-                        </td>
-                        <td style={{ textAlign: "right" }}>
                           <Form.Item
                             //   label={t("joblines.fields.quantity")}
                             key={`${index}quantity`}
@@ -160,7 +135,7 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
                             <ReadOnlyFormItemComponent />
                           </Form.Item>
                         </td>
-                        <td style={{ textAlign: "right" }}>
+                        <td>
                           <Form.Item
                             //   label={t("joblines.fields.actual_price")}
                             key={`${index}actual_price`}
@@ -169,7 +144,7 @@ export function BillDetailEditReturn({ setPartsOrderContext, data, disabled }) {
                             <ReadOnlyFormItemComponent type="currency" />
                           </Form.Item>
                         </td>
-                        <td style={{ textAlign: "right" }}>
+                        <td>
                           <Form.Item
                             //   label={t("joblines.fields.actual_cost")}
                             key={`${index}actual_cost`}
diff --git a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
index 7a224c259..95b380e38 100644
--- a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
@@ -7,8 +7,10 @@ export default function BillDetailEditcontainer() {
   const search = queryString.parse(useLocation().search);
   const history = useNavigate();
 
-  const screens = Grid.useBreakpoint();
-  
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
   const bpoints = {
     xs: "100%",
     sm: "100%",
@@ -17,14 +19,7 @@ export default function BillDetailEditcontainer() {
     xl: "90%",
     xxl: "90%"
   };
-  
-  let drawerPercentage = "100%";
-  if (screens.xxl) drawerPercentage = bpoints.xxl;
-  else if (screens.xl) drawerPercentage = bpoints.xl;
-  else if (screens.lg) drawerPercentage = bpoints.lg;
-  else if (screens.md) drawerPercentage = bpoints.md;
-  else if (screens.sm) drawerPercentage = bpoints.sm;
-  else if (screens.xs) drawerPercentage = bpoints.xs;
+  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
 
   return (
     <Drawer
diff --git a/client/src/components/bill-enter-ai-scan/bill-enter-ai-scan.component.jsx b/client/src/components/bill-enter-ai-scan/bill-enter-ai-scan.component.jsx
deleted file mode 100644
index 453895b59..000000000
--- a/client/src/components/bill-enter-ai-scan/bill-enter-ai-scan.component.jsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import { Button, Tag, Modal, Typography } from "antd";
-import axios from "axios";
-import { useState } from "react";
-import { FaWandMagicSparkles } from "react-icons/fa6";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { useNotification } from "../../contexts/Notifications/notificationContext";
-import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useTranslation } from "react-i18next";
-
-const mapStateToProps = createStructuredSelector({
-  billEnterModal: selectBillEnterModal,
-  bodyshop: selectBodyshop
-});
-
-function BillEnterAiScan({
-  billEnterModal,
-  bodyshop,
-  pollingIntervalRef,
-  setPollingIntervalRef,
-  form,
-  fileInputRef,
-  scanLoading,
-  setScanLoading,
-  setIsAiScan
-}) {
-  const notification = useNotification();
-  const { t } = useTranslation();
-  const [showBetaModal, setShowBetaModal] = useState(false);
-  const BETA_ACCEPTANCE_KEY = "ai_scan_beta_acceptance";
-  const handleBetaAcceptance = () => {
-    localStorage.setItem(BETA_ACCEPTANCE_KEY, "true");
-    setShowBetaModal(false);
-    fileInputRef.current?.click();
-  };
-
-  const checkBetaAcceptance = () => {
-    const hasAccepted = localStorage.getItem(BETA_ACCEPTANCE_KEY);
-    if (hasAccepted) {
-      fileInputRef.current?.click();
-    } else {
-      setShowBetaModal(true);
-    }
-  };
-
-  // Polling function for multipage PDF status
-  const pollJobStatus = async (textractJobId) => {
-    try {
-      const { data } = await axios.get(`/ai/bill-ocr/status/${textractJobId}`);
-
-      if (data.status === "COMPLETED") {
-        // Stop polling
-        if (pollingIntervalRef.current) {
-          clearInterval(pollingIntervalRef.current);
-          setPollingIntervalRef(null);
-        }
-        setScanLoading(false);
-
-        // Update form with the extracted data
-        if (data?.data?.billForm) {
-          form.setFieldsValue(data.data.billForm);
-          await form.validateFields(["billlines"], { recursive: true });
-          notification.success({
-            title: t("bills.labels.ai.scancomplete")
-          });
-        }
-      } else if (data.status === "FAILED") {
-        // Stop polling on failure
-        if (pollingIntervalRef.current) {
-          clearInterval(pollingIntervalRef.current);
-          setPollingIntervalRef(null);
-        }
-        setScanLoading(false);
-
-        notification.error({
-          title: t("bills.labels.ai.scanfailed"),
-          description: data.error || ""
-        });
-      }
-      // If status is IN_PROGRESS, continue polling
-    } catch (error) {
-      // Stop polling on error
-      if (pollingIntervalRef.current) {
-        clearInterval(pollingIntervalRef.current);
-        setPollingIntervalRef(null);
-      }
-      setScanLoading(false);
-
-      notification.error({
-        title: t("bills.labels.ai.scanfailed"),
-        description: error.response?.data?.message || error.message || "Failed to check scan status"
-      });
-    }
-  };
-
-  return (
-    <>
-      <input
-        ref={fileInputRef}
-        type="file"
-        accept="image/*,application/pdf"
-        style={{ display: "none" }}
-        onChange={async (e) => {
-          const file = e.target.files?.[0];
-          if (file) {
-            setScanLoading(true);
-            setIsAiScan(true);
-            const formdata = new FormData();
-            formdata.append("billScan", file);
-            formdata.append("jobid", form.getFieldValue("jobid") || billEnterModal.context.job?.id);
-            formdata.append("bodyshopid", bodyshop.id);
-            formdata.append("partsorderid", billEnterModal.context.parts_order?.id);
-
-            try {
-              const { data, status } = await axios.post("/ai/bill-ocr", formdata);
-
-              // Add the scanned file to the upload field
-              const currentUploads = form.getFieldValue("upload") || [];
-              form.setFieldValue("upload", [
-                ...currentUploads,
-                {
-                  uid: `ai-scan-${Date.now()}`,
-                  name: file.name,
-                  originFileObj: file,
-                  status: "done"
-                }
-              ]);
-              if (status === 202) {
-                // Multipage PDF - start polling
-                notification.info({
-                  title: t("bills.labels.ai.scanstarted"),
-                  description: t("bills.labels.ai.multipage")
-                });
-
-                //Workaround needed to bypass react-compiler error about manipulating refs in child components. Refactor may be needed in the future to clean this up.
-                setPollingIntervalRef(
-                  setInterval(() => {
-                    pollJobStatus(data.textractJobId);
-                  }, 3000)
-                );
-
-                // Initial poll
-                pollJobStatus(data.textractJobId);
-              } else if (status === 200) {
-                // Single page - immediate response
-                setScanLoading(false);
-
-                form.setFieldsValue(data.data.billForm);
-                await form.validateFields(["billlines"], { recursive: true });
-
-                notification.success({
-                  title: t("bills.labels.ai.scancomplete")
-                });
-              }
-            } catch (error) {
-              setScanLoading(false);
-              notification.error({
-                title: t("bills.labels.ai.scanfailed"),
-                description: error.response?.data?.message || error.message || t("bills.labels.ai.generic_failure")
-              });
-            }
-          }
-          // Reset the input so the same file can be selected again
-          e.target.value = "";
-        }}
-      />
-
-      <Button onClick={checkBetaAcceptance} icon={<FaWandMagicSparkles />} loading={scanLoading} disabled={scanLoading}>
-        {scanLoading ? t("bills.labels.ai.processing") : t("bills.labels.ai.scan")}
-        <Tag color="red">{t("general.labels.beta")}</Tag>
-      </Button>
-
-      <Modal
-        title={t("bills.labels.ai.disclaimer_title")}
-        open={showBetaModal}
-        onOk={handleBetaAcceptance}
-        onCancel={() => setShowBetaModal(false)}
-        okText={t("bills.labels.ai.accept_and_continue")}
-        cancelText={t("general.actions.cancel")}
-      >
-        {
-          //This is explicitly not translated.
-        }
-        <Typography.Text>
-          This AI scanning feature is currently in <strong>beta</strong>. While it can accelerate data entry, you{" "}
-          <strong>must carefully review all extracted results</strong> for accuracy.
-        </Typography.Text>
-        <Typography.Text>The AI may make mistakes or miss information. Always verify:</Typography.Text>
-        <ul>
-          <li>All line items and quantities</li>
-          <li>Prices and totals</li>
-          <li>Part numbers and descriptions</li>
-          <li>Any other critical invoice details</li>
-        </ul>
-        <Typography.Text>
-          By continuing, you acknowledge that you will review and verify all AI-generated data before posting.
-        </Typography.Text>
-      </Modal>
-    </>
-  );
-}
-export default connect(mapStateToProps, null)(BillEnterAiScan);
diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index a73b19663..f3bfe6fab 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -2,11 +2,10 @@ import { useApolloClient, useMutation } from "@apollo/client/react";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import { Button, Checkbox, Form, Modal, Space } from "antd";
 import _ from "lodash";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { INSERT_NEW_BILL } from "../../graphql/bills.queries";
 import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
@@ -22,12 +21,12 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import confirmDialog from "../../utils/asyncConfirm";
 import useLocalStorage from "../../utils/useLocalStorage";
-import BillEnterAiScan from "../bill-enter-ai-scan/bill-enter-ai-scan.component.jsx";
 import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
-import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -51,20 +50,15 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
   const [updatePartsOrderLines] = useMutation(MUTATION_MARK_RETURN_RECEIVED);
   const [updateInventoryLines] = useMutation(UPDATE_INVENTORY_LINES);
   const [loading, setLoading] = useState(false);
-  const [scanLoading, setScanLoading] = useState(false);
-  const [isAiScan, setIsAiScan] = useState(false);
   const client = useApolloClient();
   const [generateLabel, setGenerateLabel] = useLocalStorage("enter_bill_generate_label", false);
   const notification = useNotification();
-  const fileInputRef = useRef(null);
-  const pollingIntervalRef = useRef(null);
-  const formTopRef = useRef(null);
 
   const {
-    treatments: { Enhanced_Payroll, Imgproxy, Bill_OCR_AI }
+    treatments: { Enhanced_Payroll, Imgproxy }
   } = useTreatmentsWithConfig({
     attributes: {},
-    names: ["Enhanced_Payroll", "Imgproxy", "Bill_OCR_AI"],
+    names: ["Enhanced_Payroll", "Imgproxy"],
     splitKey: bodyshop.imexshopid
   });
 
@@ -119,8 +113,6 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
                     create_ppc,
                     // eslint-disable-next-line no-unused-vars
                     original_actual_price,
-                    // eslint-disable-next-line no-unused-vars
-                    confidence,
                     ...restI
                   } = i;
 
@@ -386,7 +378,6 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
         vendorid: values.vendorid,
         billlines: []
       });
-      setIsAiScan(false);
       // form.resetFields();
     } else {
       toggleModalVisible();
@@ -397,22 +388,10 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
   const handleCancel = () => {
     const r = window.confirm(t("general.labels.cancel"));
     if (r === true) {
-      // Clean up polling on cancel
-      if (pollingIntervalRef.current) {
-        clearInterval(pollingIntervalRef.current);
-        pollingIntervalRef.current = null;
-      }
-      setScanLoading(false);
-      setIsAiScan(false);
       toggleModalVisible();
     }
   };
 
-  //Workaround needed to bypass react-compiler error about manipulating refs in child components. Refactor may be needed in the future to clean this up.
-  const setPollingIntervalRef = (func) => {
-    pollingIntervalRef.current = func;
-  };
-
   useEffect(() => {
     if (enterAgain) form.submit();
   }, [enterAgain, form]);
@@ -422,44 +401,12 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
       form.setFieldsValue(formValues);
     } else {
       form.resetFields();
-      // Clean up polling on modal close
-      if (pollingIntervalRef.current) {
-        clearInterval(pollingIntervalRef.current);
-        pollingIntervalRef.current = null;
-      }
-      setScanLoading(false);
-      setIsAiScan(false);
     }
   }, [billEnterModal.open, form, formValues]);
 
-  // Cleanup on unmount
-  useEffect(() => {
-    return () => {
-      if (pollingIntervalRef.current) {
-        clearInterval(pollingIntervalRef.current);
-        pollingIntervalRef.current = null;
-      }
-    };
-  }, []);
-
   return (
     <Modal
-      title={
-        <Space size="large">
-          {t("bills.labels.new")}
-          {Bill_OCR_AI.treatment === "on" && (
-            <BillEnterAiScan
-              fileInputRef={fileInputRef}
-              form={form}
-              pollingIntervalRef={pollingIntervalRef}
-              setPollingIntervalRef={setPollingIntervalRef}
-              scanLoading={scanLoading}
-              setScanLoading={setScanLoading}
-              setIsAiScan={setIsAiScan}
-            />
-          )}
-        </Space>
-      }
+      title={t("bills.labels.new")}
       width={"98%"}
       open={billEnterModal.open}
       okText={t("general.actions.save")}
@@ -500,25 +447,13 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
         autoComplete={"off"}
         layout="vertical"
         form={form}
-        onFinishFailed={(errorInfo) => {
+        onFinishFailed={() => {
           setEnterAgain(false);
-          // Scroll to the top of the form to show validation errors
-          if (errorInfo.errorFields && errorInfo.errorFields.length > 0) {
-            setTimeout(() => {
-              formTopRef.current?.scrollIntoView({ behavior: "smooth", block: "start" });
-            }, 100);
-          }
         }}
       >
-        <div ref={formTopRef}>
-          <RbacWrapper action="bills:enter">
-            <BillFormContainer
-              form={form}
-              isAiScan={isAiScan}
-              disableInvNumber={billEnterModal.context.disableInvNumber}
-            />
-          </RbacWrapper>
-        </div>
+        <RbacWrapper action="bills:enter">
+          <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
+        </RbacWrapper>
       </Form>
     </Modal>
   );
diff --git a/client/src/components/bill-form-lines-extended/bill-form-lines-extended.component.jsx b/client/src/components/bill-form-lines-extended/bill-form-lines-extended.component.jsx
index 3ec7508ab..4ef00afb1 100644
--- a/client/src/components/bill-form-lines-extended/bill-form-lines-extended.component.jsx
+++ b/client/src/components/bill-form-lines-extended/bill-form-lines-extended.component.jsx
@@ -1,5 +1,4 @@
-import { Form, Input } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Form, Input, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -109,14 +108,7 @@ export default function BillFormLinesExtended({ lineData, discount, form, respon
     <Form.Item noStyle name="billlineskeys">
       <button onClick={() => console.log(form.getFieldsValue())}>form</button>
       <Input onChange={(e) => setSearch(e.target.value)} allowClear />
-      <ResponsiveTable
-        pagination={false}
-        size="small"
-        columns={columns}
-        mobileColumnKeys={["line_desc", "oem_partno", "part_type", "act_price"]}
-        rowKey="id"
-        dataSource={data}
-      />
+      <Table pagination={false} size="small" columns={columns} rowKey="id" dataSource={data} />
     </Form.Item>
   );
 }
diff --git a/client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx b/client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx
index 479b1fa50..cf8104606 100644
--- a/client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx
+++ b/client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx
@@ -99,22 +99,20 @@ export function BillFormItemsExtendedFormItem({
         }}
       </Form.Item>
       <Form.Item label={t("billlines.fields.cost_center")} name={["billlineskeys", record.id, "cost_center"]}>
-        <Select 
-          showSearch 
-          style={{ minWidth: "3rem" }} 
-          disabled={disabled}
-          options={
-            bodyshopHasDmsKey(bodyshop)
-              ? CiecaSelect(true, false)
-              : responsibilityCenters.costs.map((item) => ({ value: item.name, label: item.name }))
-          }
-        />
+        <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
+          {bodyshopHasDmsKey(bodyshop)
+            ? CiecaSelect(true, false)
+            : responsibilityCenters.costs.map((item) => <Select.Option key={item.name}>{item.name}</Select.Option>)}
+        </Select>
       </Form.Item>
       <Form.Item label={t("billlines.fields.location")} name={["billlineskeys", record.id, "location"]}>
-        <Select 
-          disabled={disabled}
-          options={bodyshop.md_parts_locations.map((loc) => ({ value: loc, label: loc }))}
-        />
+        <Select disabled={disabled}>
+          {bodyshop.md_parts_locations.map((loc, idx) => (
+            <Select.Option key={idx} value={loc}>
+              {loc}
+            </Select.Option>
+          ))}
+        </Select>
       </Form.Item>
       <Form.Item
         label={t("billlines.fields.deductedfromlbr")}
@@ -138,10 +136,22 @@ export function BillFormItemsExtendedFormItem({
                   ]}
                   name={["billlineskeys", record.id, "lbr_adjustment", "mod_lbr_ty"]}
                 >
-                  <Select 
-                    allowClear
-                    options={CiecaSelect(false, true)}
-                  />
+                  <Select allowClear>
+                    <Select.Option value="LAA">{t("joblines.fields.lbr_types.LAA")}</Select.Option>
+                    <Select.Option value="LAB">{t("joblines.fields.lbr_types.LAB")}</Select.Option>
+                    <Select.Option value="LAD">{t("joblines.fields.lbr_types.LAD")}</Select.Option>
+                    <Select.Option value="LAE">{t("joblines.fields.lbr_types.LAE")}</Select.Option>
+                    <Select.Option value="LAF">{t("joblines.fields.lbr_types.LAF")}</Select.Option>
+                    <Select.Option value="LAG">{t("joblines.fields.lbr_types.LAG")}</Select.Option>
+                    <Select.Option value="LAM">{t("joblines.fields.lbr_types.LAM")}</Select.Option>
+                    <Select.Option value="LAR">{t("joblines.fields.lbr_types.LAR")}</Select.Option>
+                    <Select.Option value="LAS">{t("joblines.fields.lbr_types.LAS")}</Select.Option>
+                    <Select.Option value="LAU">{t("joblines.fields.lbr_types.LAU")}</Select.Option>
+                    <Select.Option value="LA1">{t("joblines.fields.lbr_types.LA1")}</Select.Option>
+                    <Select.Option value="LA2">{t("joblines.fields.lbr_types.LA2")}</Select.Option>
+                    <Select.Option value="LA3">{t("joblines.fields.lbr_types.LA3")}</Select.Option>
+                    <Select.Option value="LA4">{t("joblines.fields.lbr_types.LA4")}</Select.Option>
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("jobs.labels.adjustmentrate")}
diff --git a/client/src/components/bill-form/bill-form.component.jsx b/client/src/components/bill-form/bill-form.component.jsx
index 86d4e0265..51ce7bee1 100644
--- a/client/src/components/bill-form/bill-form.component.jsx
+++ b/client/src/components/bill-form/bill-form.component.jsx
@@ -8,15 +8,12 @@ import { MdOpenInNew } from "react-icons/md";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { CHECK_BILL_INVOICE_NUMBER } from "../../graphql/bills.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import AlertComponent from "../alert/alert.component";
 import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
-import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelect from "../job-search-select/job-search-select.component";
@@ -24,6 +21,8 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import BillFormLines from "./bill-form.lines.component";
 import { CalculateBillTotal } from "./bill-form.totals.utility";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
+import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -44,14 +43,11 @@ export function BillFormComponent({
   loadOutstandingReturns,
   loadInventory,
   preferredMake,
-  disableInHouse,
-  isAiScan
+  disableInHouse
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
   const [discount, setDiscount] = useState(0);
-  const notification = useNotification();
-  const jobIdFormWatch = Form.useWatch("jobid", form);
 
   const {
     treatments: { Extended_Bill_Posting, ClosingPeriod }
@@ -127,23 +123,6 @@ export function BillFormComponent({
     bodyshop.inhousevendorid
   ]);
 
-  useEffect(() => {
-    // When the jobid is set by AI scan, we need to reload the lines. This prevents having to hoist the apollo query.
-    if (jobIdFormWatch !== null) {
-      if (form.getFieldValue("jobid") !== null && form.getFieldValue("jobid") !== undefined) {
-        loadLines({ variables: { id: form.getFieldValue("jobid") } });
-        if (form.getFieldValue("vendorid") !== null && form.getFieldValue("vendorid") !== undefined) {
-          loadOutstandingReturns({
-            variables: {
-              jobId: form.getFieldValue("jobid"),
-              vendorId: form.getFieldValue("vendorid")
-            }
-          });
-        }
-      }
-    }
-  }, [jobIdFormWatch, form]);
-
   return (
     <div>
       <FormFieldsChanged form={form} />
@@ -349,12 +328,13 @@ export function BillFormComponent({
         </Form.Item>
         {!billEdit && (
           <Form.Item label={t("bills.fields.allpartslocation")} name="location">
-            <Select 
-              style={{ width: "10rem" }} 
-              disabled={disabled} 
-              allowClear
-              options={bodyshop.md_parts_locations.map((loc) => ({ value: loc, label: loc }))}
-            />
+            <Select style={{ width: "10rem" }} disabled={disabled} allowClear>
+              {bodyshop.md_parts_locations.map((loc, idx) => (
+                <Select.Option key={idx} value={loc}>
+                  {loc}
+                </Select.Option>
+              ))}
+            </Select>
           </Form.Item>
         )}
       </LayoutFormRow>
@@ -394,15 +374,7 @@ export function BillFormComponent({
             ]);
             let totals;
             if (!!values.total && !!values.billlines && values.billlines.length > 0) {
-              try {
-                totals = CalculateBillTotal(values);
-              } catch (error) {
-                notification.error({
-                  title: t("bills.errors.calculating_totals"),
-                  message: error.message || t("bills.errors.calculating_totals_generic"),
-                  key: "bill_totals_calculation_error"
-                });
-              }
+              totals = CalculateBillTotal(values);
             }
 
             if (totals) {
@@ -480,7 +452,6 @@ export function BillFormComponent({
           responsibilityCenters={responsibilityCenters}
           disabled={disabled}
           billEdit={billEdit}
-          isAiScan={isAiScan}
         />
       )}
       <Divider titlePlacement="left" style={{ display: billEdit ? "none" : null }}>
diff --git a/client/src/components/bill-form/bill-form.container.jsx b/client/src/components/bill-form/bill-form.container.jsx
index ab52f5459..c1175c94f 100644
--- a/client/src/components/bill-form/bill-form.container.jsx
+++ b/client/src/components/bill-form/bill-form.container.jsx
@@ -15,7 +15,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 
-export function BillFormContainer({ bodyshop, form, billEdit, disabled, disableInvNumber, disableInHouse,isAiScan }) {
+export function BillFormContainer({ bodyshop, form, billEdit, disabled, disableInvNumber, disableInHouse }) {
   const {
     treatments: { Simple_Inventory }
   } = useTreatmentsWithConfig({
@@ -50,7 +50,6 @@ export function BillFormContainer({ bodyshop, form, billEdit, disabled, disableI
         loadOutstandingReturns={loadOutstandingReturns}
         loadInventory={loadInventory}
         preferredMake={lineData ? lineData.jobs_by_pk.v_make_desc : null}
-        isAiScan={isAiScan}
       />
       {!billEdit && <BillCmdReturnsTableComponent form={form} returnLoading={returnLoading} returnData={returnData} />}
       {Simple_Inventory.treatment === "on" && (
diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index b9c41074c..884d06f72 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -5,15 +5,14 @@ import { useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectDarkMode } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectDarkMode } from "../../redux/application/application.selectors";
 import CiecaSelect from "../../utils/Ciecaselect";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component";
 import BilllineAddInventory from "../billline-add-inventory/billline-add-inventory.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
-import ConfidenceDisplay from "./bill-form.lines.confidence.component.jsx";
+import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -30,8 +29,7 @@ export function BillEnterModalLinesComponent({
   discount,
   form,
   responsibilityCenters,
-  billEdit,
-  isAiScan
+  billEdit
 }) {
   const { t } = useTranslation();
   const { setFieldsValue, getFieldsValue, getFieldValue } = form;
@@ -141,29 +139,6 @@ export function BillEnterModalLinesComponent({
 
   const columns = (remove) => {
     return [
-      ...(isAiScan
-        ? [
-            {
-              title: t("billlines.fields.confidence"),
-              dataIndex: "confidence",
-              editable: true,
-              width: "5rem",
-              formItemProps: (field) => ({
-                key: `${field.index}confidence`,
-                name: [field.name, "confidence"],
-                label: t("billlines.fields.confidence")
-              }),
-              formInput: (record) => {
-                const rowValue = getFieldValue(["billlines", record.name]);
-                return (
-                  <div style={{ display: "flex", alignItems: "center", justifyContent: "center" }}>
-                    <ConfidenceDisplay rowValue={rowValue} />
-                  </div>
-                );
-              }
-            }
-          ]
-        : []),
       {
         title: t("billlines.fields.jobline"),
         dataIndex: "joblineid",
@@ -237,7 +212,6 @@ export function BillEnterModalLinesComponent({
         }),
         formInput: () => <Input.TextArea disabled={disabled} autoSize tabIndex={0} />
       },
-
       {
         title: t("billlines.fields.quantity"),
         dataIndex: "quantity",
@@ -276,16 +250,7 @@ export function BillEnterModalLinesComponent({
           key: `${field.name}actual_price`,
           name: [field.name, "actual_price"],
           label: t("billlines.fields.actual_price"),
-          rules: [
-            { required: true },
-            {
-              validator: (_, value) => {
-                return Math.abs(parseFloat(value)) < 0.01 ? Promise.reject() : Promise.resolve();
-              },
-              warningOnly: true
-            }
-          ],
-          hasFeedback: true
+          rules: [{ required: true }]
         }),
         formInput: (record, index) => (
           <CurrencyInput
@@ -434,17 +399,11 @@ export function BillEnterModalLinesComponent({
           rules: [{ required: true }]
         }),
         formInput: () => (
-          <Select 
-            showSearch 
-            style={{ minWidth: "3rem" }} 
-            disabled={disabled}
-            tabIndex={0}
-            options={
-              bodyshopHasDmsKey(bodyshop)
-                ? CiecaSelect(true, false)
-                : responsibilityCenters.costs.map((item) => ({ value: item.name, label: item.name }))
-            }
-          />
+          <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled} tabIndex={0}>
+            {bodyshopHasDmsKey(bodyshop)
+              ? CiecaSelect(true, false)
+              : responsibilityCenters.costs.map((item) => <Select.Option key={item.name}>{item.name}</Select.Option>)}
+          </Select>
         )
       },
       ...(billEdit
@@ -460,11 +419,13 @@ export function BillEnterModalLinesComponent({
                 name: [field.name, "location"]
               }),
               formInput: () => (
-                <Select 
-                  disabled={disabled}
-                  tabIndex={0}
-                  options={bodyshop.md_parts_locations.map((loc) => ({ value: loc, label: loc }))}
-                />
+                <Select disabled={disabled} tabIndex={0}>
+                  {bodyshop.md_parts_locations.map((loc, idx) => (
+                    <Select.Option key={idx} value={loc}>
+                      {loc}
+                    </Select.Option>
+                  ))}
+                </Select>
               )
             }
           ]),
@@ -505,10 +466,22 @@ export function BillEnterModalLinesComponent({
                       rules={[{ required: true }]}
                       name={[record.name, "lbr_adjustment", "mod_lbr_ty"]}
                     >
-                      <Select 
-                        allowClear
-                        options={CiecaSelect(false, true)}
-                      />
+                      <Select allowClear>
+                        <Select.Option value="LAA">{t("joblines.fields.lbr_types.LAA")}</Select.Option>
+                        <Select.Option value="LAB">{t("joblines.fields.lbr_types.LAB")}</Select.Option>
+                        <Select.Option value="LAD">{t("joblines.fields.lbr_types.LAD")}</Select.Option>
+                        <Select.Option value="LAE">{t("joblines.fields.lbr_types.LAE")}</Select.Option>
+                        <Select.Option value="LAF">{t("joblines.fields.lbr_types.LAF")}</Select.Option>
+                        <Select.Option value="LAG">{t("joblines.fields.lbr_types.LAG")}</Select.Option>
+                        <Select.Option value="LAM">{t("joblines.fields.lbr_types.LAM")}</Select.Option>
+                        <Select.Option value="LAR">{t("joblines.fields.lbr_types.LAR")}</Select.Option>
+                        <Select.Option value="LAS">{t("joblines.fields.lbr_types.LAS")}</Select.Option>
+                        <Select.Option value="LAU">{t("joblines.fields.lbr_types.LAU")}</Select.Option>
+                        <Select.Option value="LA1">{t("joblines.fields.lbr_types.LA1")}</Select.Option>
+                        <Select.Option value="LA2">{t("joblines.fields.lbr_types.LA2")}</Select.Option>
+                        <Select.Option value="LA3">{t("joblines.fields.lbr_types.LA3")}</Select.Option>
+                        <Select.Option value="LA4">{t("joblines.fields.lbr_types.LA4")}</Select.Option>
+                      </Select>
                     </Form.Item>
 
                     {Enhanced_Payroll.treatment === "on" ? (
diff --git a/client/src/components/bill-form/bill-form.lines.confidence.component.jsx b/client/src/components/bill-form/bill-form.lines.confidence.component.jsx
deleted file mode 100644
index 4fb0b50f8..000000000
--- a/client/src/components/bill-form/bill-form.lines.confidence.component.jsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { Progress, Space, Tag, Tooltip } from "antd";
-import { useTranslation } from "react-i18next";
-const parseConfidence = (confidenceStr) => {
-  if (!confidenceStr || typeof confidenceStr !== "string") return null;
-
-  const match = confidenceStr.match(/T([\d.]+)\s*-\s*O([\d.]+)\s*-\s*J([\d.]+)/);
-  if (!match) return null;
-
-  return {
-    total: parseFloat(match[1]),
-    ocr: parseFloat(match[2]),
-    jobMatch: parseFloat(match[3])
-  };
-};
-
-const getConfidenceColor = (value) => {
-  if (value >= 80) return "green";
-  if (value >= 60) return "orange";
-  if (value >= 40) return "gold";
-  return "red";
-};
-
-const ConfidenceDisplay = ({ rowValue: { confidence, actual_price, actual_cost } }) => {
-  const { t } = useTranslation();
-  const parsed = parseConfidence(confidence);
-  const parsed_actual_price = parseFloat(actual_price);
-  const parsed_actual_cost = parseFloat(actual_cost);
-  if (!parsed) {
-    return <span style={{ color: "#959595", fontSize: "0.85em" }}>N/A</span>;
-  }
-
-  const { total, ocr, jobMatch } = parsed;
-  const color = getConfidenceColor(total);
-
-  return (
-    <Tooltip
-      title={
-        <div style={{ padding: "4px 0" }}>
-          <div style={{ marginBottom: 8, fontWeight: 600 }}>{t("bills.labels.ai.confidence.breakdown")}</div>
-          <div style={{ marginBottom: 4 }}>
-            <strong>{t("bills.labels.ai.confidence.overall")}:</strong> {total.toFixed(1)}%
-            <Progress
-              percent={total}
-              size="small"
-              strokeColor={getConfidenceColor(total)}
-              showInfo={false}
-              style={{ marginTop: 2 }}
-            />
-          </div>
-          <div style={{ marginBottom: 4 }}>
-            <strong>{t("bills.labels.ai.confidence.ocr")}:</strong> {ocr.toFixed(1)}%
-            <Progress
-              percent={ocr}
-              size="small"
-              strokeColor={getConfidenceColor(ocr)}
-              showInfo={false}
-              style={{ marginTop: 2 }}
-            />
-          </div>
-          <div>
-            <strong>{t("bills.labels.ai.confidence.match")}:</strong> {jobMatch.toFixed(1)}%
-            <Progress
-              percent={jobMatch}
-              size="small"
-              strokeColor={getConfidenceColor(jobMatch)}
-              showInfo={false}
-              style={{ marginTop: 2 }}
-            />
-          </div>
-        </div>
-      }
-    >
-      <Space size="small">
-        {!parsed_actual_cost || !parsed_actual_price || parsed_actual_cost === 0 || parsed_actual_price === 0 ? (
-          <Tag color="red" style={{ margin: 0, cursor: "help", userSelect: "none" }}>
-            {t("bills.labels.ai.confidence.missing_data")}
-          </Tag>
-        ) : null}
-        <Tag color={color} style={{ margin: 0, cursor: "help", userSelect: "none" }}>
-          {total.toFixed(0)}%
-        </Tag>
-      </Space>
-    </Tooltip>
-  );
-};
-
-export default ConfidenceDisplay;
diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx
index 7f4ab5149..283949d91 100644
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -1,5 +1,5 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Checkbox, Input, Space } from "antd";
+import { Button, Card, Checkbox, Input, Space, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaTasks } from "react-icons/fa";
@@ -18,7 +18,6 @@ import BillDetailEditReturnComponent from "../bill-detail-edit/bill-detail-edit-
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import LockerWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -238,13 +237,12 @@ export function BillsListTableComponent({
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={billsQuery.loading}
         scroll={{
           x: true // y: "50rem"
         }}
         columns={columns}
-        mobileColumnKeys={["vendorname", "invoice_number", "date", "total", "actions"]}
         rowKey="id"
         dataSource={hasBillsAccess ? filteredBills : []}
         onChange={handleTableChange}
diff --git a/client/src/components/bills-vendors-list/bills-vendors-list.component.jsx b/client/src/components/bills-vendors-list/bills-vendors-list.component.jsx
index 4034857de..f08db420e 100644
--- a/client/src/components/bills-vendors-list/bills-vendors-list.component.jsx
+++ b/client/src/components/bills-vendors-list/bills-vendors-list.component.jsx
@@ -3,8 +3,7 @@ import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { useQuery } from "@apollo/client/react";
 import queryString from "query-string";
 import { useLocation, useNavigate } from "react-router-dom";
-import { Input } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Input, Table } from "antd";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
@@ -80,7 +79,7 @@ export default function BillsVendorsList() {
     : (data && data.vendors) || [];
 
   return (
-    <ResponsiveTable
+    <Table
       loading={loading}
       title={() => {
         return (
@@ -92,7 +91,6 @@ export default function BillsVendorsList() {
       dataSource={dataSource}
       pagination={{ placement: "top" }}
       columns={columns}
-      mobileColumnKeys={["name", "cost_center", "city"]}
       rowKey="id"
       onChange={handleTableChange}
       rowSelection={{
diff --git a/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx b/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
index 5849b2146..e9dc14b07 100644
--- a/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
+++ b/client/src/components/chat-tag-ro/chat-tag-ro.component.jsx
@@ -19,12 +19,13 @@ export default function ChatTagRoComponent({ roOptions, loading, handleSearch, h
           placeholder={t("general.labels.search")}
           onSelect={handleInsertTag}
           notFoundContent={loading ? <LoadingOutlined /> : <Empty />}
-          options={roOptions.map((item, idx) => ({
-            key: item.id || idx,
-            value: item.id || idx,
-            label: ` ${item.ro_number || ""} | ${OwnerNameDisplayFunction(item)}`
-          }))}
-        />
+        >
+          {roOptions.map((item, idx) => (
+            <Select.Option key={item.id || idx}>
+              {` ${item.ro_number || ""} | ${OwnerNameDisplayFunction(item)}`}
+            </Select.Option>
+          ))}
+        </Select>
       </div>
       {loading ? <LoadingOutlined /> : null}
 
diff --git a/client/src/components/contract-cars/contract-cars.component.jsx b/client/src/components/contract-cars/contract-cars.component.jsx
index 814017d9f..f43ac2945 100644
--- a/client/src/components/contract-cars/contract-cars.component.jsx
+++ b/client/src/components/contract-cars/contract-cars.component.jsx
@@ -1,5 +1,4 @@
-import { Card, Input } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Card, Input, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
@@ -104,11 +103,10 @@ export default function ContractsCarsComponent({ loading, data, selectedCarId, h
         />
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["status", "fleetnumber", "readiness", "year"]}
         rowKey="id"
         dataSource={filteredData}
         onChange={handleTableChange}
diff --git a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
index 015b70bbb..3b60b73e5 100644
--- a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
+++ b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
@@ -309,13 +309,13 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
             }
           ]}
         >
-          <Select
-            options={bodyshop.md_ins_cos.map((s) => ({
-              key: s.name,
-              value: s.name,
-              label: s.name
-            }))}
-          />
+          <Select>
+            {bodyshop.md_ins_cos.map((s) => (
+              <Select.Option key={s.name} value={s.name}>
+                {s.name}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           name={"class"}
@@ -327,13 +327,13 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
             }
           ]}
         >
-          <Select
-            options={bodyshop.md_classes.map((s) => ({
-              key: s,
-              value: s,
-              label: s
-            }))}
-          />
+          <Select>
+            {bodyshop.md_classes.map((s) => (
+              <Select.Option key={s} value={s}>
+                {s}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("contracts.labels.convertform.applycleanupcharge")}
diff --git a/client/src/components/contract-jobs/contract-jobs.component.jsx b/client/src/components/contract-jobs/contract-jobs.component.jsx
index b6b838e52..398fcac82 100644
--- a/client/src/components/contract-jobs/contract-jobs.component.jsx
+++ b/client/src/components/contract-jobs/contract-jobs.component.jsx
@@ -1,5 +1,4 @@
-import { Card, Input } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Card, Input, Table } from "antd";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
@@ -128,11 +127,10 @@ export default function ContractsJobsComponent({ loading, data, selectedJob, han
         />
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ placement: "top", defaultPageSize: pageLimit, defaultCurrent: defaultCurrent }}
         columns={columns}
-        mobileColumnKeys={["ro_number", "owner", "status", "vehicle", "plate_no"]}
         rowKey="id"
         dataSource={filteredData}
         onChange={handleTableChange}
diff --git a/client/src/components/contract-status-select/contract-status-select.component.jsx b/client/src/components/contract-status-select/contract-status-select.component.jsx
index 29c59c210..a02664f6c 100644
--- a/client/src/components/contract-status-select/contract-status-select.component.jsx
+++ b/client/src/components/contract-status-select/contract-status-select.component.jsx
@@ -2,6 +2,8 @@ import { useEffect, useState } from "react";
 import { Select } from "antd";
 import { useTranslation } from "react-i18next";
 
+const { Option } = Select;
+
 const ContractStatusComponent = ({ value, onChange, ref }) => {
   const [option, setOption] = useState(value);
   const { t } = useTranslation();
@@ -13,17 +15,11 @@ const ContractStatusComponent = ({ value, onChange, ref }) => {
   }, [value, option, onChange]);
 
   return (
-    <Select
-      ref={ref}
-      value={option}
-      style={{ width: 100 }}
-      onChange={setOption}
-      options={[
-        { value: "contracts.status.new", label: t("contracts.status.new") },
-        { value: "contracts.status.out", label: t("contracts.status.out") },
-        { value: "contracts.status.returned", label: t("contracts.status.out") }
-      ]}
-    />
+    <Select ref={ref} value={option} style={{ width: 100 }} onChange={setOption}>
+      <Option value="contracts.status.new">{t("contracts.status.new")}</Option>
+      <Option value="contracts.status.out">{t("contracts.status.out")}</Option>
+      <Option value="contracts.status.returned">{t("contracts.status.out")}</Option>
+    </Select>
   );
 };
 
diff --git a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
index faa73c46c..c1185613a 100644
--- a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
+++ b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
@@ -1,6 +1,5 @@
 import { useLazyQuery } from "@apollo/client/react";
-import { Button, Form, Modal } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Form, Modal, Table } from "antd";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -65,7 +64,7 @@ export function ContractsFindModalContainer({ contractFinderModal, toggleModalVi
           {t("general.labels.search")}
         </Button>
         {error && <AlertComponent type="error" title={JSON.stringify(error)} />}
-        <ResponsiveTable
+        <Table
           loading={loading}
           columns={[
             {
@@ -125,7 +124,6 @@ export function ContractsFindModalContainer({ contractFinderModal, toggleModalVi
               render: (text, record) => <DateTimeFormatter>{record.actualreturn}</DateTimeFormatter>
             }
           ]}
-          mobileColumnKeys={["agreementnumber", "job.ro_number", "driver_ln", "status"]}
           rowKey="id"
           dataSource={data?.cccontracts}
         />
diff --git a/client/src/components/contracts-list/contracts-list.component.jsx b/client/src/components/contracts-list/contracts-list.component.jsx
index 28195bf13..313393245 100644
--- a/client/src/components/contracts-list/contracts-list.component.jsx
+++ b/client/src/components/contracts-list/contracts-list.component.jsx
@@ -1,5 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space, Typography } from "antd";
+import { Button, Card, Input, Space, Table, Typography } from "antd";
 import queryString from "query-string";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -14,7 +14,6 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { pageLimit } from "../../utils/config";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -171,14 +170,13 @@ export function ContractsList({ bodyshop, loading, contracts, refetch, total, se
       }
     >
       <ContractsFindModalContainer />
-      <ResponsiveTable
+      <Table
         loading={loading}
         scroll={{
           x: "50%" //y: "40rem"
         }}
         pagination={{ placement: "top", pageSize: pageLimit, current: parseInt(page || 1, 10), total: total }}
         columns={columns}
-        mobileColumnKeys={["agreementnumber", "driver_ln", "status", "scheduledreturn"]}
         rowKey="id"
         dataSource={contracts}
         onChange={handleTableChange}
diff --git a/client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx b/client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx
index 69e68c043..e57c0f1a8 100644
--- a/client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx
+++ b/client/src/components/courtesy-car-contract-list/courtesy-car-contract-list.component.jsx
@@ -1,5 +1,4 @@
-import { Card } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Card, Table } from "antd";
 import queryString from "query-string";
 import { useTranslation } from "react-i18next";
 import { Link, useLocation, useNavigate } from "react-router-dom";
@@ -74,11 +73,10 @@ export default function CourtesyCarContractListComponent({ contracts, totalContr
 
   return (
     <Card title={t("menus.header.courtesycars-contracts")}>
-      <ResponsiveTable
+      <Table
         scroll={{ x: true }}
         pagination={{ placement: "top", pageSize: pageLimit, current: parseInt(page || 1), total: totalContracts }}
         columns={columns}
-        mobileColumnKeys={["agreementnumber", "driver_ln", "status", "job.ro_number"]}
         rowKey="id"
         dataSource={contracts}
         onChange={handleTableChange}
diff --git a/client/src/components/courtesy-car-readiness-select/courtesy-car-readiness-select.component.jsx b/client/src/components/courtesy-car-readiness-select/courtesy-car-readiness-select.component.jsx
index 5bec4a7f0..eea8819d8 100644
--- a/client/src/components/courtesy-car-readiness-select/courtesy-car-readiness-select.component.jsx
+++ b/client/src/components/courtesy-car-readiness-select/courtesy-car-readiness-select.component.jsx
@@ -2,6 +2,8 @@ import { Select } from "antd";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 
+const { Option } = Select;
+
 const CourtesyCarReadinessComponent = ({ value, onChange, ref }) => {
   const [option, setOption] = useState(value);
   const { t } = useTranslation();
@@ -21,11 +23,10 @@ const CourtesyCarReadinessComponent = ({ value, onChange, ref }) => {
         width: 100
       }}
       onChange={setOption}
-      options={[
-        { value: "courtesycars.readiness.ready", label: t("courtesycars.readiness.ready") },
-        { value: "courtesycars.readiness.notready", label: t("courtesycars.readiness.notready") }
-      ]}
-    />
+    >
+      <Option value="courtesycars.readiness.ready">{t("courtesycars.readiness.ready")}</Option>
+      <Option value="courtesycars.readiness.notready">{t("courtesycars.readiness.notready")}</Option>
+    </Select>
   );
 };
 export default CourtesyCarReadinessComponent;
diff --git a/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx b/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx
index f31fb4529..31f0216de 100644
--- a/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx
+++ b/client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx
@@ -2,6 +2,8 @@ import { useEffect, useState } from "react";
 import { Select } from "antd";
 import { useTranslation } from "react-i18next";
 
+const { Option } = Select;
+
 const CourtesyCarStatusComponent = ({ value, onChange, ref }) => {
   const [option, setOption] = useState(value);
   const { t } = useTranslation();
@@ -20,15 +22,14 @@ const CourtesyCarStatusComponent = ({ value, onChange, ref }) => {
         width: 100
       }}
       onChange={setOption}
-      options={[
-        { value: "courtesycars.status.in", label: t("courtesycars.status.in") },
-        { value: "courtesycars.status.inservice", label: t("courtesycars.status.inservice") },
-        { value: "courtesycars.status.out", label: t("courtesycars.status.out") },
-        { value: "courtesycars.status.sold", label: t("courtesycars.status.sold") },
-        { value: "courtesycars.status.leasereturn", label: t("courtesycars.status.leasereturn") },
-        { value: "courtesycars.status.unavailable", label: t("courtesycars.status.unavailable") }
-      ]}
-    />
+    >
+      <Option value="courtesycars.status.in">{t("courtesycars.status.in")}</Option>
+      <Option value="courtesycars.status.inservice">{t("courtesycars.status.inservice")}</Option>
+      <Option value="courtesycars.status.out">{t("courtesycars.status.out")}</Option>
+      <Option value="courtesycars.status.sold">{t("courtesycars.status.sold")}</Option>
+      <Option value="courtesycars.status.leasereturn">{t("courtesycars.status.leasereturn")}</Option>
+      <Option value="courtesycars.status.unavailable">{t("courtesycars.status.unavailable")}</Option>
+    </Select>
   );
 };
 export default CourtesyCarStatusComponent;
diff --git a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
index 48f3ba526..9b43ed83d 100644
--- a/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
+++ b/client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
@@ -1,6 +1,5 @@
 import { SyncOutlined, WarningFilled } from "@ant-design/icons";
-import { Button, Card, Dropdown, Input, Space, Tooltip } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Dropdown, Input, Space, Table, Tooltip } from "antd";
 import dayjs from "../../utils/day";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -276,11 +275,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["status", "fleetnumber", "vin", "readiness"]}
         rowKey="id"
         dataSource={tableData}
         onChange={handleTableChange}
diff --git a/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx b/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
index 46c984354..5638b7a84 100644
--- a/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
+++ b/client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
@@ -1,6 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Table } from "antd";
 import queryString from "query-string";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -87,11 +86,10 @@ export default function CsiResponseListPaginated({ refetch, loading, responses,
 
   return (
     <Card extra={<Button onClick={() => refetch()} icon={<SyncOutlined />} />}>
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ placement: "top", pageSize: pageLimit, current: parseInt(state.page || 1), total: total }}
         columns={columns}
-        mobileColumnKeys={["ro_number", "owner_name", "completedon"]}
         rowKey="id"
         dataSource={responses}
         onChange={handleTableChange}
diff --git a/client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx b/client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx
index 0cac5264b..1c9d706d2 100644
--- a/client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx
+++ b/client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx
@@ -1,5 +1,4 @@
-import { Card, Tag } from "antd";
-import ResponsiveTable from "../../responsive-table/responsive-table.component";
+import { Card, Table, Tag } from "antd";
 import axios from "axios";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -183,11 +182,10 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
             </div>
           </Card>
           <Card style={{ marginTop: "5px" }} type="inner" title={t("job_lifecycle.titles.top_durations")}>
-            <ResponsiveTable
+            <Table
               size="small"
               pagination={false}
               columns={columns}
-              mobileColumnKeys={["status", "humanReadable", "averageHumanReadable", "statusCount"]}
               rowKey={(record) => record.status}
               dataSource={lifecycleData.summations.sort((a, b) => b.value - a.value).slice(0, 3)}
             />
diff --git a/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx b/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
index 5d3a19fc1..7088bc684 100644
--- a/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
+++ b/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
@@ -1,4 +1,4 @@
-import { Card, Input, Space, Typography } from "antd";
+import { Card, Input, Space, Table, Typography } from "antd";
 import axios from "axios";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -7,7 +7,6 @@ import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
 import Dinero from "dinero.js";
 import DashboardRefreshRequired from "../refresh-required.component";
 import { pageLimit } from "../../../utils/config";
-import ResponsiveTable from "../../responsive-table/responsive-table.component.jsx";
 
 export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
   const { t } = useTranslation();
@@ -104,33 +103,31 @@ export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
       {...cardProps}
     >
       <LoadingSkeleton loading={loading}>
-        <div style={{ height: "100%", minHeight: 0, width: "100%", overflow: "auto" }}>
-          <ResponsiveTable
-            size="small"
-            tableLayout="fixed"
+        <div style={{ height: "100%" }}>
+          <Table
             onChange={handleTableChange}
             pagination={{ placement: "top", defaultPageSize: pageLimit }}
             columns={columns}
-            scroll={{ x: "max-content" }}
+            scroll={{ x: true, y: "calc(100% - 4em)" }}
             rowKey="id"
-            style={{ width: "100%" }}
+            style={{ height: "100%" }}
             dataSource={filteredData}
             summary={() => (
-              <ResponsiveTable.Summary.Row>
-                <ResponsiveTable.Summary.Cell>
+              <Table.Summary.Row>
+                <Table.Summary.Cell>
                   <Typography.Title level={4}>{t("general.labels.totals")}</Typography.Title>
-                </ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell>
+                </Table.Summary.Cell>
+                <Table.Summary.Cell>
                   {Dinero(costingData?.allSummaryData && costingData.allSummaryData.totalSales).toFormat()}
-                </ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell>
+                </Table.Summary.Cell>
+                <Table.Summary.Cell>
                   {Dinero(costingData?.allSummaryData && costingData.allSummaryData.totalCost).toFormat()}
-                </ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell>
+                </Table.Summary.Cell>
+                <Table.Summary.Cell>
                   {Dinero(costingData?.allSummaryData && costingData.allSummaryData.gpdollars).toFormat()}
-                </ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell></ResponsiveTable.Summary.Cell>
-              </ResponsiveTable.Summary.Row>
+                </Table.Summary.Cell>
+                <Table.Summary.Cell></Table.Summary.Cell>
+              </Table.Summary.Row>
             )}
           />
         </div>
diff --git a/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx b/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx
index e7425db99..80c10a884 100644
--- a/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx
@@ -363,7 +363,6 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps })
           onChange={handleTableChange}
           pagination={false}
           columns={isTvModeScheduledDelivery ? tvColumns : columns}
-          // mobileColumnKeys={["ro_number", "owner", "status", "vehicle"]}
           scroll={{ x: true, y: "calc(100% - 2em)" }}
           rowKey="id"
           style={{ height: "85%" }}
diff --git a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
index 1c937e6e4..a4936e78f 100644
--- a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
@@ -368,7 +368,6 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
           onChange={handleTableChange}
           pagination={false}
           columns={isTvModeScheduledIn ? tvColumns : columns}
-          mobileColumnKeys={["ro_number", "owner", "vehicle", "start"]}
           scroll={{ x: true, y: "calc(100% - 2em)" }}
           rowKey="id"
           style={{ height: "85%" }}
diff --git a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
index 135b2f57f..05dac46a9 100644
--- a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
@@ -363,7 +363,6 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
           onChange={handleTableChange}
           pagination={false}
           columns={isTvModeScheduledOut ? tvColumns : columns}
-          // mobileColumnKeys={["ro_number", "owner", "status", "vehicle"]}
           scroll={{ x: true, y: "calc(100% - 2em)" }}
           rowKey="id"
           style={{ height: "85%" }}
diff --git a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
index 2eb3eafe1..77e887d07 100644
--- a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
+++ b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
@@ -1,6 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Form, Input } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Form, Input, Table } from "antd";
 import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -79,7 +78,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
       dataIndex: "Lines",
       key: "Lines",
       render: (text, record) => (
-        <ResponsiveTable style={{ tableLayout: "auto", width: "100%" }}>
+        <table style={{ tableLayout: "auto", width: "100%" }}>
           <tr>
             <th>{t("bills.fields.invoice_number")}</th>
             <th>{t("bodyshop.fields.dms.dms_acctnumber")}</th>
@@ -92,7 +91,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
               <td>{l.Amount}</td>
             </tr>
           ))}
-        </ResponsiveTable>
+        </table>
       )
     }
   ];
@@ -116,10 +115,9 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
         />
       }
     >
-      <ResponsiveTable
+      <Table
         pagination={{ placement: "top", defaultPageSize: pageLimit }}
         columns={columns}
-        mobileColumnKeys={["status", "reference", "Lines"]}
         rowKey={(record) => `${record.InvoiceNumber}${record.Account}`}
         dataSource={allocationsSummary}
         locale={{ emptyText: t("dms.labels.refreshallocations") }}
diff --git a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
index cfbd1e536..75d15aa02 100644
--- a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
+++ b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
@@ -1,5 +1,4 @@
-import { Alert, Button, Card, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Alert, Button, Card, Table, Typography } from "antd";
 import { SyncOutlined } from "@ant-design/icons";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -117,10 +116,9 @@ export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title, on
         <Alert type="warning" title={t("jobs.labels.dms.disablebillwip")} />
       )}
 
-      <ResponsiveTable
+      <Table
         pagination={{ placement: "top", defaultPageSize: pageLimit }}
         columns={columns}
-        mobileColumnKeys={["center", "sale", "cost", "sale_dms_acctnumber"]}
         rowKey="center"
         dataSource={allocationsSummary}
         locale={{ emptyText: t("dms.labels.refreshallocations") }}
@@ -137,17 +135,15 @@ export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title, on
           const hasNonZeroSaleTotal = totals.totalSale.getAmount() !== 0;
 
           return (
-            <ResponsiveTable.Summary.Row>
-              <ResponsiveTable.Summary.Cell>
+            <Table.Summary.Row>
+              <Table.Summary.Cell>
                 <Typography.Title level={4}>{t("general.labels.totals")}</Typography.Title>
-              </ResponsiveTable.Summary.Cell>
-              <ResponsiveTable.Summary.Cell>
-                {hasNonZeroSaleTotal ? totals.totalSale.toFormat() : null}
-              </ResponsiveTable.Summary.Cell>
-              <ResponsiveTable.Summary.Cell />
-              <ResponsiveTable.Summary.Cell />
-              <ResponsiveTable.Summary.Cell />
-            </ResponsiveTable.Summary.Row>
+              </Table.Summary.Cell>
+              <Table.Summary.Cell>{hasNonZeroSaleTotal ? totals.totalSale.toFormat() : null}</Table.Summary.Cell>
+              <Table.Summary.Cell />
+              <Table.Summary.Cell />
+              <Table.Summary.Cell />
+            </Table.Summary.Row>
           );
         }}
       />
diff --git a/client/src/components/dms-allocations-summary/rr-dms-allocations-summary.component.jsx b/client/src/components/dms-allocations-summary/rr-dms-allocations-summary.component.jsx
index 4cffcfd85..abd2137af 100644
--- a/client/src/components/dms-allocations-summary/rr-dms-allocations-summary.component.jsx
+++ b/client/src/components/dms-allocations-summary/rr-dms-allocations-summary.component.jsx
@@ -1,5 +1,4 @@
-import { Alert, Button, Card, Tabs, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Alert, Button, Card, Table, Tabs, Typography } from "antd";
 import { SyncOutlined } from "@ant-design/icons";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -262,10 +261,9 @@ export function RrAllocationsSummary({ socket, bodyshop, jobId, title, onAllocat
             into taxable / non-taxable segments.
           </Typography.Paragraph>
 
-          <ResponsiveTable
+          <Table
             pagination={false}
             columns={roggColumns}
-            mobileColumnKeys={["jobNo", "opCode", "breakOut", "itemType"]}
             rowKey="key"
             dataSource={roggRows}
             locale={{ emptyText: "No ROGOG lines would be generated." }}
@@ -288,23 +286,19 @@ export function RrAllocationsSummary({ socket, bodyshop, jobId, title, onAllocat
               const hasCostTotal = Number(roggTotals.totalDlrCost) !== 0;
 
               return (
-                <ResponsiveTable.Summary.Row>
-                  <ResponsiveTable.Summary.Cell index={0}>
+                <Table.Summary.Row>
+                  <Table.Summary.Cell index={0}>
                     <Typography.Title level={5}>{t("general.labels.totals")}</Typography.Title>
-                  </ResponsiveTable.Summary.Cell>
-                  <ResponsiveTable.Summary.Cell index={1} />
-                  <ResponsiveTable.Summary.Cell index={2} />
-                  <ResponsiveTable.Summary.Cell index={3} />
-                  <ResponsiveTable.Summary.Cell index={4} />
-                  <ResponsiveTable.Summary.Cell index={5} />
-                  <ResponsiveTable.Summary.Cell index={6} />
-                  <ResponsiveTable.Summary.Cell index={7}>
-                    {hasCustTotal ? roggTotals.totalCustPrice : null}
-                  </ResponsiveTable.Summary.Cell>
-                  <ResponsiveTable.Summary.Cell index={8}>
-                    {hasCostTotal ? roggTotals.totalDlrCost : null}
-                  </ResponsiveTable.Summary.Cell>
-                </ResponsiveTable.Summary.Row>
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell index={1} />
+                  <Table.Summary.Cell index={2} />
+                  <Table.Summary.Cell index={3} />
+                  <Table.Summary.Cell index={4} />
+                  <Table.Summary.Cell index={5} />
+                  <Table.Summary.Cell index={6} />
+                  <Table.Summary.Cell index={7}>{hasCustTotal ? roggTotals.totalCustPrice : null}</Table.Summary.Cell>
+                  <Table.Summary.Cell index={8}>{hasCostTotal ? roggTotals.totalDlrCost : null}</Table.Summary.Cell>
+                </Table.Summary.Row>
               );
             }}
           />
@@ -319,10 +313,9 @@ export function RrAllocationsSummary({ socket, bodyshop, jobId, title, onAllocat
           <Typography.Paragraph type="secondary" style={{ marginBottom: 8 }}>
             This mirrors the shell that would be sent for ROLABOR when all financials are carried in GOG.
           </Typography.Paragraph>
-          <ResponsiveTable
+          <Table
             pagination={false}
             columns={rolaborColumns}
-            mobileColumnKeys={["jobNo", "opCode", "breakOut", "itemType"]}
             rowKey="key"
             dataSource={rolaborRows}
             locale={{ emptyText: "No ROLABOR lines would be generated." }}
diff --git a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
index 3f6cb9f9c..ac07d277d 100644
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
@@ -1,6 +1,5 @@
 import { useLazyQuery } from "@apollo/client/react";
-import { Button, Input, Modal } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Input, Modal, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -61,7 +60,7 @@ export function DmsCdkVehicles({ form, job }) {
         okButtonProps={{ disabled: !selectedModel }}
       >
         {error && <AlertComponent title={error.message} type="error" />}
-        <ResponsiveTable
+        <Table
           title={() => (
             <Input.Search
               onSearch={(val) => callSearch({ variables: { search: val } })}
@@ -70,7 +69,6 @@ export function DmsCdkVehicles({ form, job }) {
             />
           )}
           columns={columns}
-          mobileColumnKeys={["make", "model", "makecode", "modelcode"]}
           loading={loading}
           rowKey="id"
           dataSource={data ? data.search_dms_vehicles : []}
diff --git a/client/src/components/dms-customer-selector/cdk-customer-selector.jsx b/client/src/components/dms-customer-selector/cdk-customer-selector.jsx
index 755ca84db..479b23f0c 100644
--- a/client/src/components/dms-customer-selector/cdk-customer-selector.jsx
+++ b/client/src/components/dms-customer-selector/cdk-customer-selector.jsx
@@ -1,5 +1,4 @@
-import { Button, Checkbox, Col } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Checkbox, Col, Table } from "antd";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
@@ -73,7 +72,7 @@ export default function CDKCustomerSelector({ bodyshop, socket }) {
 
   return (
     <Col span={24}>
-      <ResponsiveTable
+      <Table
         title={() => (
           <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
             <Button onClick={onUseSelected} disabled={!selectedCustomer}>
@@ -87,7 +86,6 @@ export default function CDKCustomerSelector({ bodyshop, socket }) {
         )}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["id", "vinOwner", "name1", "address"]}
         rowKey={rowKey}
         dataSource={customerList}
         rowSelection={{
diff --git a/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx b/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx
index e4f40c955..4c2994e64 100644
--- a/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx
+++ b/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx
@@ -1,5 +1,4 @@
-import { Button, Checkbox, Col } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Checkbox, Col, Table } from "antd";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
@@ -79,7 +78,7 @@ export default function FortellisCustomerSelector({ bodyshop, jobid, socket }) {
 
   return (
     <Col span={24}>
-      <ResponsiveTable
+      <Table
         title={() => (
           <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
             <Button onClick={onUseSelected} disabled={!selectedCustomer}>
@@ -93,7 +92,6 @@ export default function FortellisCustomerSelector({ bodyshop, jobid, socket }) {
         )}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["id", "vinOwner", "firstName", "address"]}
         rowKey={(r) => r.customerId}
         dataSource={customerList}
         rowSelection={{
diff --git a/client/src/components/dms-customer-selector/pbs-customer-selector.jsx b/client/src/components/dms-customer-selector/pbs-customer-selector.jsx
index fcded201e..43fd28b02 100644
--- a/client/src/components/dms-customer-selector/pbs-customer-selector.jsx
+++ b/client/src/components/dms-customer-selector/pbs-customer-selector.jsx
@@ -1,5 +1,4 @@
-import { Button, Col } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Col, Table } from "antd";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
@@ -67,7 +66,7 @@ export default function PBSCustomerSelector({ bodyshop, socket }) {
 
   return (
     <Col span={24}>
-      <ResponsiveTable
+      <Table
         title={() => (
           <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
             <Button onClick={onUseSelected} disabled={!selectedCustomer}>
@@ -81,7 +80,6 @@ export default function PBSCustomerSelector({ bodyshop, socket }) {
         )}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["ContactId", "name1", "address"]}
         rowKey={(r) => r.ContactId}
         dataSource={customerList}
         rowSelection={{
diff --git a/client/src/components/dms-customer-selector/rr-customer-selector.jsx b/client/src/components/dms-customer-selector/rr-customer-selector.jsx
index 1972d9939..ad5fbd4bf 100644
--- a/client/src/components/dms-customer-selector/rr-customer-selector.jsx
+++ b/client/src/components/dms-customer-selector/rr-customer-selector.jsx
@@ -1,5 +1,4 @@
-import { Alert, Button, Checkbox, message, Modal, Space } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Alert, Button, Checkbox, message, Modal, Space, Table } from "antd";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
@@ -73,14 +72,14 @@ export default function RRCustomerSelector({
     if (!socket) return;
     const handleRrSelectCustomer = (list) => {
       const normalized = normalizeRrList(list);
-
+      
       // If list is empty, it means early RO exists and customer selection should be skipped
       // Don't open the modal in this case
       if (normalized.length === 0) {
         setRefreshing(false);
         return;
       }
-
+      
       setOpen(true);
       setCustomerList(normalized);
       const firstOwner = normalized.find((r) => r.vinOwner)?.custNo;
@@ -196,8 +195,8 @@ export default function RRCustomerSelector({
             description={
               <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
                 <div>
-                  We created the Repair Order. Please validate the totals and taxes in the DMS system. When done, click{" "}
-                  <strong>Finished</strong> to finalize and mark this export as complete.
+                  We created the Repair Order. Please validate the totals and taxes in the DMS system. When done,
+                  click <strong>Finished</strong> to finalize and mark this export as complete.
                 </div>
                 <div>
                   <Space>
@@ -216,8 +215,14 @@ export default function RRCustomerSelector({
   }
 
   return (
-    <Modal open={open} onCancel={handleClose} footer={null} width={800} title={t("dms.selectCustomer")}>
-      <ResponsiveTable
+    <Modal
+      open={open}
+      onCancel={handleClose}
+      footer={null}
+      width={800}
+      title={t("dms.selectCustomer")}
+    >
+      <Table
         title={() => (
           <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
             {/* Open RO limit banner */}
@@ -299,7 +304,6 @@ export default function RRCustomerSelector({
         )}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["custNo", "vinOwner", "name", "address"]}
         rowKey={(r) => r.custNo}
         dataSource={customerList}
         rowSelection={{
diff --git a/client/src/components/dms-log-events/dms-log-events.component.jsx b/client/src/components/dms-log-events/dms-log-events.component.jsx
index 075d2f6eb..d90623df6 100644
--- a/client/src/components/dms-log-events/dms-log-events.component.jsx
+++ b/client/src/components/dms-log-events/dms-log-events.component.jsx
@@ -4,7 +4,6 @@ import dayjs from "../../utils/day";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectDarkMode } from "../../redux/application/application.selectors.js";
-import { useTranslation } from "react-i18next";
 
 const mapStateToProps = createStructuredSelector({
   isDarkMode: selectDarkMode
@@ -20,35 +19,25 @@ export function DmsLogEvents({
   detailsNonce,
   isDarkMode,
   colorizeJson = false,
-  showDetails = true,
-  allowXmlPayload = true
+  showDetails = true
 }) {
-  const { t } = useTranslation();
   const [openSet, setOpenSet] = useState(() => new Set());
-  const [copiedKey, setCopiedKey] = useState(null);
 
   // Inject JSON highlight styles once (only when colorize is enabled)
   useEffect(() => {
     if (!colorizeJson) return;
     if (typeof document === "undefined") return;
-    let style = document.getElementById("json-highlight-styles");
-    if (!style) {
-      style = document.createElement("style");
-      style.id = "json-highlight-styles";
-      document.head.appendChild(style);
-    }
+    if (document.getElementById("json-highlight-styles")) return;
+    const style = document.createElement("style");
+    style.id = "json-highlight-styles";
     style.textContent = `
       .json-key { color: #fa8c16; }
       .json-string { color: #52c41a; }
       .json-number { color: #722ed1; }
       .json-boolean { color: #1890ff; }
       .json-null { color: #faad14; }
-      .xml-tag { color: #1677ff; }
-      .xml-attr { color: #d46b08; }
-      .xml-value { color: #389e0d; }
-      .xml-decl { color: #7c3aed; }
-      .xml-comment { color: #8c8c8c; }
     `;
+    document.head.appendChild(style);
   }, [colorizeJson]);
 
   // Trim openSet if logs shrink
@@ -76,13 +65,6 @@ export function DmsLogEvents({
         // Only treat meta as "present" when we are allowed to show details
         const hasMeta = !isEmpty(meta) && showDetails;
         const isOpen = hasMeta && openSet.has(idx);
-        const xml = hasMeta && allowXmlPayload ? extractXmlFromMeta(meta) : { request: null, response: null };
-        const hasRequestXml = !!xml.request;
-        const hasResponseXml = !!xml.response;
-        const copyPayload = hasMeta ? getCopyPayload(meta) : null;
-        const copyPayloadKey = `copy-${idx}`;
-        const copyReqKey = `copy-req-${idx}`;
-        const copyResKey = `copy-res-${idx}`;
 
         return {
           key: idx,
@@ -110,42 +92,10 @@ export function DmsLogEvents({
                           return next;
                         })
                       }
-                      style={{ cursor: "pointer", userSelect: "none", fontSize: 11 }}
+                      style={{ cursor: "pointer", userSelect: "none" }}
                     >
-                      {isOpen ? t("dms.labels.hide_details") : t("dms.labels.details")}
+                      {isOpen ? "Hide details" : "Details"}
                     </a>
-                    <Divider orientation="vertical" />
-                    <a
-                      role="button"
-                      onClick={() => handleCopyAction(copyPayloadKey, copyPayload, setCopiedKey)}
-                      style={{ cursor: "pointer", userSelect: "none", fontSize: 11 }}
-                    >
-                      {copiedKey === copyPayloadKey ? t("dms.labels.copied") : t("dms.labels.copy")}
-                    </a>
-                    {hasRequestXml && (
-                      <>
-                        <Divider orientation="vertical" />
-                        <a
-                          role="button"
-                          onClick={() => handleCopyAction(copyReqKey, xml.request, setCopiedKey)}
-                          style={{ cursor: "pointer", userSelect: "none", fontSize: 11 }}
-                        >
-                          {copiedKey === copyReqKey ? t("dms.labels.copied") : t("dms.labels.copy_request")}
-                        </a>
-                      </>
-                    )}
-                    {hasResponseXml && (
-                      <>
-                        <Divider orientation="vertical" />
-                        <a
-                          role="button"
-                          onClick={() => handleCopyAction(copyResKey, xml.response, setCopiedKey)}
-                          style={{ cursor: "pointer", userSelect: "none", fontSize: 11 }}
-                        >
-                          {copiedKey === copyResKey ? t("dms.labels.copied") : t("dms.labels.copy_response")}
-                        </a>
-                      </>
-                    )}
                   </>
                 )}
               </Space>
@@ -153,30 +103,14 @@ export function DmsLogEvents({
               {/* Row 2: details body (only when open) */}
               {hasMeta && isOpen && (
                 <div style={{ marginLeft: 6 }}>
-                  <JsonBlock isDarkMode={isDarkMode} data={removeXmlFromMeta(meta)} colorize={colorizeJson} />
-                  {hasRequestXml && (
-                    <XmlBlock
-                      isDarkMode={isDarkMode}
-                      title={t("dms.labels.request_xml")}
-                      xmlText={xml.request}
-                      colorize={colorizeJson}
-                    />
-                  )}
-                  {hasResponseXml && (
-                    <XmlBlock
-                      isDarkMode={isDarkMode}
-                      title={t("dms.labels.response_xml")}
-                      xmlText={xml.response}
-                      colorize={colorizeJson}
-                    />
-                  )}
+                  <JsonBlock isDarkMode={isDarkMode} data={meta} colorize={colorizeJson} />
                 </div>
               )}
             </Space>
           )
         };
       }),
-    [logs, openSet, colorizeJson, copiedKey, isDarkMode, showDetails, allowXmlPayload, t]
+    [logs, openSet, colorizeJson, isDarkMode, showDetails]
   );
 
   return <Timeline reverse items={items} />;
@@ -245,121 +179,6 @@ const safeStringify = (obj, spaces = 2) => {
   }
 };
 
-/**
- * Get request/response XML from various Reynolds log meta shapes.
- * @param meta
- * @returns {{request: string|null, response: string|null}}
- */
-const extractXmlFromMeta = (meta) => {
-  const request =
-    firstString(meta?.requestXml) ||
-    firstString(meta?.xml?.request) ||
-    firstString(meta?.response?.xml?.request) ||
-    firstString(meta?.response?.requestXml);
-
-  const response =
-    firstString(meta?.responseXml) || firstString(meta?.xml?.response) || firstString(meta?.response?.xml?.response);
-
-  return { request, response };
-};
-
-/**
- * Return the value to copy when clicking the "Copy" action.
- * @param meta
- * @returns {*}
- */
-const getCopyPayload = (meta) => {
-  if (meta?.payload != null) return meta.payload;
-  return meta;
-};
-
-/**
- * Remove bulky XML fields from object shown in JSON block (XML is rendered separately).
- * @param meta
- * @returns {*}
- */
-const removeXmlFromMeta = (meta) => {
-  if (meta == null || typeof meta !== "object") return meta;
-  const cloned = safeClone(meta);
-  if (cloned == null || typeof cloned !== "object") return meta;
-
-  if (typeof cloned.requestXml === "string") delete cloned.requestXml;
-  if (typeof cloned.responseXml === "string") delete cloned.responseXml;
-
-  if (cloned.xml && typeof cloned.xml === "object") {
-    if (typeof cloned.xml.request === "string") delete cloned.xml.request;
-    if (typeof cloned.xml.response === "string") delete cloned.xml.response;
-    if (isEmpty(cloned.xml)) delete cloned.xml;
-  }
-
-  if (cloned.response?.xml && typeof cloned.response.xml === "object") {
-    if (typeof cloned.response.xml.request === "string") delete cloned.response.xml.request;
-    if (typeof cloned.response.xml.response === "string") delete cloned.response.xml.response;
-    if (isEmpty(cloned.response.xml)) delete cloned.response.xml;
-  }
-
-  return cloned;
-};
-
-/**
- * Safe deep clone for plain JSON structures.
- * @param value
- * @returns {*}
- */
-const safeClone = (value) => {
-  try {
-    return JSON.parse(JSON.stringify(value));
-  } catch {
-    return value;
-  }
-};
-
-/**
- * First non-empty string helper.
- * @param value
- * @returns {string|null}
- */
-const firstString = (value) => {
-  if (typeof value !== "string") return null;
-  const trimmed = value.trim();
-  return trimmed ? trimmed : null;
-};
-
-/**
- * Copy arbitrary text/object to clipboard.
- * @param key
- * @param value
- * @param setCopied
- * @returns {Promise<void>}
- */
-const handleCopyAction = async (key, value, setCopied) => {
-  const text = typeof value === "string" ? value : safeStringify(value, 2);
-  if (!text) return;
-  const copied = await copyTextToClipboard(text);
-  if (!copied) return;
-  setCopied(key);
-  setTimeout(() => {
-    setCopied((prev) => (prev === key ? null : prev));
-  }, 1200);
-};
-
-/**
- * Clipboard helper (modern async Clipboard API).
- * @param text
- * @returns {Promise<boolean>}
- */
-const copyTextToClipboard = async (text) => {
-  if (typeof navigator === "undefined" || !navigator.clipboard?.writeText) {
-    return false;
-  }
-  try {
-    await navigator.clipboard.writeText(text);
-    return true;
-  } catch {
-    return false;
-  }
-};
-
 /**
  * JSON display block with optional syntax highlighting.
  * @param data
@@ -391,105 +210,6 @@ const JsonBlock = ({ data, colorize, isDarkMode }) => {
   return <pre style={preStyle}>{jsonText}</pre>;
 };
 
-/**
- * XML display block with normalized indentation.
- * @param title
- * @param xmlText
- * @param isDarkMode
- * @returns {JSX.Element}
- * @constructor
- */
-const XmlBlock = ({ title, xmlText, isDarkMode, colorize = false }) => {
-  const base = {
-    margin: "8px 0 0",
-    maxWidth: 720,
-    overflowX: "auto",
-    fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
-    fontSize: 12,
-    lineHeight: 1.45,
-    padding: 8,
-    borderRadius: 6,
-    background: isDarkMode ? "rgba(255,255,255,0.1)" : "rgba(0,0,0,0.04)",
-    border: isDarkMode ? "1px solid rgba(255,255,255,0.12)" : "1px solid rgba(0,0,0,0.08)",
-    color: isDarkMode ? "var(--card-text-fallback)" : "#141414",
-    whiteSpace: "pre"
-  };
-
-  return (
-    <div style={{ marginTop: 6 }}>
-      <div style={{ fontSize: 11, fontWeight: 600 }}>{title}</div>
-      {colorize ? (
-        <pre style={base} dangerouslySetInnerHTML={{ __html: highlightXml(formatXml(xmlText)) }} />
-      ) : (
-        <pre style={base}>{formatXml(xmlText)}</pre>
-      )}
-    </div>
-  );
-};
-
-/**
- * Basic XML pretty-printer.
- * @param xml
- * @returns {string}
- */
-const formatXml = (xml) => {
-  if (typeof xml !== "string") return "";
-  const normalized = xml.replace(/\r\n/g, "\n").replace(/>\s*</g, ">\n<").trim();
-  const lines = normalized.split("\n");
-  let indent = 0;
-  const out = [];
-
-  for (const rawLine of lines) {
-    const line = rawLine.trim();
-    if (!line) continue;
-
-    if (/^<\/[^>]+>/.test(line)) indent = Math.max(indent - 1, 0);
-    out.push(`${"  ".repeat(indent)}${line}`);
-
-    const opens = (line.match(/<[^/!?][^>]*>/g) || []).length;
-    const closes = (line.match(/<\/[^>]+>/g) || []).length;
-    const selfClosing = (line.match(/<[^>]+\/>/g) || []).length;
-    const declaration = /^<\?xml/.test(line) ? 1 : 0;
-
-    indent += opens - closes - selfClosing - declaration;
-    if (indent < 0) indent = 0;
-  }
-
-  return out.join("\n");
-};
-
-/**
- * Syntax highlight pretty-printed XML text for HTML display.
- * @param xmlText
- * @returns {string}
- */
-const highlightXml = (xmlText) => {
-  const esc = String(xmlText || "")
-    .replace(/&/g, "&amp;")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;");
-  const lines = esc.split("\n");
-
-  return lines
-    .map((line) => {
-      let out = line;
-
-      out = out.replace(/(&lt;!--[\s\S]*?--&gt;)/g, '<span class="xml-comment">$1</span>');
-      out = out.replace(/(&lt;\?xml[\s\S]*?\?&gt;)/g, '<span class="xml-decl">$1</span>');
-
-      out = out.replace(/(&lt;\/?)([A-Za-z_][\w:.-]*)([\s\S]*?)(\/?&gt;)/g, (_m, open, tag, attrs, close) => {
-        const coloredAttrs = attrs.replace(
-          /([A-Za-z_][\w:.-]*)(=)("[^"]*"|'[^']*'|&quot;[\s\S]*?&quot;|&apos;[\s\S]*?&apos;)/g,
-          '<span class="xml-attr">$1</span>$2<span class="xml-value">$3</span>'
-        );
-        return `${open}<span class="xml-tag">${tag}</span>${coloredAttrs}${close}`;
-      });
-
-      return out;
-    })
-    .join("\n");
-};
-
 /**
  * Syntax highlight JSON text for HTML display.
  * @param jsonText
diff --git a/client/src/components/dms-post-form/cdklike-dms-post-form.jsx b/client/src/components/dms-post-form/cdklike-dms-post-form.jsx
index 09eebb5ca..9e006534b 100644
--- a/client/src/components/dms-post-form/cdklike-dms-post-form.jsx
+++ b/client/src/components/dms-post-form/cdklike-dms-post-form.jsx
@@ -272,19 +272,11 @@ export default function CdkLikePostForm({ bodyshop, socket, job, logsRef, mode,
                         name={[field.name, "name"]}
                         rules={[{ required: true }]}
                       >
-                        <Select
-                          showSearch={{
-                            optionFilterProp: "label",
-                            filterOption: (input, option) => option.label.toLowerCase().includes(input.toLowerCase())
-                          }}
-                          style={{ width: "100%" }}
-                          onSelect={(value) => handlePayerSelect(value, index)}
-                          options={bodyshop.cdk_configuration?.payers?.map((payer) => ({
-                            key: payer.name,
-                            value: payer.name,
-                            label: payer.name
-                          }))}
-                        />
+                        <Select style={{ width: "100%" }} onSelect={(value) => handlePayerSelect(value, index)}>
+                          {bodyshop.cdk_configuration?.payers?.map((payer) => (
+                            <Select.Option key={payer.name}>{payer.name}</Select.Option>
+                          ))}
+                        </Select>
                       </Form.Item>
                     </Col>
 
diff --git a/client/src/components/dms-post-form/rr-early-ro-form.jsx b/client/src/components/dms-post-form/rr-early-ro-form.jsx
index 2761debfd..cda20e543 100644
--- a/client/src/components/dms-post-form/rr-early-ro-form.jsx
+++ b/client/src/components/dms-post-form/rr-early-ro-form.jsx
@@ -1,6 +1,5 @@
 import { ReloadOutlined } from "@ant-design/icons";
-import { Alert, Button, Form, Input, InputNumber, Modal, Radio, Select, Space, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Alert, Button, Form, Input, InputNumber, Modal, Radio, Select, Space, Table, Typography } from "antd";
 import { useEffect, useMemo, useState } from "react";
 
 // Simple customer selector table
@@ -27,14 +26,7 @@ function CustomerSelectorTable({ customers, onSelect, isSubmitting }) {
 
   return (
     <div>
-      <ResponsiveTable
-        columns={columns}
-        mobileColumnKeys={["name", "select", "custNo", "vinOwner"]}
-        dataSource={customers}
-        rowKey="custNo"
-        pagination={false}
-        size="small"
-      />
+      <Table columns={columns} dataSource={customers} rowKey="custNo" pagination={false} size="small" />
       <div style={{ marginTop: 16, display: "flex", gap: 8 }}>
         <Button
           type="primary"
diff --git a/client/src/components/email-overlay/email-overlay.component.jsx b/client/src/components/email-overlay/email-overlay.component.jsx
index a5b439da0..3263b8d77 100644
--- a/client/src/components/email-overlay/email-overlay.component.jsx
+++ b/client/src/components/email-overlay/email-overlay.component.jsx
@@ -86,13 +86,11 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
           }
         ]}
       >
-        <Select
-          options={[
-            { key: currentUser.email, value: currentUser.email, label: currentUser.email },
-            { key: bodyshop.email, value: bodyshop.email, label: bodyshop.email },
-            ...(bodyshop.md_from_emails ? bodyshop.md_from_emails.map((e) => ({ key: e, value: e, label: e })) : [])
-          ]}
-        />
+        <Select>
+          <Select.Option key={currentUser.email}>{currentUser.email}</Select.Option>
+          <Select.Option key={bodyshop.email}>{bodyshop.email}</Select.Option>
+          {bodyshop.md_from_emails && bodyshop.md_from_emails.map((e) => <Select.Option key={e}>{e}</Select.Option>)}
+        </Select>
       </Form.Item>
       <Form.Item
         label={
diff --git a/client/src/components/email-overlay/email-overlay.container.jsx b/client/src/components/email-overlay/email-overlay.container.jsx
index bd152e582..0ae3b1779 100644
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -163,7 +163,7 @@ export function EmailOverlayContainer({ emailConfig, modalVisible, toggleEmailOv
     <Modal
       destroyOnHidden
       open={modalVisible}
-      mask={{ closable: false }}
+      maskClosable={false}
       width={"80%"}
       onOk={() => form.submit()}
       title={t("emails.labels.emailpreview")}
diff --git a/client/src/components/employee-search-select/employee-search-select-email.component.jsx b/client/src/components/employee-search-select/employee-search-select-email.component.jsx
index 728c09151..cb1c80872 100644
--- a/client/src/components/employee-search-select/employee-search-select-email.component.jsx
+++ b/client/src/components/employee-search-select/employee-search-select-email.component.jsx
@@ -1,6 +1,7 @@
 import { Select, Space, Tag } from "antd";
 import { useTranslation } from "react-i18next";
 
+const { Option } = Select;
 //To be used as a form element only.
 
 const EmployeeSearchSelectEmail = ({ options, ...props }) => {
@@ -11,24 +12,26 @@ const EmployeeSearchSelectEmail = ({ options, ...props }) => {
       showSearch={{
         optionFilterProp: "search"
       }}
+      // value={option}
       style={{
         width: 400
       }}
-      options={options?.map((o) => ({
-        key: o.id,
-        value: o.user_email,
-        search: `${o.employee_number}  ${o.first_name} ${o.last_name}`,
-        label: (
-          <Space>
-            {`${o.employee_number}  ${o.first_name} ${o.last_name}`}
-            <Tag color="green">
-              {o.flat_rate ? t("timetickets.labels.flat_rate") : t("timetickets.labels.straight_time")}
-            </Tag>
-          </Space>
-        )
-      }))}
       {...props}
-    />
+    >
+      {options
+        ? options.map((o) => (
+            <Option key={o.id} value={o.user_email} search={`${o.employee_number}  ${o.first_name} ${o.last_name}`}>
+              <Space>
+                {`${o.employee_number}  ${o.first_name} ${o.last_name}`}
+
+                <Tag color="green">
+                  {o.flat_rate ? t("timetickets.labels.flat_rate") : t("timetickets.labels.straight_time")}
+                </Tag>
+              </Space>
+            </Option>
+          ))
+        : null}
+    </Select>
   );
 };
 export default EmployeeSearchSelectEmail;
diff --git a/client/src/components/employee-search-select/employee-search-select.component.jsx b/client/src/components/employee-search-select/employee-search-select.component.jsx
index ff30b4808..4691a645d 100644
--- a/client/src/components/employee-search-select/employee-search-select.component.jsx
+++ b/client/src/components/employee-search-select/employee-search-select.component.jsx
@@ -1,6 +1,7 @@
 import { Select, Space, Tag } from "antd";
 import { useTranslation } from "react-i18next";
 
+const { Option } = Select;
 //To be used as a form element only.
 
 const EmployeeSearchSelect = ({ options, showEmail, ...props }) => {
@@ -11,29 +12,30 @@ const EmployeeSearchSelect = ({ options, showEmail, ...props }) => {
       showSearch={{
         optionFilterProp: "search"
       }}
+      // value={option}
       style={{
         width: 400
       }}
-      options={options?.map((o) => ({
-        key: o.id,
-        value: o.id,
-        search: `${o.employee_number}  ${o.first_name} ${o.last_name}`,
-        label: (
-          <Space size="small">
-            {`${o.employee_number ?? ""}  ${o.first_name} ${o.last_name}`}
-            <Tag color="green" style={{ padding: "0.1 0.1rem", marginRight: "1px", marginLeft: "1px" }}>
-              {o.flat_rate ? t("timetickets.labels.flat_rate") : t("timetickets.labels.straight_time")}
-            </Tag>
-            {showEmail && o.user_email ? (
-              <Tag color="blue" style={{ padding: "0.1 0.1rem", marginRight: "1px", marginLeft: "1px" }}>
-                {o.user_email}
-              </Tag>
-            ) : null}
-          </Space>
-        )
-      }))}
       {...props}
-    />
+    >
+      {options
+        ? options.map((o) => (
+            <Option key={o.id} value={o.id} search={`${o.employee_number}  ${o.first_name} ${o.last_name}`}>
+              <Space size="small">
+                {`${o.employee_number ?? ""}  ${o.first_name} ${o.last_name}`}
+                <Tag color="green" style={{ padding: "0.1 0.1rem", marginRight: "1px", marginLeft: "1px" }}>
+                  {o.flat_rate ? t("timetickets.labels.flat_rate") : t("timetickets.labels.straight_time")}
+                </Tag>
+                {showEmail && o.user_email ? (
+                  <Tag color="blue" style={{ padding: "0.1 0.1rem", marginRight: "1px", marginLeft: "1px" }}>
+                    {o.user_email}
+                  </Tag>
+                ) : null}
+              </Space>
+            </Option>
+          ))
+        : null}
+    </Select>
   );
 };
 export default EmployeeSearchSelect;
diff --git a/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx b/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx
index 0f265d7db..56f4a5881 100644
--- a/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx
+++ b/client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx
@@ -39,13 +39,11 @@ export default function FormsFieldChanged({ form, skipPrompt }) {
               {errors.length > 0 && (
                 <AlertComponent
                   type="error"
-                  message={t("general.labels.validationerror")}
-                  description={
+                  title={
                     <div>
                       <ul>{errors.map((e, idx) => e.errors.map((e2, idx2) => <li key={`${idx}${idx2}`}>{e2}</li>))}</ul>
                     </div>
                   }
-                  showIcon
                 />
               )}
             </Space>
diff --git a/client/src/components/global-search/global-search-os.component.jsx b/client/src/components/global-search/global-search-os.component.jsx
index 9350d343c..49b610c6d 100644
--- a/client/src/components/global-search/global-search-os.component.jsx
+++ b/client/src/components/global-search/global-search-os.component.jsx
@@ -184,29 +184,22 @@ export default function GlobalSearchOs() {
   return (
     <AutoComplete
       options={data}
-      defaultActiveFirstOption
+      onSearch={handleSearch}
       onKeyDown={(e) => {
         if (e.key !== "Enter") return;
         const firstUrlForSearch = data?.[0]?.options?.[0]?.label?.props?.to;
         if (!firstUrlForSearch) return;
         navigate(firstUrlForSearch);
       }}
+      defaultActiveFirstOption
+      onClear={() => setData([])}
     >
       <Input.Search
-        // className="global-search-autocomplete-fix"
         size="large"
         placeholder={t("general.labels.globalsearch")}
         enterButton
         allowClear
         loading={loading}
-        onChange={(e) => {
-          const value = e.target.value;
-          if (!value) {
-            setData([]);
-          } else {
-            handleSearch(value);
-          }
-        }}
       />
     </AutoComplete>
   );
diff --git a/client/src/components/global-search/global-search.component.jsx b/client/src/components/global-search/global-search.component.jsx
index dc07986af..665245070 100644
--- a/client/src/components/global-search/global-search.component.jsx
+++ b/client/src/components/global-search/global-search.component.jsx
@@ -160,6 +160,9 @@ export default function GlobalSearch() {
   return (
     <AutoComplete
       options={options}
+      showSearch={{
+        onSearch: handleSearch
+      }}
       defaultActiveFirstOption
       onKeyDown={(e) => {
         if (e.key !== "Enter") return;
@@ -169,13 +172,11 @@ export default function GlobalSearch() {
       }}
     >
       <Input.Search
-        // className="global-search-autocomplete-fix"
         size="large"
         placeholder={t("general.labels.globalsearch")}
         enterButton
         allowClear
         loading={loading}
-        onChange={(e) => handleSearch(e.target.value)}
       />
     </AutoComplete>
   );
diff --git a/client/src/components/inventory-list/inventory-list.component.jsx b/client/src/components/inventory-list/inventory-list.component.jsx
index 487a66bac..16e69a232 100644
--- a/client/src/components/inventory-list/inventory-list.component.jsx
+++ b/client/src/components/inventory-list/inventory-list.component.jsx
@@ -1,5 +1,5 @@
 import { EditFilled, FileAddFilled, SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space, Typography } from "antd";
+import { Button, Card, Input, Space, Table, Typography } from "antd";
 import queryString from "query-string";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -10,7 +10,6 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import InventoryBillRo from "../inventory-bill-ro/inventory-bill-ro.component";
 import InventoryLineDelete from "../inventory-line-delete/inventory-line-delete.component";
 import { pageLimit } from "../../utils/config";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({
@@ -186,11 +185,10 @@ export function JobsList({ refetch, loading, jobs, total, setInventoryUpsertCont
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ placement: "top", pageSize: pageLimit, current: parseInt(page || 1), total: total }}
         columns={columns}
-        mobileColumnKeys={["line_desc", "actual_price", "consumedbyjob", "actions"]}
         rowKey="id"
         dataSource={jobs}
         onChange={handleTableChange}
diff --git a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
index 6ce826a35..4e0d2fcd5 100644
--- a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
+++ b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
@@ -67,19 +67,16 @@ export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
     );
   };
 
-  const handleInsSelect = (value) => {
-    const selectedVendor = bodyshop.md_ins_cos.find(s => s.name === value);
-    if (selectedVendor) {
-      form.setFieldsValue({
-        addr1: selectedVendor.name,
-        addr2: selectedVendor.street1,
-        addr3: selectedVendor.street2,
-        city: selectedVendor.city,
-        state: selectedVendor.state,
-        zip: selectedVendor.zip,
-        vendorid: null
-      });
-    }
+  const handleInsSelect = (value, option) => {
+    form.setFieldsValue({
+      addr1: option.obj.name,
+      addr2: option.obj.street1,
+      addr3: option.obj.street2,
+      city: option.obj.city,
+      state: option.obj.state,
+      zip: option.obj.zip,
+      vendorid: null
+    });
   };
 
   const handleVendorSelect = (vendorid) => {
@@ -106,13 +103,13 @@ export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
             <VendorSearchSelect options={VendorAutoCompleteData?.vendors} onSelect={handleVendorSelect} />
           </Form.Item>
           <Form.Item label={t("bodyshop.fields.md_ins_co.name")} name="ins_co_id">
-            <Select
-              onSelect={handleInsSelect}
-              options={bodyshop.md_ins_cos.map((s) => ({
-                value: s.name,
-                label: s.name
-              }))}
-            />
+            <Select onSelect={handleInsSelect}>
+              {bodyshop.md_ins_cos.map((s) => (
+                <Select.Option key={s.name} obj={s} value={s.name}>
+                  {s.name}
+                </Select.Option>
+              ))}
+            </Select>
           </Form.Item>
           <LayoutFormRow grow>
             <Form.Item label={t("printcenter.jobs.3rdpartyfields.addr1")} name="addr1">
diff --git a/client/src/components/job-audit-trail/job-audit-trail.component.jsx b/client/src/components/job-audit-trail/job-audit-trail.component.jsx
index 48d5352cd..b11911d8a 100644
--- a/client/src/components/job-audit-trail/job-audit-trail.component.jsx
+++ b/client/src/components/job-audit-trail/job-audit-trail.component.jsx
@@ -1,7 +1,6 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Col, Row, Tag } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Col, Row, Table, Tag } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -164,24 +163,12 @@ export function JobAuditTrail({ bodyshop, jobId }) {
             />
           }
         >
-          <ResponsiveTable
-            loading={loading}
-            columns={columns}
-            mobileColumnKeys={["status", "created", "useremail", "operation"]}
-            rowKey="id"
-            dataSource={data ? data.audit_trail : []}
-          />
+          <Table loading={loading} columns={columns} rowKey="id" dataSource={data ? data.audit_trail : []} />
         </Card>
       </Col>
       <Col span={24}>
         <Card title={t("jobs.labels.emailaudit")}>
-          <ResponsiveTable
-            loading={loading}
-            columns={emailColumns}
-            mobileColumnKeys={["status", "created", "useremail", "operation"]}
-            rowKey="id"
-            dataSource={data ? data.email_audit_trail : []}
-          />
+          <Table loading={loading} columns={emailColumns} rowKey="id" dataSource={data ? data.email_audit_trail : []} />
         </Card>
       </Col>
     </Row>
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx
index 555a70276..b4ad9b6a8 100644
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.ppd.jsx
@@ -1,6 +1,5 @@
 import { useEffect } from "react";
-import { Alert, Card } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Alert, Card, Table } from "antd";
 import { t } from "i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -69,15 +68,7 @@ export function JobCloseRGuardPpd({ job, warningCallback }) {
 
   return (
     <Card title={t("jobs.labels.ppdnotexported")}>
-      <ResponsiveTable
-        dataSource={linesWithPPD}
-        columns={columns}
-        mobileColumnKeys={["line_desc", "ppd", "act_price", "act_price_before_ppc"]}
-        pagination={false}
-        rowKey="id"
-        bordered
-        size="small"
-      />
+      <Table dataSource={linesWithPPD} columns={columns} pagination={false} rowKey="id" bordered size="small" />
       {linesWithPPD.length > 0 && (
         <Alert style={{ margin: "8px 0px" }} type="warning" title={t("jobs.labels.outstanding_ppd")} />
       )}
diff --git a/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx b/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx
index e42739fd6..2cfed2a88 100644
--- a/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx
+++ b/client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx
@@ -1,7 +1,6 @@
 import { useEffect } from "react";
 
-import { Alert, Card } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Alert, Card, Table } from "antd";
 import { t } from "i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -63,15 +62,7 @@ export function JobCloseRGuardSublet({ job, warningCallback }) {
 
   return (
     <Card title={t("jobs.labels.subletsnotcompleted")}>
-      <ResponsiveTable
-        dataSource={subletsNotDone}
-        columns={columns}
-        mobileColumnKeys={["line_desc", "act_price", "part_qty", "notes"]}
-        pagination={false}
-        rowKey="id"
-        bordered
-        size="small"
-      />
+      <Table dataSource={subletsNotDone} columns={columns} pagination={false} rowKey="id" bordered size="small" />
       {subletsNotDone.length > 0 && (
         <Alert style={{ margin: "8px 0px" }} type="warning" title={t("jobs.labels.outstanding_sublets")} />
       )}
diff --git a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
index d3568fb71..04289f81e 100644
--- a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
+++ b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
@@ -1,5 +1,4 @@
-import { Input, Space, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Input, Space, Table, Typography } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
@@ -66,7 +65,7 @@ export default function JobCostingPartsTable({ data, summaryData }) {
 
   return (
     <div>
-      <ResponsiveTable
+      <Table
         title={() => {
           return (
             <Space wrap>
@@ -88,19 +87,18 @@ export default function JobCostingPartsTable({ data, summaryData }) {
         onChange={handleTableChange}
         pagination={{ placement: "top", defaultPageSize: pageLimit }}
         columns={columns}
-        mobileColumnKeys={["cost_center", "sales", "costs", "gpdollars", "gppercent"]}
         rowKey="id"
         dataSource={filteredData}
         summary={() => (
-          <ResponsiveTable.Summary.Row>
-            <ResponsiveTable.Summary.Cell>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
               <Typography.Title level={4}>{t("general.labels.totals")}</Typography.Title>
-            </ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell>{Dinero(summaryData.totalSales).toFormat()}</ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell>{Dinero(summaryData.totalCost).toFormat()}</ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell>{Dinero(summaryData.gpdollars).toFormat()}</ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell></ResponsiveTable.Summary.Cell>
-          </ResponsiveTable.Summary.Row>
+            </Table.Summary.Cell>
+            <Table.Summary.Cell>{Dinero(summaryData.totalSales).toFormat()}</Table.Summary.Cell>
+            <Table.Summary.Cell>{Dinero(summaryData.totalCost).toFormat()}</Table.Summary.Cell>
+            <Table.Summary.Cell>{Dinero(summaryData.gpdollars).toFormat()}</Table.Summary.Cell>
+            <Table.Summary.Cell></Table.Summary.Cell>
+          </Table.Summary.Row>
         )}
       />
     </div>
diff --git a/client/src/components/job-detail-cards/job-detail-cards.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.component.jsx
index 716e93dff..cfe42fa67 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.component.jsx
@@ -58,8 +58,10 @@ const span = {
 export function JobDetailCards({ bodyshop, setPrintCenterContext, insertAuditTrail }) {
   const { scenarioNotificationsOn } = useSocket();
   const [updateJob] = useMutation(UPDATE_JOB);
-  const screens = Grid.useBreakpoint();
-  
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
   const bpoints = {
     xs: "100%",
     sm: "100%",
@@ -68,14 +70,7 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext, insertAuditTra
     xl: "75%",
     xxl: "75%"
   };
-  
-  let drawerPercentage = "100%";
-  if (screens.xxl) drawerPercentage = bpoints.xxl;
-  else if (screens.xl) drawerPercentage = bpoints.xl;
-  else if (screens.lg) drawerPercentage = bpoints.lg;
-  else if (screens.md) drawerPercentage = bpoints.md;
-  else if (screens.sm) drawerPercentage = bpoints.sm;
-  else if (screens.xs) drawerPercentage = bpoints.xs;
+  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
 
   const searchParams = queryString.parse(useLocation().search);
   const { selected } = searchParams;
diff --git a/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
index 127d5f94d..a8e749c9a 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
@@ -1,4 +1,4 @@
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Table } from "antd";
 import { useTranslation } from "react-i18next";
 import JobLineNotePopup from "../job-line-note-popup/job-line-note-popup.component";
 import PartsStatusPie from "../parts-status-pie/parts-status-pie.component";
@@ -101,12 +101,7 @@ function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
     <div>
       <CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
         <PartsStatusPie joblines_status={joblines_status} />
-        <ResponsiveTable
-          rowKey="id"
-          columns={columns}
-          mobileColumnKeys={["status", "line_desc", "part_type", "part_qty"]}
-          dataSource={filteredJobLines || []}
-        />
+        <Table rowKey="id" columns={columns} dataSource={filteredJobLines || []} />
       </CardTemplate>
     </div>
   );
diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index d5df5480e..735374b11 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -690,7 +690,6 @@ export function JobLinesComponent({
 
       <Table
         columns={columns}
-        // mobileColumnKeys={["status", "line_desc", "actions", "line_no"]}
         rowKey="id"
         loading={loading}
         pagination={false}
diff --git a/client/src/components/job-lifecycle/job-lifecycle.component.jsx b/client/src/components/job-lifecycle/job-lifecycle.component.jsx
index 3bcb886dc..53e8ae5ab 100644
--- a/client/src/components/job-lifecycle/job-lifecycle.component.jsx
+++ b/client/src/components/job-lifecycle/job-lifecycle.component.jsx
@@ -1,7 +1,6 @@
 import { useQuery } from "@apollo/client/react";
 import { gql } from "@apollo/client";
-import { Badge, Card, Space, Tag } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Badge, Card, Space, Table, Tag } from "antd";
 import axios from "axios";
 import { isEmpty } from "lodash";
 import { useCallback, useEffect, useState } from "react";
@@ -312,13 +311,12 @@ export function JobLifecycleComponent({ bodyshop, job, statuses }) {
                 </>
               }
             >
-              <ResponsiveTable
+              <Table
                 style={{
                   overflow: "auto",
                   width: "100%"
                 }}
                 columns={columns}
-                mobileColumnKeys={["value", "start", "start_readable", "end"]}
                 dataSource={lifecycleData.lifecycle}
                 rowKey="start"
               />
diff --git a/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx b/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx
index 43ec0e8a8..c173dfbcb 100644
--- a/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx
+++ b/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx
@@ -88,15 +88,17 @@ export function JoblineBulkAssign({ setSelectedLines, selectedLines, insertAudit
         >
           <Select
             showSearch={{
-              optionFilterProp: "label",
-              filterOption: (input, option) => option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+              optionFilterProp: "children",
+              filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
             }}
             style={{ width: 200 }}
-            options={bodyshop.employee_teams.map((team) => ({
-              value: team.id,
-              label: team.name
-            }))}
-          />
+          >
+            {bodyshop.employee_teams.map((team) => (
+              <Select.Option value={team.id} key={team.id} name={team.name}>
+                {team.name}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
 
         <Space wrap>
diff --git a/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
index da2161f86..4f088697d 100644
--- a/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
+++ b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
@@ -122,26 +122,22 @@ export function JobLineConvertToLabor({
             }
           ]}
         >
-          <Select
-            allowClear
-            showSearch
-            options={[
-              { value: "LAA", label: t("joblines.fields.lbr_types.LAA") },
-              { value: "LAB", label: t("joblines.fields.lbr_types.LAB") },
-              { value: "LAD", label: t("joblines.fields.lbr_types.LAD") },
-              { value: "LAE", label: t("joblines.fields.lbr_types.LAE") },
-              { value: "LAF", label: t("joblines.fields.lbr_types.LAF") },
-              { value: "LAG", label: t("joblines.fields.lbr_types.LAG") },
-              { value: "LAM", label: t("joblines.fields.lbr_types.LAM") },
-              { value: "LAR", label: t("joblines.fields.lbr_types.LAR") },
-              { value: "LAS", label: t("joblines.fields.lbr_types.LAS") },
-              { value: "LAU", label: t("joblines.fields.lbr_types.LAU") },
-              { value: "LA1", label: t("joblines.fields.lbr_types.LA1") },
-              { value: "LA2", label: t("joblines.fields.lbr_types.LA2") },
-              { value: "LA3", label: t("joblines.fields.lbr_types.LA3") },
-              { value: "LA4", label: t("joblines.fields.lbr_types.LA4") }
-            ]}
-          />
+          <Select allowClear showSearch={{ optionFilterProp: "children" }}>
+            <Select.Option value="LAA">{t("joblines.fields.lbr_types.LAA")}</Select.Option>
+            <Select.Option value="LAB">{t("joblines.fields.lbr_types.LAB")}</Select.Option>
+            <Select.Option value="LAD">{t("joblines.fields.lbr_types.LAD")}</Select.Option>
+            <Select.Option value="LAE">{t("joblines.fields.lbr_types.LAE")}</Select.Option>
+            <Select.Option value="LAF">{t("joblines.fields.lbr_types.LAF")}</Select.Option>
+            <Select.Option value="LAG">{t("joblines.fields.lbr_types.LAG")}</Select.Option>
+            <Select.Option value="LAM">{t("joblines.fields.lbr_types.LAM")}</Select.Option>
+            <Select.Option value="LAR">{t("joblines.fields.lbr_types.LAR")}</Select.Option>
+            <Select.Option value="LAS">{t("joblines.fields.lbr_types.LAS")}</Select.Option>
+            <Select.Option value="LAU">{t("joblines.fields.lbr_types.LAU")}</Select.Option>
+            <Select.Option value="LA1">{t("joblines.fields.lbr_types.LA1")}</Select.Option>
+            <Select.Option value="LA2">{t("joblines.fields.lbr_types.LA2")}</Select.Option>
+            <Select.Option value="LA3">{t("joblines.fields.lbr_types.LA3")}</Select.Option>
+            <Select.Option value="LA4">{t("joblines.fields.lbr_types.LA4")}</Select.Option>
+          </Select>
         </Form.Item>
 
         <Form.Item shouldUpdate>
diff --git a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
index f8af2e2b8..23a55f611 100644
--- a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
+++ b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
@@ -115,18 +115,19 @@ export function JobLineDispatchButton({
         >
           <Select
             showSearch={{
-              optionFilterProp: "label",
-              filterOption: (input, option) => option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+              optionFilterProp: "children",
+              filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
             }}
             style={{ width: 200 }}
-            options={bodyshop.employees
+          >
+            {bodyshop.employees
               .filter((emp) => emp.active)
-              .map((emp) => ({
-                value: emp.id,
-                key: emp.id,
-                label: `${emp.first_name} ${emp.last_name}`
-              }))}
-          />
+              .map((emp) => (
+                <Select.Option value={emp.id} key={emp.id} name={`${emp.first_name} ${emp.last_name}`}>
+                  {`${emp.first_name} ${emp.last_name}`}
+                </Select.Option>
+              ))}
+          </Select>
         </Form.Item>
 
         <Space wrap>
diff --git a/client/src/components/job-line-status-popup/job-line-status-popup.component.jsx b/client/src/components/job-line-status-popup/job-line-status-popup.component.jsx
index 4e669899a..560698a4d 100644
--- a/client/src/components/job-line-status-popup/job-line-status-popup.component.jsx
+++ b/client/src/components/job-line-status-popup/job-line-status-popup.component.jsx
@@ -64,12 +64,13 @@ export function JobLineStatusPopup({ bodyshop, jobline, disabled }) {
             onSelect={handleChange}
             onBlur={handleSave}
             onClear={() => handleChange(null)}
-            options={Object.values(bodyshop.md_order_statuses).map((s, idx) => ({
-              key: idx,
-              value: s,
-              label: s
-            }))}
-          />
+          >
+            {Object.values(bodyshop.md_order_statuses).map((s, idx) => (
+              <Select.Option key={idx} value={s}>
+                {s}
+              </Select.Option>
+            ))}
+          </Select>
         </LoadingSpinner>
       </div>
     );
diff --git a/client/src/components/job-line-team-assignment/job-line-team-assignmnent.component.jsx b/client/src/components/job-line-team-assignment/job-line-team-assignmnent.component.jsx
index 92c6f97ec..169368ece 100644
--- a/client/src/components/job-line-team-assignment/job-line-team-assignmnent.component.jsx
+++ b/client/src/components/job-line-team-assignment/job-line-team-assignmnent.component.jsx
@@ -75,12 +75,13 @@ export function JoblineTeamAssignment({ bodyshop, jobline, disabled, jobId, inse
             onSelect={handleChange}
             onBlur={handleSave}
             onClear={() => handleChange(null)}
-            options={Object.values(bodyshop.employee_teams).map((s) => ({
-              key: s.id,
-              value: s.id,
-              label: s.name
-            }))}
-          />
+          >
+            {Object.values(bodyshop.employee_teams).map((s, idx) => (
+              <Select.Option key={idx} value={s.id}>
+                {s.name}
+              </Select.Option>
+            ))}
+          </Select>
         </LoadingSpinner>
       </div>
     );
diff --git a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
index 17f626c0d..05362b55e 100644
--- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
+++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
@@ -67,22 +67,22 @@ export function JobLinesUpsertModalComponent({ bodyshop, open, jobLine, handleCa
         </LayoutFormRow>
         <LayoutFormRow grow>
           <Form.Item label={t("joblines.fields.mod_lbr_ty")} name="mod_lbr_ty">
-            <Select allowClear options={[
-              { value: "LAA", label: t("joblines.fields.lbr_types.LAA") },
-              { value: "LAB", label: t("joblines.fields.lbr_types.LAB") },
-              { value: "LAD", label: t("joblines.fields.lbr_types.LAD") },
-              { value: "LAE", label: t("joblines.fields.lbr_types.LAE") },
-              { value: "LAF", label: t("joblines.fields.lbr_types.LAF") },
-              { value: "LAG", label: t("joblines.fields.lbr_types.LAG") },
-              { value: "LAM", label: t("joblines.fields.lbr_types.LAM") },
-              { value: "LAR", label: t("joblines.fields.lbr_types.LAR") },
-              { value: "LAS", label: t("joblines.fields.lbr_types.LAS") },
-              { value: "LAU", label: t("joblines.fields.lbr_types.LAU") },
-              { value: "LA1", label: t("joblines.fields.lbr_types.LA1") },
-              { value: "LA2", label: t("joblines.fields.lbr_types.LA2") },
-              { value: "LA3", label: t("joblines.fields.lbr_types.LA3") },
-              { value: "LA4", label: t("joblines.fields.lbr_types.LA4") }
-            ]} />
+            <Select allowClear>
+              <Select.Option value="LAA">{t("joblines.fields.lbr_types.LAA")}</Select.Option>
+              <Select.Option value="LAB">{t("joblines.fields.lbr_types.LAB")}</Select.Option>
+              <Select.Option value="LAD">{t("joblines.fields.lbr_types.LAD")}</Select.Option>
+              <Select.Option value="LAE">{t("joblines.fields.lbr_types.LAE")}</Select.Option>
+              <Select.Option value="LAF">{t("joblines.fields.lbr_types.LAF")}</Select.Option>
+              <Select.Option value="LAG">{t("joblines.fields.lbr_types.LAG")}</Select.Option>
+              <Select.Option value="LAM">{t("joblines.fields.lbr_types.LAM")}</Select.Option>
+              <Select.Option value="LAR">{t("joblines.fields.lbr_types.LAR")}</Select.Option>
+              <Select.Option value="LAS">{t("joblines.fields.lbr_types.LAS")}</Select.Option>
+              <Select.Option value="LAU">{t("joblines.fields.lbr_types.LAU")}</Select.Option>
+              <Select.Option value="LA1">{t("joblines.fields.lbr_types.LA1")}</Select.Option>
+              <Select.Option value="LA2">{t("joblines.fields.lbr_types.LA2")}</Select.Option>
+              <Select.Option value="LA3">{t("joblines.fields.lbr_types.LA3")}</Select.Option>
+              <Select.Option value="LA4">{t("joblines.fields.lbr_types.LA4")}</Select.Option>
+            </Select>
           </Form.Item>
           <Form.Item label={t("joblines.fields.op_code_desc")} name="op_code_desc">
             <Input />
@@ -128,17 +128,17 @@ export function JobLinesUpsertModalComponent({ bodyshop, open, jobLine, handleCa
         </LayoutFormRow>
         <LayoutFormRow>
           <Form.Item label={t("joblines.fields.part_type")} name="part_type">
-            <Select allowClear options={[
-              { value: "PAA", label: t("joblines.fields.part_types.PAA") },
-              { value: "PAC", label: t("joblines.fields.part_types.PAC") },
-              { value: "PAE", label: t("joblines.fields.part_types.PAE") },
-              { value: "PAL", label: t("joblines.fields.part_types.PAL") },
-              { value: "PAM", label: t("joblines.fields.part_types.PAM") },
-              { value: "PAN", label: t("joblines.fields.part_types.PAN") },
-              { value: "PAO", label: t("joblines.fields.part_types.PAO") },
-              { value: "PAR", label: t("joblines.fields.part_types.PAR") },
-              { value: "PAS", label: t("joblines.fields.part_types.PAS") }
-            ]} />
+            <Select allowClear>
+              <Select.Option value="PAA">{t("joblines.fields.part_types.PAA")}</Select.Option>
+              <Select.Option value="PAC">{t("joblines.fields.part_types.PAC")}</Select.Option>
+              <Select.Option value="PAE">{t("joblines.fields.part_types.PAE")}</Select.Option>
+              <Select.Option value="PAL">{t("joblines.fields.part_types.PAL")}</Select.Option>
+              <Select.Option value="PAM">{t("joblines.fields.part_types.PAM")}</Select.Option>
+              <Select.Option value="PAN">{t("joblines.fields.part_types.PAN")}</Select.Option>
+              <Select.Option value="PAO">{t("joblines.fields.part_types.PAO")}</Select.Option>
+              <Select.Option value="PAR">{t("joblines.fields.part_types.PAR")}</Select.Option>
+              <Select.Option value="PAS">{t("joblines.fields.part_types.PAS")}</Select.Option>
+            </Select>
           </Form.Item>
           <Form.Item label={t("joblines.fields.oem_partno")} name="oem_partno">
             <Input />
diff --git a/client/src/components/job-payments/job-payments.component.jsx b/client/src/components/job-payments/job-payments.component.jsx
index c0cbb9846..37342aa83 100644
--- a/client/src/components/job-payments/job-payments.component.jsx
+++ b/client/src/components/job-payments/job-payments.component.jsx
@@ -1,6 +1,5 @@
 import { EditFilled } from "@ant-design/icons";
-import { Button, Card, Space } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Space, Table } from "antd";
 import Dinero from "dinero.js";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -187,9 +186,8 @@ export function JobPayments({ job, bodyshop, setPaymentContext, setCardPaymentCo
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         columns={columns}
-        mobileColumnKeys={["date", "amount", "actions", "payer"]}
         rowKey="id"
         pagination={false}
         onChange={handleTableChange}
@@ -201,18 +199,18 @@ export function JobPayments({ job, bodyshop, setPaymentContext, setCardPaymentCo
           expandedRowRender: (record) => <PaymentExpandedRowComponent record={record} bodyshop={bodyshop} />
         }}
         summary={() => (
-          <ResponsiveTable.Summary.Row>
-            <ResponsiveTable.Summary.Cell>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
               <strong>{t("payments.labels.totalpayments")}</strong>
-            </ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell />
-            <ResponsiveTable.Summary.Cell>
+            </Table.Summary.Cell>
+            <Table.Summary.Cell />
+            <Table.Summary.Cell>
               <strong>{total.toFormat()}</strong>
-            </ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell />
-            <ResponsiveTable.Summary.Cell />
-            <ResponsiveTable.Summary.Cell />
-          </ResponsiveTable.Summary.Row>
+            </Table.Summary.Cell>
+            <Table.Summary.Cell />
+            <Table.Summary.Cell />
+            <Table.Summary.Cell />
+          </Table.Summary.Row>
         )}
       />
     </Card>
diff --git a/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx b/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx
index 41ba39e17..b779c6c69 100644
--- a/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx
+++ b/client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx
@@ -1,5 +1,4 @@
-import { Checkbox, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Checkbox, Table, Typography } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -80,12 +79,11 @@ export default function JobReconciliationBillsTable({ billLineState, invoiceLine
   return (
     <div>
       <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
-      <ResponsiveTable
+      <Table
         pagination={false}
         size="small"
         scroll={{ y: "60vh" }}
         columns={columns}
-        mobileColumnKeys={["line_desc", "from", "actual_price", "actual_cost"]}
         rowKey="id"
         dataSource={invoiceLineData}
         onChange={handleTableChange}
diff --git a/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx b/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx
index c3198cc6e..903ecdd5b 100644
--- a/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx
+++ b/client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx
@@ -1,5 +1,4 @@
-import { Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Table, Typography } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -97,10 +96,9 @@ export default function JobReconcilitionPartsTable({ jobLineState, jobLineData }
   return (
     <div>
       <Typography.Title level={4}>{t("jobs.labels.lines")}</Typography.Title>
-      <ResponsiveTable
+      <Table
         pagination={false}
         columns={columns}
-        mobileColumnKeys={["status", "line_desc", "total", "oem_partno"]}
         size="small"
         scroll={{ y: "60vh" }}
         rowKey="id"
diff --git a/client/src/components/job-search-select/job-search-select.component.jsx b/client/src/components/job-search-select/job-search-select.component.jsx
index 7fa9b3c6c..62d1f60f3 100644
--- a/client/src/components/job-search-select/job-search-select.component.jsx
+++ b/client/src/components/job-search-select/job-search-select.component.jsx
@@ -8,6 +8,8 @@ import { SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE, SEARCH_JOBS_FOR_AUTOCOMPLETE } from
 import AlertComponent from "../alert/alert.component";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 
+const { Option } = Select;
+
 const JobSearchSelect = ({
   disabled,
   convertedOnly = false,
@@ -85,24 +87,24 @@ const JobSearchSelect = ({
         style={{ width: "100%" }}
         suffixIcon={(loading || idLoading) && <Spin />} // matches OLD spinner semantics
         notFoundContent={loading ? <LoadingOutlined /> : null} // matches OLD (loading only)
-        options={theOptions?.map((o) => ({
-          key: o.id,
-          value: o.id,
-          status: o.status,
-          label: (
-            <Space align="center">
-              <span>
-                {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${o.ro_number || t("general.labels.na")} | ${OwnerNameDisplayFunction(
-                  o
-                )} | ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${o.v_model_desc || ""}`}
-              </span>
-              <Tag>
-                <strong>{o.status}</strong>
-              </Tag>
-            </Space>
-          )
-        }))}
-      />
+      >
+        {theOptions
+          ? theOptions.map((o) => (
+              <Option key={o.id} value={o.id} status={o.status}>
+                <Space align="center">
+                  <span>
+                    {`${clm_no && o.clm_no ? `${o.clm_no} | ` : ""}${o.ro_number || t("general.labels.na")} | ${OwnerNameDisplayFunction(
+                      o
+                    )} | ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${o.v_model_desc || ""}`}
+                  </span>
+                  <Tag>
+                    <strong>{o.status}</strong>
+                  </Tag>
+                </Space>
+              </Option>
+            ))
+          : null}
+      </Select>
 
       {error ? <AlertComponent title={error.message} type="error" /> : null}
       {idError ? <AlertComponent title={idError.message} type="error" /> : null}
diff --git a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
index 4da437b95..d08ac925e 100644
--- a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
@@ -1,5 +1,4 @@
-import { Space } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Space, Table } from "antd";
 import Dinero from "dinero.js";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -105,9 +104,8 @@ export default function JobTotalsTableLabor({ job }) {
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
   return (
-    <ResponsiveTable
+    <Table
       columns={columns}
-      mobileColumnKeys={["total", "profitcenter_labor", "rate", "mod_lb_hrs"]}
       rowKey="id"
       pagination={false}
       onChange={handleTableChange}
@@ -117,29 +115,29 @@ export default function JobTotalsTableLabor({ job }) {
       }}
       summary={() => (
         <>
-          <ResponsiveTable.Summary.Row>
-            <ResponsiveTable.Summary.Cell>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
               <strong>{t("jobs.labels.labor_rates_subtotal")}</strong>
-            </ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell />
-            <ResponsiveTable.Summary.Cell>
+            </Table.Summary.Cell>
+            <Table.Summary.Cell />
+            <Table.Summary.Cell>
               {(job.job_totals.rates.mapa.hours + job.job_totals.rates.mash.hours).toFixed(1)}
-            </ResponsiveTable.Summary.Cell>
+            </Table.Summary.Cell>
             {InstanceRenderManager({
               imex: null,
               rome: (
                 <>
-                  <ResponsiveTable.Summary.Cell />
-                  <ResponsiveTable.Summary.Cell />
+                  <Table.Summary.Cell />
+                  <Table.Summary.Cell />
                 </>
               )
             })}
-            <ResponsiveTable.Summary.Cell align="right">
+            <Table.Summary.Cell align="right">
               <strong>{Dinero(job.job_totals.rates.rates_subtotal).toFormat()}</strong>
-            </ResponsiveTable.Summary.Cell>
-          </ResponsiveTable.Summary.Row>
-          <ResponsiveTable.Summary.Row>
-            <ResponsiveTable.Summary.Cell>
+            </Table.Summary.Cell>
+          </Table.Summary.Row>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
               <Space>
                 {t("jobs.labels.mapa")}
                 {InstanceRenderManager({
@@ -158,34 +156,34 @@ export default function JobTotalsTableLabor({ job }) {
                     })
                 })}
               </Space>
-            </ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell align="right">
+            </Table.Summary.Cell>
+            <Table.Summary.Cell align="right">
               <CurrencyFormatter>{job.job_totals.rates.mapa.rate}</CurrencyFormatter>
-            </ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell>{job.job_totals.rates.mapa.hours.toFixed(1)}</ResponsiveTable.Summary.Cell>
+            </Table.Summary.Cell>
+            <Table.Summary.Cell>{job.job_totals.rates.mapa.hours.toFixed(1)}</Table.Summary.Cell>
             {InstanceRenderManager({
               imex: (
-                <ResponsiveTable.Summary.Cell align="right">
+                <Table.Summary.Cell align="right">
                   {Dinero(job.job_totals.rates.mapa.total).toFormat()}
-                </ResponsiveTable.Summary.Cell>
+                </Table.Summary.Cell>
               ),
               rome: (
                 <>
-                  <ResponsiveTable.Summary.Cell align="right">
+                  <Table.Summary.Cell align="right">
                     {Dinero(job.job_totals.rates.mapa.base).toFormat()}
-                  </ResponsiveTable.Summary.Cell>
-                  <ResponsiveTable.Summary.Cell align="right">
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
                     {Dinero(job.job_totals.rates.mapa.adjustment).toFormat()}
-                  </ResponsiveTable.Summary.Cell>
-                  <ResponsiveTable.Summary.Cell align="right">
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
                     {Dinero(job.job_totals.rates.mapa.total).toFormat()}
-                  </ResponsiveTable.Summary.Cell>
+                  </Table.Summary.Cell>
                 </>
               )
             })}
-          </ResponsiveTable.Summary.Row>
-          <ResponsiveTable.Summary.Row>
-            <ResponsiveTable.Summary.Cell>
+          </Table.Summary.Row>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
               <Space wrap>
                 {t("jobs.labels.mash")}
                 {InstanceRenderManager({
@@ -204,51 +202,51 @@ export default function JobTotalsTableLabor({ job }) {
                     })
                 })}
               </Space>
-            </ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell align="right">
+            </Table.Summary.Cell>
+            <Table.Summary.Cell align="right">
               <CurrencyFormatter>{job.job_totals.rates.mash.rate}</CurrencyFormatter>
-            </ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell>{job.job_totals.rates.mash.hours.toFixed(1)}</ResponsiveTable.Summary.Cell>
+            </Table.Summary.Cell>
+            <Table.Summary.Cell>{job.job_totals.rates.mash.hours.toFixed(1)}</Table.Summary.Cell>
             {InstanceRenderManager({
               imex: (
-                <ResponsiveTable.Summary.Cell align="right">
+                <Table.Summary.Cell align="right">
                   {Dinero(job.job_totals.rates.mash.total).toFormat()}
-                </ResponsiveTable.Summary.Cell>
+                </Table.Summary.Cell>
               ),
               rome: (
                 <>
-                  <ResponsiveTable.Summary.Cell align="right">
+                  <Table.Summary.Cell align="right">
                     {Dinero(job.job_totals.rates.mash.base).toFormat()}
-                  </ResponsiveTable.Summary.Cell>
-                  <ResponsiveTable.Summary.Cell align="right">
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
                     {Dinero(job.job_totals.rates.mash.adjustment).toFormat()}
-                  </ResponsiveTable.Summary.Cell>
-                  <ResponsiveTable.Summary.Cell align="right">
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell align="right">
                     {Dinero(job.job_totals.rates.mash.total).toFormat()}
-                  </ResponsiveTable.Summary.Cell>
+                  </Table.Summary.Cell>
                 </>
               )
             })}
-          </ResponsiveTable.Summary.Row>
-          <ResponsiveTable.Summary.Row>
-            <ResponsiveTable.Summary.Cell>
+          </Table.Summary.Row>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
               <strong>{t("jobs.labels.rates_subtotal")}</strong>
-            </ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell />
-            <ResponsiveTable.Summary.Cell />
+            </Table.Summary.Cell>
+            <Table.Summary.Cell />
+            <Table.Summary.Cell />
             {InstanceRenderManager({
               imex: null,
               rome: (
                 <>
-                  <ResponsiveTable.Summary.Cell />
-                  <ResponsiveTable.Summary.Cell />
+                  <Table.Summary.Cell />
+                  <Table.Summary.Cell />
                 </>
               )
             })}
-            <ResponsiveTable.Summary.Cell align="right">
+            <Table.Summary.Cell align="right">
               <strong>{Dinero(job.job_totals.rates.subtotal).toFormat()}</strong>
-            </ResponsiveTable.Summary.Cell>
-          </ResponsiveTable.Summary.Row>
+            </Table.Summary.Cell>
+          </Table.Summary.Row>
         </>
       )}
     />
diff --git a/client/src/components/job-totals-table/job-totals.table.other.component.jsx b/client/src/components/job-totals-table/job-totals.table.other.component.jsx
index 272138132..51f96d81b 100644
--- a/client/src/components/job-totals-table/job-totals.table.other.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.other.component.jsx
@@ -1,4 +1,4 @@
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Table } from "antd";
 import Dinero from "dinero.js";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -65,9 +65,8 @@ export default function JobTotalsTableOther({ job }) {
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
   return (
-    <ResponsiveTable
+    <Table
       columns={columns}
-      mobileColumnKeys={["total", "key"]}
       rowKey="key"
       pagination={false}
       onChange={handleTableChange}
@@ -77,24 +76,24 @@ export default function JobTotalsTableOther({ job }) {
       }}
       summary={() => (
         <>
-          <ResponsiveTable.Summary.Row>
-            <ResponsiveTable.Summary.Cell>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
               <strong>{t("jobs.labels.additionaltotal")}</strong>
-            </ResponsiveTable.Summary.Cell>
+            </Table.Summary.Cell>
 
-            <ResponsiveTable.Summary.Cell align="right">
+            <Table.Summary.Cell align="right">
               <strong>{Dinero(job.job_totals.additional.total).toFormat()}</strong>
-            </ResponsiveTable.Summary.Cell>
-          </ResponsiveTable.Summary.Row>
-          <ResponsiveTable.Summary.Row>
-            <ResponsiveTable.Summary.Cell>
+            </Table.Summary.Cell>
+          </Table.Summary.Row>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
               <strong>{t("jobs.labels.subletstotal")}</strong>
-            </ResponsiveTable.Summary.Cell>
+            </Table.Summary.Cell>
 
-            <ResponsiveTable.Summary.Cell align="right">
+            <Table.Summary.Cell align="right">
               <strong>{Dinero(job.job_totals.parts.sublets.total).toFormat()}</strong>
-            </ResponsiveTable.Summary.Cell>
-          </ResponsiveTable.Summary.Row>
+            </Table.Summary.Cell>
+          </Table.Summary.Row>
         </>
       )}
     />
diff --git a/client/src/components/job-totals-table/job-totals.table.parts.component.jsx b/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
index df62dd003..9141ce848 100644
--- a/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
@@ -1,4 +1,4 @@
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Table } from "antd";
 import Dinero from "dinero.js";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -64,9 +64,8 @@ export default function JobTotalsTableParts({ job }) {
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
   return (
-    <ResponsiveTable
+    <Table
       columns={columns}
-      mobileColumnKeys={["total", "id"]}
       rowKey="id"
       pagination={false}
       onChange={handleTableChange}
@@ -76,38 +75,36 @@ export default function JobTotalsTableParts({ job }) {
       }}
       summary={() => (
         <>
-          <ResponsiveTable.Summary.Row>
-            <ResponsiveTable.Summary.Cell>{t("jobs.labels.prt_dsmk_total")}</ResponsiveTable.Summary.Cell>
-            <ResponsiveTable.Summary.Cell align="right">
+          <Table.Summary.Row>
+            <Table.Summary.Cell>{t("jobs.labels.prt_dsmk_total")}</Table.Summary.Cell>
+            <Table.Summary.Cell align="right">
               {Dinero(job.job_totals.parts.parts.prt_dsmk_total).toFormat()}
-            </ResponsiveTable.Summary.Cell>
-          </ResponsiveTable.Summary.Row>
+            </Table.Summary.Cell>
+          </Table.Summary.Row>
 
-          <ResponsiveTable.Summary.Row>
-            <ResponsiveTable.Summary.Cell>
+          <Table.Summary.Row>
+            <Table.Summary.Cell>
               <strong>{t("jobs.labels.partstotal")}</strong>
-            </ResponsiveTable.Summary.Cell>
+            </Table.Summary.Cell>
 
-            <ResponsiveTable.Summary.Cell align="right">
+            <Table.Summary.Cell align="right">
               <strong>{Dinero(job.job_totals.parts.parts.total).toFormat()}</strong>
-            </ResponsiveTable.Summary.Cell>
-          </ResponsiveTable.Summary.Row>
+            </Table.Summary.Cell>
+          </Table.Summary.Row>
           {
             //TODO:AIO This shoudl only be in the US version. need to verify whether this causes problems for the CA version.
             insuranceAdjustments.length > 0 && (
-              <ResponsiveTable.Summary.Row>
-                <ResponsiveTable.Summary.Cell colSpan={24}>
-                  {t("jobs.labels.profileadjustments")}
-                </ResponsiveTable.Summary.Cell>
-              </ResponsiveTable.Summary.Row>
+              <Table.Summary.Row>
+                <Table.Summary.Cell colSpan={24}>{t("jobs.labels.profileadjustments")}</Table.Summary.Cell>
+              </Table.Summary.Row>
             )
           }
           {insuranceAdjustments.map((adj, idx) => (
-            <ResponsiveTable.Summary.Row key={idx}>
-              <ResponsiveTable.Summary.Cell>{t(`jobs.fields.${adj.id.toLowerCase()}`)}</ResponsiveTable.Summary.Cell>
+            <Table.Summary.Row key={idx}>
+              <Table.Summary.Cell>{t(`jobs.fields.${adj.id.toLowerCase()}`)}</Table.Summary.Cell>
 
-              <ResponsiveTable.Summary.Cell align="right">{adj.amount.toFormat()}</ResponsiveTable.Summary.Cell>
-            </ResponsiveTable.Summary.Row>
+              <Table.Summary.Cell align="right">{adj.amount.toFormat()}</Table.Summary.Cell>
+            </Table.Summary.Row>
           ))}
         </>
       )}
diff --git a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
index 14d5d58da..c1bc373a8 100644
--- a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
@@ -1,4 +1,4 @@
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Table } from "antd";
 import Dinero from "dinero.js";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
@@ -245,9 +245,8 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
   ];
 
   return (
-    <ResponsiveTable
+    <Table
       columns={columns}
-      mobileColumnKeys={["total", "key"]}
       rowKey="key"
       showHeader={false}
       pagination={false}
diff --git a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
index 537995bbc..a89547f8f 100644
--- a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
+++ b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
@@ -59,12 +59,13 @@ export function JobsAdminClass({ bodyshop, job }) {
             }
           ]}
         >
-          <Select
-            options={bodyshop.md_classes.map((s) => ({
-              value: s,
-              label: s
-            }))}
-          />
+          <Select>
+            {bodyshop.md_classes.map((s) => (
+              <Select.Option key={s} value={s}>
+                {s}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
       </Form>
 
diff --git a/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx b/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
index 83b3b4f30..763a45d10 100644
--- a/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
+++ b/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
@@ -1,5 +1,5 @@
 import { DownloadOutlined, SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space } from "antd";
+import { Button, Card, Input, Space, Table } from "antd";
 import axios from "axios";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -9,7 +9,6 @@ import { useNotification } from "../../contexts/Notifications/notificationContex
 import { selectPartnerVersion } from "../../redux/application/application.selectors";
 import { alphaSort } from "../../utils/sorters";
 import { logImEXEvent } from "../../firebase/firebase.utils.js";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -142,11 +141,10 @@ export function JobsAvailableScan({ partnerVersion, refetch }) {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["cieca_id", "owner", "vehicle", "actions"]}
         rowKey="id"
         dataSource={data}
         onChange={handleTableChange}
diff --git a/client/src/components/jobs-available-table/jobs-available-table.component.jsx b/client/src/components/jobs-available-table/jobs-available-table.component.jsx
index f6f0d7990..918f21ec7 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.component.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.component.jsx
@@ -1,6 +1,6 @@
 import { DeleteFilled, DownloadOutlined, PlusCircleFilled, SyncOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client/react";
-import { Alert, Button, Card, Input, Space } from "antd";
+import { Alert, Button, Card, Input, Space, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -13,7 +13,6 @@ import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils.js";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -210,14 +209,7 @@ export function JobsAvailableComponent({ bodyshop, loading, data, refetch, addJo
         </Space>
       }
     >
-      <ResponsiveTable
-        loading={loading}
-        columns={columns}
-        mobileColumnKeys={["cieca_id", "job_id", "ownr_name", "vehicle_info", "actions"]}
-        rowKey="id"
-        dataSource={availableJobs}
-        onChange={handleTableChange}
-      />
+      <Table loading={loading} columns={columns} rowKey="id" dataSource={availableJobs} onChange={handleTableChange} />
     </Card>
   );
 }
diff --git a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
index e737173e6..a6ad151fb 100644
--- a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
+++ b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
@@ -141,11 +141,13 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                               option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                           }}
                           disabled={jobRO}
-                          options={bodyshop.md_responsibility_centers.profits.map((p) => ({
-                            value: p.name,
-                            label: p.name
-                          }))}
-                        />
+                        >
+                          {bodyshop.md_responsibility_centers.profits.map((p) => (
+                            <Select.Option key={p.name} value={p.name}>
+                              {p.name}
+                            </Select.Option>
+                          ))}
+                        </Select>
                       </Form.Item>
                     </td>
                     <td>
@@ -169,11 +171,13 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                               option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                           }}
                           disabled={jobRO}
-                          options={bodyshop.md_responsibility_centers.profits.map((p) => ({
-                            value: p.name,
-                            label: p.name
-                          }))}
-                        />
+                        >
+                          {bodyshop.md_responsibility_centers.profits.map((p) => (
+                            <Select.Option key={p.name} value={p.name}>
+                              {p.name}
+                            </Select.Option>
+                          ))}
+                        </Select>
                       </Form.Item>
                     </td>
                   </tr>
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index 78ebecf27..72de99502 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -2,7 +2,7 @@ import { useMutation } from "@apollo/client/react";
 import { Button, Divider, Form, Input, Modal, Select, Space, Switch } from "antd";
 import axios from "axios";
 import { some } from "lodash";
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -19,10 +19,10 @@ import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import RREarlyROForm from "../dms-post-form/rr-early-ro-form";
 
 const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly
 });
-
 const mapDispatchToProps = (dispatch) => ({
   insertAuditTrail: ({ jobid, operation, type }) =>
     dispatch(
@@ -37,17 +37,16 @@ const mapDispatchToProps = (dispatch) => ({
 export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTrail, parentFormIsFieldsTouched }) {
   const [open, setOpen] = useState(false);
   const [loading, setLoading] = useState(false);
-
-  const [earlyRoCreated, setEarlyRoCreated] = useState(!!job?.dms_id);
-  const [earlyRoCreatedThisSession, setEarlyRoCreatedThisSession] = useState(false);
-
+  const [earlyRoCreated, setEarlyRoCreated] = useState(!!job?.dms_id); // Track early RO creation state
+  const [earlyRoCreatedThisSession, setEarlyRoCreatedThisSession] = useState(false); // Track if created in THIS modal session
   const [mutationConvertJob] = useMutation(CONVERT_JOB_TO_RO);
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const notification = useNotification();
   const allFormValues = Form.useWatch([], form);
-  const { socket } = useSocket();
+  const { socket } = useSocket(); // Extract socket from context
 
+  // Get Fortellis treatment for proper DMS mode detection
   const {
     treatments: { Fortellis }
   } = useTreatmentsWithConfig({
@@ -56,64 +55,16 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
     splitKey: bodyshop?.imexshopid
   });
 
+  // Check if bodyshop has Reynolds integration using the proper getDmsMode function
   const dmsMode = getDmsMode(bodyshop, Fortellis.treatment);
   const isReynoldsMode = dmsMode === DMS_MAP.reynolds;
 
-  const insuranceOptions = useMemo(
-    () =>
-      (bodyshop?.md_ins_cos ?? []).map((s) => ({
-        value: s.name,
-        label: s.name
-      })),
-    [bodyshop?.md_ins_cos]
-  );
-
-  const classOptions = useMemo(
-    () =>
-      (bodyshop?.md_classes ?? []).map((s) => ({
-        value: s,
-        label: s
-      })),
-    [bodyshop?.md_classes]
-  );
-
-  const referralOptions = useMemo(
-    () =>
-      (bodyshop?.md_referral_sources ?? []).map((s) => ({
-        value: s,
-        label: s
-      })),
-    [bodyshop?.md_referral_sources]
-  );
-
-  const csrOptions = useMemo(
-    () =>
-      (bodyshop?.employees ?? [])
-        .filter((emp) => emp.active)
-        .map((emp) => ({
-          value: emp.id,
-          label: `${emp.first_name} ${emp.last_name}`
-        })),
-    [bodyshop?.employees]
-  );
-
-  const categoryOptions = useMemo(
-    () =>
-      (bodyshop?.md_categories ?? []).map((s) => ({
-        value: s,
-        label: s
-      })),
-    [bodyshop?.md_categories]
-  );
-
   const handleConvert = async ({ employee_csr, category, ...values }) => {
     if (parentFormIsFieldsTouched()) {
       alert(t("jobs.labels.savebeforeconversion"));
       return;
     }
-
     setLoading(true);
-
     const res = await mutationConvertJob({
       variables: {
         jobId: job.id,
@@ -127,11 +78,13 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
     });
 
     if (values.ca_gst_registrant) {
-      await axios.post("/job/totalsssu", { id: job.id });
+      await axios.post("/job/totalsssu", {
+        id: job.id
+      });
     }
 
     if (!res.errors) {
-      refetch?.();
+      refetch();
       notification.success({
         title: t("jobs.successes.converted")
       });
@@ -144,20 +97,19 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
 
       setOpen(false);
     }
-
     setLoading(false);
   };
 
   const submitDisabled = useCallback(() => some(allFormValues, (v) => v === undefined), [allFormValues]);
 
   const handleEarlyROSuccess = (result) => {
-    setEarlyRoCreated(true);
-    setEarlyRoCreatedThisSession(true);
+    setEarlyRoCreated(true); // Mark early RO as created
+    setEarlyRoCreatedThisSession(true); // Mark as created in this session
     notification.success({
       title: t("jobs.successes.early_ro_created"),
       description: `RO Number: ${result.roNumber || "N/A"}`
     });
-
+    // Delay refetch to keep success message visible for 2 seconds
     setTimeout(() => {
       refetch?.();
     }, 2000);
@@ -178,28 +130,29 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
         disabled={job.converted || jobRO}
         loading={loading}
         onClick={() => {
-          setEarlyRoCreated(!!job?.dms_id);
-          setEarlyRoCreatedThisSession(false);
+          setEarlyRoCreated(!!job?.dms_id); // Initialize state based on current job
+          setEarlyRoCreatedThisSession(false); // Reset session state when opening modal
           setOpen(true);
         }}
       >
         {t("jobs.actions.convert")}
       </Button>
 
+      {/* Convert Job Modal */}
       <Modal
         open={open}
         onCancel={handleModalClose}
-        closable={!(earlyRoCreatedThisSession && !job.converted)}
-        mask={{ closable: !(earlyRoCreatedThisSession && !job.converted) }}
+        closable={!(earlyRoCreatedThisSession && !job.converted)} // Only restrict if created in THIS session
+        maskClosable={!(earlyRoCreatedThisSession && !job.converted)} // Only restrict if created in THIS session
         title={t("jobs.actions.convert")}
         footer={null}
         width={700}
         destroyOnHidden
       >
+        {/* Standard Convert Form */}
         <Form
           layout="vertical"
           form={form}
-          preserve={false}
           onFinish={handleConvert}
           initialValues={{
             driveable: true,
@@ -211,6 +164,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
             referral_source_extra: job.referral_source_extra ?? ""
           }}
         >
+          {/* Show Reynolds Early RO section at the top if applicable */}
           {isReynoldsMode && !job.dms_id && !earlyRoCreated && (
             <>
               <RREarlyROForm
@@ -227,78 +181,127 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
           <Form.Item
             name={["ins_co_nm"]}
             label={t("jobs.fields.ins_co_nm")}
-            rules={[{ required: true }]}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
           >
-            <Select
-              showSearch={{
-                optionFilterProp:'label'
-              }}
-              options={insuranceOptions}
-            />
+            <Select showSearch>
+              {bodyshop.md_ins_cos.map((s, i) => (
+                <Select.Option key={i} value={s.name}>
+                  {s.name}
+                </Select.Option>
+              ))}
+            </Select>
           </Form.Item>
-
           {bodyshop.enforce_class && (
-            <Form.Item name="class" label={t("jobs.fields.class")} rules={[{ required: bodyshop.enforce_class }]}>
-              <Select options={classOptions} />
+            <Form.Item
+              name={"class"}
+              label={t("jobs.fields.class")}
+              rules={[
+                {
+                  required: bodyshop.enforce_class
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <Select>
+                {bodyshop.md_classes.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
+                  </Select.Option>
+                ))}
+              </Select>
             </Form.Item>
           )}
-
           {bodyshop.enforce_referral && (
             <>
               <Form.Item
-                name="referral_source"
+                name={"referral_source"}
                 label={t("jobs.fields.referralsource")}
-                rules={[{ required: bodyshop.enforce_referral }]}
+                rules={[
+                  {
+                    required: bodyshop.enforce_referral
+                    //message: t("general.validation.required"),
+                  }
+                ]}
               >
-                <Select options={referralOptions} />
+                <Select>
+                  {bodyshop.md_referral_sources.map((s) => (
+                    <Select.Option key={s} value={s}>
+                      {s}
+                    </Select.Option>
+                  ))}
+                </Select>
               </Form.Item>
-
               <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
                 <Input />
               </Form.Item>
             </>
           )}
-
           {bodyshop.enforce_conversion_csr && (
             <Form.Item
-              name="employee_csr"
+              name={"employee_csr"}
               label={t(
                 InstanceRenderManager({
                   imex: "jobs.fields.employee_csr",
                   rome: "jobs.fields.employee_csr_writer"
                 })
               )}
-              rules={[{ required: bodyshop.enforce_conversion_csr }]}
+              rules={[
+                {
+                  required: bodyshop.enforce_conversion_csr
+                  //message: t("general.validation.required"),
+                }
+              ]}
             >
               <Select
                 showSearch={{
-                  optionFilterProp: 'label',
-                  filterOption: (input, option) =>
-                    (option?.label ?? "").toLowerCase().includes(input.toLowerCase())
+                  optionFilterProp: "children",
+                  filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                 }}
                 style={{ width: 200 }}
-
-                options={csrOptions}
-              />
+              >
+                {bodyshop.employees
+                  .filter((emp) => emp.active)
+                  .map((emp) => (
+                    <Select.Option value={emp.id} key={emp.id} name={`${emp.first_name} ${emp.last_name}`}>
+                      {`${emp.first_name} ${emp.last_name}`}
+                    </Select.Option>
+                  ))}
+              </Select>
             </Form.Item>
           )}
-
           {bodyshop.enforce_conversion_category && (
-            <Form.Item name="category" label={t("jobs.fields.category")} rules={[{ required: bodyshop.enforce_conversion_category }]}>
-              <Select allowClear options={categoryOptions} />
+            <Form.Item
+              name={"category"}
+              label={t("jobs.fields.category")}
+              rules={[
+                {
+                  required: bodyshop.enforce_conversion_category
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <Select allowClear>
+                {bodyshop.md_categories.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
+                  </Select.Option>
+                ))}
+              </Select>
             </Form.Item>
           )}
-
           {bodyshop.region_config.toLowerCase().startsWith("ca") && (
             <Form.Item label={t("jobs.fields.ca_gst_registrant")} name="ca_gst_registrant" valuePropName="checked">
               <Switch />
             </Form.Item>
           )}
-
           <Form.Item label={t("jobs.fields.driveable")} name="driveable" valuePropName="checked">
             <Switch />
           </Form.Item>
-
           <Form.Item label={t("jobs.fields.towin")} name="towin" valuePropName="checked">
             <Switch />
           </Form.Item>
@@ -313,7 +316,6 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
             >
               {t("jobs.actions.convert")}
             </Button>
-
             <Button onClick={handleModalClose} disabled={earlyRoCreatedThisSession && !job.converted}>
               {t("general.actions.close")}
             </Button>
diff --git a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
index 73c59b0a9..ccd887d8f 100644
--- a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
+++ b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
@@ -60,13 +60,13 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
                   <Input />
                 </Form.Item>
                 <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-                  <Select
-                    onChange={handleInsCoChange}
-                    options={bodyshop.md_ins_cos.map((s) => ({
-                      value: s.name,
-                      label: s.name
-                    }))}
-                  />
+                  <Select onChange={handleInsCoChange}>
+                    {bodyshop.md_ins_cos.map((s) => (
+                      <Select.Option key={s.name} value={s.name}>
+                        {s.name}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item label={t("jobs.fields.ins_addr1")} name="ins_addr1">
                   <Input />
@@ -192,12 +192,13 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
                   <Input />
                 </Form.Item>
                 <Form.Item label={t("jobs.fields.referralsource")} name="referral_source">
-                  <Select
-                    options={bodyshop.md_referral_sources.map((s) => ({
-                      value: s,
-                      label: s
-                    }))}
-                  />
+                  <Select>
+                    {bodyshop.md_referral_sources.map((s) => (
+                      <Select.Option key={s} value={s}>
+                        {s}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
                   <Input />
@@ -220,13 +221,10 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
                     <CurrencyInput min={0} />
                   </Form.Item>
                   <Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
-                    <Select
-                      allowClear
-                      options={[
-                        { value: "W", label: t("jobs.labels.deductible.waived") },
-                        { value: "Y", label: t("jobs.labels.deductible.stands") }
-                      ]}
-                    />
+                    <Select allowClear>
+                      <Select.Option value="W">{t("jobs.labels.deductible.waived")}</Select.Option>
+                      <Select.Option value="Y">{t("jobs.labels.deductible.stands")}</Select.Option>
+                    </Select>
                   </Form.Item>
                   <Form.Item label={t("jobs.fields.depreciation_taxes")} name="depreciation_taxes">
                     <CurrencyInput />
diff --git a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
index 3897c8846..5b438ae1e 100644
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
@@ -1,5 +1,4 @@
-import { Card, Input } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Card, Input, Table } from "antd";
 import { useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
@@ -96,12 +95,11 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
         />
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         scroll={{ x: true }}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["ownr_ln", "ownr_ph1", "ownr_ph2", "ownr_fn"]}
         rowKey="id"
         dataSource={owners}
         onChange={handleTableChange}
diff --git a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
index 0f1528240..b6a93e1e7 100644
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
@@ -1,6 +1,5 @@
 import { PlusOutlined, SearchOutlined } from "@ant-design/icons";
-import { Button, Input, Popover } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Input, Popover, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import PredefinedVehicles from "./predefined-vehicles.js";
@@ -23,9 +22,9 @@ export default function JobsCreateVehicleInfoPredefined({ disabled, form }) {
 
   const popContent = () => (
     <div>
-      <ResponsiveTable
+      <Table
         size="small"
-        title={() => <Input.Search onSearch={(value) => setSearch(value)} enterButton />}
+        title={() => <Input.Search onSearch={(value) => setSearch(value)} enterButton/>}
         dataSource={filteredPredefinedVehicles}
         columns={[
           {
@@ -62,7 +61,6 @@ export default function JobsCreateVehicleInfoPredefined({ disabled, form }) {
             )
           }
         ]}
-        mobileColumnKeys={["make", "model", "select"]}
       />
     </div>
   );
diff --git a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.search.component.jsx b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.search.component.jsx
index 00de6846e..41ecac4a0 100644
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.search.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.search.component.jsx
@@ -1,5 +1,4 @@
-import { Card, Input, Space } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Card, Input, Space, Table } from "antd";
 import { useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
@@ -69,12 +68,11 @@ export default function JobsCreateVehicleInfoSearchComponent({ loading, vehicles
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         scroll={{ x: true }}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["v_vin", "description", "plate"]}
         rowKey="id"
         dataSource={vehicles}
         onChange={handleTableChange}
diff --git a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
index 80a3dd537..5eae62abf 100644
--- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
+++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
@@ -43,19 +43,20 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
           <Input disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
-          <Select disabled={jobRO} options={[
-            { value: "W", label: t("jobs.labels.deductible.waived") },
-            { value: "Y", label: t("jobs.labels.deductible.stands") }
-          ]} />
+          <Select disabled={jobRO}>
+            <Select.Option value="W">{t("jobs.labels.deductible.waived")}</Select.Option>
+            <Select.Option value="Y">{t("jobs.labels.deductible.stands")}</Select.Option>
+          </Select>
         </Form.Item>
         <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
           <CurrencyInput disabled={jobRO} min={0} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.ded_note")} name="ded_note">
-          <Select disabled={jobRO} options={bodyshop.md_ded_notes.map((n) => ({
-            value: n,
-            label: n
-          }))} />
+          <Select disabled={jobRO}>
+            {bodyshop.md_ded_notes.map((n, index) => (
+              <Select.Option key={index}>{n}</Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item label={t("jobs.fields.policy_no")} name="policy_no">
           <Input disabled={jobRO} />
@@ -65,10 +66,13 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         </Form.Item>
 
         <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-          <Select disabled={jobRO} onChange={handleInsCoChange} options={bodyshop.md_ins_cos.map((s) => ({
-            value: s.name,
-            label: s.name
-          }))} />
+          <Select disabled={jobRO} onChange={handleInsCoChange}>
+            {bodyshop.md_ins_cos.map((s) => (
+              <Select.Option key={s.name} value={s.name}>
+                {s.name}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item label={t("jobs.fields.ins_addr1")} name="ins_addr1">
           <Input disabled={jobRO} />
@@ -119,19 +123,25 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
             }
           ]}
         >
-          <Select disabled={jobRO} allowClear options={bodyshop.md_referral_sources.map((s) => ({
-            value: s,
-            label: s
-          }))} />
+          <Select disabled={jobRO} allowClear>
+            {bodyshop.md_referral_sources.map((s) => (
+              <Select.Option key={s} value={s}>
+                {s}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
           <Input disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.alt_transport")} name="alt_transport">
-          <Select disabled={jobRO} allowClear options={bodyshop.appt_alt_transport.map((s) => ({
-            value: s,
-            label: s
-          }))} />
+          <Select disabled={jobRO} allowClear>
+            {bodyshop.appt_alt_transport.map((s) => (
+              <Select.Option key={s} value={s}>
+                {s}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
       </FormRow>
       <Row gutter={[16, 16]}>
@@ -233,10 +243,13 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
       </FormRow>
       <FormRow header={t("jobs.forms.other")}>
         <Form.Item label={t("jobs.fields.category")} name="category">
-          <Select disabled={jobRO} allowClear options={bodyshop.md_categories.map((s) => ({
-            value: s,
-            label: s
-          }))} />
+          <Select disabled={jobRO} allowClear>
+            {bodyshop.md_categories.map((s) => (
+              <Select.Option key={s} value={s}>
+                {s}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item label={t("jobs.fields.selling_dealer")} name="selling_dealer">
           <Input disabled={jobRO} />
diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
index 0ab5c37ef..bdb08ef01 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -214,7 +214,7 @@ export function JobsDetailHeaderActions({
       okText,
       cancelText,
       centered: true,
-      mask: { closable: false },
+      maskClosable: false,
       onCancel: () => {
         closeConfirmById(id);
         onCancel?.();
@@ -714,12 +714,13 @@ export function JobsDetailHeaderActions({
             <FormDateTimePickerComponent />
           </Form.Item>
           <Form.Item label={t("appointments.fields.color")} name="color">
-            <Select
-              options={bodyshop.appt_colors.map((col) => ({
-                value: col.color.hex,
-                label: col.label
-              }))}
-            />
+            <Select>
+              {bodyshop.appt_colors.map((col, idx) => (
+                <Select.Option key={idx} value={col.color.hex}>
+                  {col.label}
+                </Select.Option>
+              ))}
+            </Select>
           </Form.Item>
 
           <Space wrap>
diff --git a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
index 4124b4ea8..e4c25643b 100644
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
@@ -133,16 +133,14 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           </FormRow>
         )
       })}
-
-      <FormRow
-        extra={
-          <Space>
-            <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
-            {InstanceRenderManager({ imex: <JobsMarkPstExempt form={form} /> })}
-          </Space>
-        }
-        header={t("jobs.forms.laborrates")}
-      >
+      <Divider titlePlacement="left" orientation="horizontal" style={{ marginTop: ".8rem", float: "right" }}>
+        {t("jobs.forms.laborrates")}
+      </Divider>
+      <Space>
+        <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
+        {InstanceRenderManager({ imex: <JobsMarkPstExempt form={form} /> })}
+      </Space>
+      <FormRow noDivider>
         <Form.Item label={t("jobs.fields.labor_rate_desc")} name="labor_rate_desc">
           <Input disabled={jobRO} />
         </Form.Item>
diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
index a64f5c064..47c8ffd5f 100644
--- a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
@@ -1,6 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Checkbox, Divider, Input, Space } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Checkbox, Divider, Input, Space, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
@@ -172,7 +171,7 @@ export default function JobsFindModalComponent({
 
   return (
     <div>
-      <ResponsiveTable
+      <Table
         title={() => (
           <div style={{ display: "flex" }}>
             {t("jobs.labels.existing_jobs")}
@@ -192,7 +191,6 @@ export default function JobsFindModalComponent({
         )}
         pagination={{ placement: "bottom" }}
         columns={columns}
-        mobileColumnKeys={["ro_number", "owner", "status", "vehicle"]}
         rowKey="id"
         loading={jobsListLoading}
         dataSource={jobsList}
diff --git a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
index ad029eff7..ec9b77b59 100644
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -1,5 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space, Typography } from "antd";
+import { Button, Card, Input, Space, Table, Typography } from "antd";
 import axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
@@ -15,7 +15,6 @@ import { alphaSort, statusSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
@@ -239,7 +238,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading || searchLoading}
         pagination={
           search?.search
@@ -255,7 +254,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
               }
         }
         columns={columns}
-        mobileColumnKeys={["ro_number", "ownr_ln", "status", "vehicle"]}
         rowKey="id"
         dataSource={search?.search ? openSearchResults : jobs}
         onChange={handleTableChange}
diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index 6d04bcd47..063fabbd6 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -1,6 +1,6 @@
 import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Input, Space, Tooltip } from "antd";
+import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
 import queryString from "query-string";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -16,7 +16,6 @@ import useLocalStorage from "../../utils/useLocalStorage";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 
@@ -29,6 +28,9 @@ const mapDispatchToProps = () => ({});
 export function JobsList({ bodyshop }) {
   const searchParams = queryString.parse(useLocation().search);
   const { selected } = searchParams;
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
   const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
     variables: {
       statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"]
@@ -184,15 +186,12 @@ export function JobsList({ bodyshop }) {
         ),
       sortOrder: state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
       render: (text, record) => {
-        const vehicleLabel =
-          `${record.v_model_yr || ""} ${record.v_make_desc || ""} ${record.v_model_desc || ""}`.trim();
-
         return record.vehicleid ? (
           <Link to={"/manage/vehicles/" + record.vehicleid} onClick={(e) => e.stopPropagation()}>
-            <span className="ellipses">{vehicleLabel}</span>
+            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${record.v_model_desc || ""}`}
           </Link>
         ) : (
-          <span className="ellipses">{vehicleLabel}</span>
+          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${record.v_model_desc || ""}`}</span>
         );
       }
     },
@@ -299,6 +298,15 @@ export function JobsList({ bodyshop }) {
     // },
   ];
 
+  const scrollMapper = {
+    xs: true,
+    sm: true,
+    md: true,
+    lg: "100%",
+    xl: "100%",
+    xxl: "100%"
+  };
+
   return (
     <Card
       id="active-jobs-list"
@@ -317,13 +325,15 @@ export function JobsList({ bodyshop }) {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ defaultPageSize: 50 }}
         columns={columns}
         rowKey="id"
         dataSource={jobs}
-        mobileColumnKeys={["ro_number", "owner", "status", "vehicle"]}
+        scroll={{
+          x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%"
+        }}
         rowSelection={{
           onSelect: (record) => {
             handleOnRowClick(record);
diff --git a/client/src/components/jobs-notes/jobs.notes.component.jsx b/client/src/components/jobs-notes/jobs.notes.component.jsx
index 6d23f75ce..d325176e3 100644
--- a/client/src/components/jobs-notes/jobs.notes.component.jsx
+++ b/client/src/components/jobs-notes/jobs.notes.component.jsx
@@ -1,6 +1,5 @@
 import { AuditOutlined, DeleteFilled, EditFilled, EyeInvisibleFilled, WarningFilled } from "@ant-design/icons";
-import { Button, Card, Form, Input, Space } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Form, Input, Space, Table } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -186,14 +185,7 @@ export function JobNotesComponent({
           </Button>
         }
       >
-        <ResponsiveTable
-          loading={loading}
-          columns={columns}
-          mobileColumnKeys={["actions", "icons", "type", "text"]}
-          rowKey="id"
-          dataSource={data}
-          onChange={handleTableChange}
-        />
+        <Table loading={loading} columns={columns} rowKey="id" dataSource={data} onChange={handleTableChange} />
       </Card>
     </div>
   );
diff --git a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
index 0b991f259..4aba84804 100644
--- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
+++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
@@ -1,6 +1,6 @@
 import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Input, Space, Tooltip } from "antd";
+import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
 import queryString from "query-string";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -17,7 +17,6 @@ import useLocalStorage from "../../utils/useLocalStorage";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -26,6 +25,9 @@ const mapStateToProps = createStructuredSelector({
 export function JobsReadyList({ bodyshop }) {
   const searchParams = queryString.parse(useLocation().search);
   const { selected } = searchParams;
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
 
   const readyStatuses = useMemo(() => {
     if (bodyshop.md_ro_statuses.ready_statuses) return bodyshop.md_ro_statuses.ready_statuses;
@@ -280,6 +282,15 @@ export function JobsReadyList({ bodyshop }) {
     // },
   ];
 
+  const scrollMapper = {
+    xs: true,
+    sm: true,
+    md: true,
+    lg: "100%",
+    xl: "100%",
+    xxl: "100%"
+  };
+
   return (
     <Card
       title={t("titles.bc.jobs-ready")}
@@ -298,13 +309,15 @@ export function JobsReadyList({ bodyshop }) {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ defaultPageSize: pageLimit }}
         columns={columns}
         rowKey="id"
         dataSource={jobs}
-        mobileColumnKeys={["ro_number", "owner", "status", "vehicle"]}
+        scroll={{
+          x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%"
+        }}
         rowSelection={{
           onSelect: (record) => {
             handleOnRowClick(record);
diff --git a/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx b/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx
index 8515ca384..91f52a1fc 100644
--- a/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx
+++ b/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx
@@ -94,26 +94,22 @@ export function LaborAllocationsAdjustmentEdit({
               }
             ]}
           >
-            <Select
-              allowClear
-              disabled={!!mod_lbr_ty}
-              options={[
-                { value: "LAA", label: t("joblines.fields.lbr_types.LAA") },
-                { value: "LAB", label: t("joblines.fields.lbr_types.LAB") },
-                { value: "LAD", label: t("joblines.fields.lbr_types.LAD") },
-                { value: "LAE", label: t("joblines.fields.lbr_types.LAE") },
-                { value: "LAF", label: t("joblines.fields.lbr_types.LAF") },
-                { value: "LAG", label: t("joblines.fields.lbr_types.LAG") },
-                { value: "LAM", label: t("joblines.fields.lbr_types.LAM") },
-                { value: "LAR", label: t("joblines.fields.lbr_types.LAR") },
-                { value: "LAS", label: t("joblines.fields.lbr_types.LAS") },
-                { value: "LAU", label: t("joblines.fields.lbr_types.LAU") },
-                { value: "LA1", label: t("joblines.fields.lbr_types.LA1") },
-                { value: "LA2", label: t("joblines.fields.lbr_types.LA2") },
-                { value: "LA3", label: t("joblines.fields.lbr_types.LA3") },
-                { value: "LA4", label: t("joblines.fields.lbr_types.LA4") }
-              ]}
-            />
+            <Select allowClear disabled={!!mod_lbr_ty}>
+              <Select.Option value="LAA">{t("joblines.fields.lbr_types.LAA")}</Select.Option>
+              <Select.Option value="LAB">{t("joblines.fields.lbr_types.LAB")}</Select.Option>
+              <Select.Option value="LAD">{t("joblines.fields.lbr_types.LAD")}</Select.Option>
+              <Select.Option value="LAE">{t("joblines.fields.lbr_types.LAE")}</Select.Option>
+              <Select.Option value="LAF">{t("joblines.fields.lbr_types.LAF")}</Select.Option>
+              <Select.Option value="LAG">{t("joblines.fields.lbr_types.LAG")}</Select.Option>
+              <Select.Option value="LAM">{t("joblines.fields.lbr_types.LAM")}</Select.Option>
+              <Select.Option value="LAR">{t("joblines.fields.lbr_types.LAR")}</Select.Option>
+              <Select.Option value="LAS">{t("joblines.fields.lbr_types.LAS")}</Select.Option>
+              <Select.Option value="LAU">{t("joblines.fields.lbr_types.LAU")}</Select.Option>
+              <Select.Option value="LA1">{t("joblines.fields.lbr_types.LA1")}</Select.Option>
+              <Select.Option value="LA2">{t("joblines.fields.lbr_types.LA2")}</Select.Option>
+              <Select.Option value="LA3">{t("joblines.fields.lbr_types.LA3")}</Select.Option>
+              <Select.Option value="LA4">{t("joblines.fields.lbr_types.LA4")}</Select.Option>
+            </Select>
           </Form.Item>
           <Form.Item
             label={t("jobs.fields.adjustmenthours")}
diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
index bea88ac17..ca796f81d 100644
--- a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
+++ b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
@@ -1,6 +1,5 @@
 import { EditFilled } from "@ant-design/icons";
-import { Alert, Card, Col, Row, Space, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Alert, Card, Col, Row, Space, Table, Typography } from "antd";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -197,9 +196,8 @@ export function LaborAllocationsTable({
     <Row gutter={[16, 16]}>
       <Col span={24}>
         <Card title={t("jobs.labels.laborallocations")}>
-          <ResponsiveTable
+          <Table
             columns={columns}
-            mobileColumnKeys={["line_desc", "total", "cost_center", "hrs_claimed"]}
             rowKey={(record) => `${record.cost_center} ${record.mod_lbr_ty}`}
             pagination={false}
             onChange={handleTableChange}
@@ -217,22 +215,16 @@ export function LaborAllocationsTable({
               x: true
             }}
             summary={() => (
-              <ResponsiveTable.Summary.Row>
-                <ResponsiveTable.Summary.Cell>
+              <Table.Summary.Row>
+                <Table.Summary.Cell>
                   <Typography.Title level={4} style={{ margin: 0, lineHeight: 1 }}>
                     {t("general.labels.totals")}
                   </Typography.Title>
-                </ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell align="right">
-                  {summary.hrs_total.toFixed(1)}
-                </ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell align="right">
-                  {summary.hrs_claimed.toFixed(1)}
-                </ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell align="right">
-                  {summary.adjustments.toFixed(1)}
-                </ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell align="right">
+                </Table.Summary.Cell>
+                <Table.Summary.Cell align="right">{summary.hrs_total.toFixed(1)}</Table.Summary.Cell>
+                <Table.Summary.Cell align="right">{summary.hrs_claimed.toFixed(1)}</Table.Summary.Cell>
+                <Table.Summary.Cell align="right">{summary.adjustments.toFixed(1)}</Table.Summary.Cell>
+                <Table.Summary.Cell align="right">
                   <Typography.Text
                     style={{
                       fontWeight: "bold",
@@ -241,8 +233,8 @@ export function LaborAllocationsTable({
                   >
                     {(Math.abs(summary.difference) < 0.05 ? 0 : summary.difference).toFixed(1)}
                   </Typography.Text>
-                </ResponsiveTable.Summary.Cell>
-              </ResponsiveTable.Summary.Row>
+                </Table.Summary.Cell>
+              </Table.Summary.Row>
             )}
           />
         </Card>
@@ -250,9 +242,8 @@ export function LaborAllocationsTable({
       {convertedLines && convertedLines.length > 0 && (
         <Col span={24}>
           <Card title={t("jobs.labels.convertedtolabor")}>
-            <ResponsiveTable
+            <Table
               columns={convertedTableCols}
-              mobileColumnKeys={["line_desc", "total", "cost_center", "hrs_claimed"]}
               rowKey="id"
               pagination={false}
               dataSource={hasTimeTicketAccess ? convertedLines : []}
diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx b/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
index 3bcc32f14..dec9d4c5f 100644
--- a/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
+++ b/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
@@ -1,5 +1,4 @@
-import { Alert, Button, Card, Col, Row, Space, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Alert, Button, Card, Col, Row, Space, Table, Typography } from "antd";
 import { SyncOutlined } from "@ant-design/icons";
 import axios from "axios";
 import _ from "lodash";
@@ -252,9 +251,8 @@ export function PayrollLaborAllocationsTable({
             </Space>
           }
         >
-          <ResponsiveTable
+          <Table
             columns={columns}
-            mobileColumnKeys={["line_desc", "employeeid", "mod_lbr_ty", "rate"]}
             rowKey={(record) => `${record.employeeid} ${record.mod_lbr_ty}`}
             pagination={false}
             onChange={handleTableChange}
@@ -272,16 +270,16 @@ export function PayrollLaborAllocationsTable({
               })
             }}
             summary={() => (
-              <ResponsiveTable.Summary.Row>
-                <ResponsiveTable.Summary.Cell>
+              <Table.Summary.Row>
+                <Table.Summary.Cell>
                   <Typography.Title level={4}>{t("general.labels.totals")}</Typography.Title>
-                </ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell></ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell>{summary.hrs_total.toFixed(5)}</ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell>{summary.hrs_claimed.toFixed(5)}</ResponsiveTable.Summary.Cell>
+                </Table.Summary.Cell>
+                <Table.Summary.Cell></Table.Summary.Cell>
+                <Table.Summary.Cell>{summary.hrs_total.toFixed(5)}</Table.Summary.Cell>
+                <Table.Summary.Cell>{summary.hrs_claimed.toFixed(5)}</Table.Summary.Cell>
 
-                <ResponsiveTable.Summary.Cell>{summary.difference.toFixed(5)}</ResponsiveTable.Summary.Cell>
-              </ResponsiveTable.Summary.Row>
+                <Table.Summary.Cell>{summary.difference.toFixed(5)}</Table.Summary.Cell>
+              </Table.Summary.Row>
             )}
           />
         </Card>
@@ -289,9 +287,8 @@ export function PayrollLaborAllocationsTable({
       {convertedLines && convertedLines.length > 0 && (
         <Col span={24}>
           <Card title={t("jobs.labels.convertedtolabor")}>
-            <ResponsiveTable
+            <Table
               columns={convertedTableCols}
-              mobileColumnKeys={["line_desc", "employeeid", "mod_lbr_ty", "rate"]}
               rowKey="id"
               pagination={false}
               dataSource={convertedLines}
diff --git a/client/src/components/layout-form-row/layout-form-row.component.jsx b/client/src/components/layout-form-row/layout-form-row.component.jsx
index 22343a790..16e338d5e 100644
--- a/client/src/components/layout-form-row/layout-form-row.component.jsx
+++ b/client/src/components/layout-form-row/layout-form-row.component.jsx
@@ -1,167 +1,59 @@
-import { Card, Col, Row } from "antd";
-import { Children, isValidElement } from "react";
+import { Col, Divider, Row } from "antd";
 import "./layout-form-row.styles.scss";
 
-export default function LayoutFormRow({
-  header,
-  children,
-  grow = false,
-  noDivider = false,
-  gutter = [16, 16], // Responsive gutter: horizontal, vertical
-  rowProps,
+export default function LayoutFormRow({ header, children, grow = false, noDivider = false, ...restProps }) {
+  const DividerHeader = () =>
+    !noDivider && (
+      <Divider titlePlacement="left" orientation="horizontal" style={{ marginTop: ".8rem" }}>
+        {header}
+      </Divider>
+    );
 
-  // Optional overrides if you ever need per-section customization
-  surface = true,
-  surfaceBg,
-  surfaceHeaderBg,
-
-  ...cardProps
-}) {
-  const items = Children.toArray(children).filter(Boolean);
-  if (items.length === 0) return null;
-
-  const title = !noDivider && header ? header : undefined;
-
-  const bg = surfaceBg ?? (surface ? "var(--imex-form-surface)" : undefined);
-  const headBg = surfaceHeaderBg ?? (surface ? "var(--imex-form-surface-head)" : undefined);
-
-  const mergedStyles = mergeSemanticStyles(
-    {
-      header: {
-        paddingInline: 16,
-        background: headBg
-      },
-      body: {
-        padding: 16,
-        background: bg
-      }
-    },
-    cardProps.styles
-  );
-
-  const baseCardStyle = {
-    marginBottom: ".8rem",
-    ...(bg ? { background: bg } : null), // ensures the “circled area” is tinted
-    ...cardProps.style
-  };
-
-  // single child => just render it
-  if (items.length === 1) {
+  if (!children.length) {
+    //We have only one element. It's going to get the whole thing.
     return (
-      <Card
-        {...cardProps}
-        title={cardProps.title ?? title}
-        size={cardProps.size ?? "small"}
-        variant={cardProps.variant ?? "outlined"}
-        className={["imex-form-row", cardProps.className].filter(Boolean).join(" ")}
-        style={baseCardStyle}
-        styles={mergedStyles}
-      >
-        {items[0]}
-      </Card>
+      <div className="imex-form-row" {...restProps} style={{ marginBottom: ".8rem", ...restProps.style }}>
+        <DividerHeader />
+        {children}
+      </div>
     );
   }
+  const rowGutter = { gutter: [16, 16] };
 
-  const count = items.length;
-
-  // Modern responsive strategy leveraging Ant Design 6:
-  // - xs (phone <576px): Always stack vertically
-  // - sm (tablet 576-768px): 2 columns for better readability
-  // - md (tablet 768-992px): 3 columns for tablets
-  // - lg+ (desktop >992px): Dynamic flex-based columns that adapt to screen width
-  // Target: 1366px → 4 cols, 1920px → 6 cols, 2560px → 8 cols, 4K → capped at 8-9 cols
-  // Note: xxl uses higher min-width to naturally cap maximum columns
-  const baseCol = (() => {
-    if (grow) {
-      // Grow mode: use flex with reasonable min-widths
-      return {
-        xs: 24,
-        sm: 12, // Fixed 2 cols on small tablets
-        md: 8, // Fixed 3 cols on large tablets
-        lg: { flex: `1 1 320px` }, // Dynamic: ~3 cols at 1200px
-        xl: { flex: `1 1 280px` }, // Dynamic: ~4 cols at 1366px, ~6 cols at 1920px
-        xxl: { flex: `1 1 380px` } // Dynamic: ~6 cols at 2560px, ~9 cols at 4K (capped)
-      };
-    } else {
-      // Fixed mode: Use flex without grow to maintain uniform widths across rows
-      // xxl uses larger min-width to cap maximum columns on 4K/ultrawide
-      const minWidthLg = count <= 2 ? 500 : count === 3 ? 380 : 320; // 3 cols at 1200px
-      const minWidthXl = count <= 2 ? 480 : count === 3 ? 360 : 280; // 4 cols at 1366px, ~6 at 1920px
-      const minWidthXxl = count <= 2 ? 500 : count === 3 ? 400 : 380; // ~6 cols at 2560px, ~9 at 4K (natural cap)
-
-      return {
-        xs: 24,
-        sm: 12, // Fixed 2 columns on tablet
-        md: count === 1 ? 24 : count === 2 ? 12 : 8, // Fixed 1-3 cols on large tablet
-        lg: count === 1 ? 24 : { flex: `0 0 ${minWidthLg}px` }, // Fixed width on desktop
-        xl: count === 1 ? 24 : { flex: `0 0 ${minWidthXl}px` }, // Fixed width on large desktop
-        xxl: count === 1 ? 24 : { flex: `0 0 ${minWidthXxl}px` } // Fixed width on ultrawide
-      };
-    }
-  })();
-
-  const getColPropsForChild = (child) => {
-    if (!isValidElement(child)) return baseCol;
-
-    // Back-compat: child.props.span can override Col sizing
-    const spanOverride = child.props?.span;
-    if (typeof spanOverride === "number") return { span: spanOverride };
-    if (spanOverride && typeof spanOverride === "object") return spanOverride;
-
-    // Explicit override: <Field col={{ md:{span:12}, ... }} />
-    const colOverride = child.props?.col;
-    if (colOverride && typeof colOverride === "object") {
-      // Deep merge: allow partial overrides while keeping baseCol defaults
-      const merged = { ...baseCol };
-      Object.keys(colOverride).forEach((bp) => {
-        merged[bp] = typeof colOverride[bp] === "object" ? { ...baseCol[bp], ...colOverride[bp] } : colOverride[bp];
-      });
-      return merged;
-    }
-
-    return baseCol;
+  const colSpan = (spanOverride) => {
+    if (spanOverride) return { span: spanOverride };
+    return {
+      xs: {
+        span: !grow ? 24 : Math.max(12, 24 / children.length)
+      },
+      sm: {
+        span: !grow ? 12 : Math.max(12, 24 / children.length)
+      },
+      md: {
+        span: !grow ? 8 : Math.max(8, 24 / children.length)
+      },
+      lg: {
+        span: !grow ? 6 : Math.max(6, 24 / children.length)
+      },
+      xl: {
+        span: !grow ? 4 : Math.max(4, 24 / children.length)
+      }
+    };
   };
-
+  //{header ? <Typography.Title level={4}>{header}</Typography.Title> : null}
   return (
-    <Card
-      {...cardProps}
-      title={cardProps.title ?? title}
-      size={cardProps.size ?? "small"}
-      variant={cardProps.variant ?? "outlined"}
-      className={["imex-form-row", cardProps.className].filter(Boolean).join(" ")}
-      style={baseCardStyle}
-      styles={mergedStyles}
-    >
-      <Row gutter={gutter} wrap {...rowProps}>
-        {items.map((child, idx) => (
-          <Col key={child?.key ?? idx} {...getColPropsForChild(child)}>
-            {child}
-          </Col>
-        ))}
+    <div className="imex-form-row" {...restProps} style={{ marginBottom: ".8rem", ...restProps.style }}>
+      <DividerHeader />
+      <Row {...rowGutter}>
+        {children.map(
+          (c, idx) =>
+            c && (
+              <Col key={idx} {...colSpan(c && c.props && c.props.span)}>
+                {c}
+              </Col>
+            )
+        )}
       </Row>
-    </Card>
+    </div>
   );
 }
-
-function mergeSemanticStyles(defaults, userStyles) {
-  if (!userStyles) return defaults;
-
-  if (typeof userStyles === "function") {
-    return (info) => {
-      const computed = userStyles(info) || {};
-      return {
-        ...defaults,
-        ...computed,
-        header: { ...defaults.header, ...(computed.header || {}) },
-        body: { ...defaults.body, ...(computed.body || {}) }
-      };
-    };
-  }
-
-  return {
-    ...defaults,
-    ...userStyles,
-    header: { ...defaults.header, ...(userStyles.header || {}) },
-    body: { ...defaults.body, ...(userStyles.body || {}) }
-  };
-}
diff --git a/client/src/components/layout-form-row/layout-form-row.styles.scss b/client/src/components/layout-form-row/layout-form-row.styles.scss
index 264ae9760..faf24ccf1 100644
--- a/client/src/components/layout-form-row/layout-form-row.styles.scss
+++ b/client/src/components/layout-form-row/layout-form-row.styles.scss
@@ -1,79 +1,20 @@
-/* layout-form-row.styles.scss */
-
-/**
- * Surface tokens (light/dark)
- * - --imex-form-surface: the main section background (circled area)
- * - --imex-form-surface-head: slightly different strip for the Card header
- * - --imex-form-surface-border: border color for the card
- *
- * Update the dark selector(s) to match whatever you use (body class, data-theme, etc).
- */
-
-:root {
-  --imex-form-surface: #fafafa; /* subtle contrast vs white page */
-  --imex-form-surface-head: #f5f5f5; /* header strip */
-  --imex-form-surface-border: #d9d9d9; /* matches AntD-ish border */
-}
-
-/* Pick the selector that matches your app and remove the rest */
-html[data-theme="dark"] {
-  --imex-form-surface: rgba(255, 255, 255, 0.01); /* subtle lift off page bg */
-  --imex-form-surface-head: rgba(255, 255, 255, 0.06); /* slightly stronger for header strip */
-  --imex-form-surface-border: rgba(5, 5, 5, 0.12);
-}
-
+//Override Antd Row margin to save space on forms.
 .imex-form-row {
-  width: 100%;
+  .ant-row {
+    margin-bottom: 0rem;
 
-  /* Match old Divider title typography */
-  .ant-card-head-title {
-    font-weight: 500;
-    font-size: var(--ant-font-size-lg);
-    line-height: 1.2; /* optional, makes it feel like a section header */
-  }
-
-  /* Make the whole section read as its own surface */
-  &.ant-card {
-    background: var(--imex-form-surface);
-    border-color: var(--imex-form-surface-border);
-  }
-
-  .ant-card-head {
-    background: var(--imex-form-surface-head);
-    border-bottom-color: var(--imex-form-surface-border);
-  }
-
-  .ant-card-body {
-    background: var(--imex-form-surface);
-  }
-
-  /* Optional: tighter spacing on phones for better space usage */
-  @media (max-width: 575px) {
-    .ant-card-head {
-      padding-inline: 12px;
-      padding-block: 12px;
+    .ant-form-item-label {
+      padding: 0rem;
     }
-    .ant-card-body {
-      padding: 12px;
-    }
-  }
 
-  /* Tablet optimization: slightly reduce padding */
-  @media (min-width: 576px) and (max-width: 991px) {
-    .ant-card-body {
-      padding: 14px;
-    }
-  }
-
-  /* Ensure form items use full column width */
-  .ant-col > * {
-    width: 100%;
-  }
-
-  /* Better form item spacing on mobile */
-  @media (max-width: 575px) {
-    .ant-form-item {
-      margin-bottom: 12px;
+    label {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: 100%;
+      display: inline-block;
+      padding: 0rem;
+      margin: 0rem;
     }
   }
 }
diff --git a/client/src/components/loading-spinner/loading-spinner.component.jsx b/client/src/components/loading-spinner/loading-spinner.component.jsx
index 15eb3ecb2..9943b0d21 100644
--- a/client/src/components/loading-spinner/loading-spinner.component.jsx
+++ b/client/src/components/loading-spinner/loading-spinner.component.jsx
@@ -11,8 +11,9 @@ export default function LoadingSpinner({ loading = true, message, ...props }) {
           position: "relative",
           alignContent: "center"
         }}
-        {...(props.children ? { description: message ? message : null } : {})}
+        {...(props.children ? { tip: message ? message : null } : {})}
         delay={200}
+        // TODO: Client Update - tip only works when there are actually children, and this component is used in a lot of places where there are no children
       >
         {props.children}
       </Spin>
diff --git a/client/src/components/notification-settings/notification-settings-form.component.jsx b/client/src/components/notification-settings/notification-settings-form.component.jsx
index 3bfb571c3..ffa6e007b 100644
--- a/client/src/components/notification-settings/notification-settings-form.component.jsx
+++ b/client/src/components/notification-settings/notification-settings-form.component.jsx
@@ -1,7 +1,6 @@
 import { useMutation, useQuery } from "@apollo/client/react";
 import { useEffect, useState } from "react";
-import { Alert, Button, Card, Checkbox, Divider, Form, Space, Switch, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Alert, Button, Card, Checkbox, Divider, Form, Space, Switch, Table, Typography } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -205,14 +204,7 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
             <Alert title={t("notifications.labels.employee-notification")} type="warning" />
           </div>
         )}
-        <ResponsiveTable
-          dataSource={dataSource}
-          columns={columns}
-          mobileColumnKeys={["email", "scenario", "app", "fcm"]}
-          pagination={false}
-          bordered
-          rowKey="key"
-        />
+        <Table dataSource={dataSource} columns={columns} pagination={false} bordered rowKey="key" />
         <Divider />
       </Card>
     </Form>
diff --git a/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx b/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
index e7cfb5468..d6fe24aaa 100644
--- a/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
+++ b/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
@@ -1,4 +1,4 @@
-import { Card } from "antd";
+import { Card, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -11,7 +11,6 @@ import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import OwnerDetailUpdateJobsComponent from "../owner-detail-update-jobs/owner-detail-update-jobs.component";
 import { selectIsPartsEntry } from "../../redux/application/application.selectors";
 import getPartsBasePath from "../../utils/getPartsBasePath.js";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -110,10 +109,9 @@ function OwnerDetailJobsComponent({ bodyshop, owner, isPartsEntry }) {
         />
       }
     >
-      <ResponsiveTable
+      <Table
         pagination={{ placement: "bottom" }}
         columns={columns}
-        mobileColumnKeys={["ro_number", "vehicleid", "status", "actual_completion"]}
         scroll={{ x: true }}
         rowKey="id"
         dataSource={owner.jobs}
diff --git a/client/src/components/owner-find-modal/owner-find-modal.component.jsx b/client/src/components/owner-find-modal/owner-find-modal.component.jsx
index df4c34a05..e7288e0e1 100644
--- a/client/src/components/owner-find-modal/owner-find-modal.component.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.component.jsx
@@ -1,7 +1,6 @@
-import { Checkbox, Divider } from "antd";
+import { Checkbox, Divider, Table } from "antd";
 import { useTranslation } from "react-i18next";
 import PhoneFormatter from "../../utils/PhoneFormatter";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 export default function OwnerFindModalComponent({
   selectedOwner,
@@ -76,10 +75,9 @@ export default function OwnerFindModalComponent({
 
   return (
     <div>
-      <ResponsiveTable
+      <Table
         pagination={{ placement: "bottom" }}
         columns={columns}
-        mobileColumnKeys={["ownr_ln", "ownr_fn", "ownr_ph1", "ownr_ph2"]}
         rowKey="id"
         loading={ownersListLoading}
         dataSource={ownersList}
diff --git a/client/src/components/owner-search-select/owner-search-select.component.jsx b/client/src/components/owner-search-select/owner-search-select.component.jsx
index bd5ed0594..bc5d7b105 100644
--- a/client/src/components/owner-search-select/owner-search-select.component.jsx
+++ b/client/src/components/owner-search-select/owner-search-select.component.jsx
@@ -7,6 +7,8 @@ import { SEARCH_OWNERS_BY_ID_FOR_AUTOCOMPLETE, SEARCH_OWNERS_FOR_AUTOCOMPLETE }
 import AlertComponent from "../alert/alert.component";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 
+const { Option } = Select;
+
 const OwnerSearchSelect = ({ value, onChange, onBlur, disabled, ref }) => {
   const [callSearch, { loading, error, data }] = useLazyQuery(SEARCH_OWNERS_FOR_AUTOCOMPLETE);
 
@@ -69,12 +71,15 @@ const OwnerSearchSelect = ({ value, onChange, onBlur, disabled, ref }) => {
         onSelect={handleSelect}
         notFoundContent={loading ? <LoadingOutlined /> : <Empty />}
         onBlur={onBlur}
-        options={theOptions?.map((o) => ({
-          key: o.id,
-          value: o.id,
-          label: `${OwnerNameDisplayFunction(o)} | ${o.ownr_addr1 || ""} `
-        }))}
-      />
+      >
+        {theOptions
+          ? theOptions.map((o) => (
+              <Option key={o.id} value={o.id}>
+                {`${OwnerNameDisplayFunction(o)} | ${o.ownr_addr1 || ""} `}
+              </Option>
+            ))
+          : null}
+      </Select>
       {idLoading || loading ? <LoadingOutlined /> : null}
       {error ? <AlertComponent title={error.message} type="error" /> : null}
       {idError ? <AlertComponent title={idError.message} type="error" /> : null}
diff --git a/client/src/components/owners-list/owners-list.component.jsx b/client/src/components/owners-list/owners-list.component.jsx
index eefec34ca..f495a04a4 100644
--- a/client/src/components/owners-list/owners-list.component.jsx
+++ b/client/src/components/owners-list/owners-list.component.jsx
@@ -1,5 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space, Typography } from "antd";
+import { Button, Card, Input, Space, Table, Typography } from "antd";
 import queryString from "query-string";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -7,7 +7,6 @@ import { Link, useLocation, useNavigate } from "react-router-dom";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import { pageLimit } from "../../utils/config";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 export default function OwnersListComponent({ loading, owners, total, refetch }) {
   const search = queryString.parse(useLocation().search);
@@ -117,11 +116,10 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ placement: "top", pageSize: pageLimit, current: parseInt(page || 1, 10), total: total }}
         columns={columns}
-        mobileColumnKeys={["name", "ownr_ph1", "ownr_ph2"]}
         rowKey="id"
         scroll={{ x: true }}
         dataSource={owners}
diff --git a/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx b/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
index 2fd491c30..5dc9b1e93 100644
--- a/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
+++ b/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
@@ -1,6 +1,5 @@
 import { useMutation } from "@apollo/client/react";
-import { Button, Card, Col, Row } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Col, Row, Table } from "antd";
 import dayjs from "../../utils/day";
 import { useTranslation } from "react-i18next";
 import { UPDATE_PARTS_DISPATCH_LINE } from "../../graphql/parts-dispatch.queries";
@@ -68,12 +67,7 @@ export default function PartsDispatchExpander({ dispatch }) {
     <Card>
       <Row gutter={[16, 16]}>
         <Col span={24}>
-          <ResponsiveTable
-            rowKey={"id"}
-            dataSource={dispatch.parts_dispatch_lines}
-            columns={columns}
-            mobileColumnKeys={["quantity", "joblineid", "accepted_at"]}
-          />
+          <Table rowKey={"id"} dataSource={dispatch.parts_dispatch_lines} columns={columns} />
         </Col>
       </Row>
     </Card>
diff --git a/client/src/components/parts-dispatch-table/parts-dispatch-table.component.jsx b/client/src/components/parts-dispatch-table/parts-dispatch-table.component.jsx
index bd6d66e43..c1fbf51fe 100644
--- a/client/src/components/parts-dispatch-table/parts-dispatch-table.component.jsx
+++ b/client/src/components/parts-dispatch-table/parts-dispatch-table.component.jsx
@@ -1,6 +1,5 @@
 import { MinusCircleTwoTone, PlusCircleTwoTone, SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Input, Space, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -107,7 +106,7 @@ export function PartDispatchTableComponent({ bodyshop, job, billsQuery }) {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={billsQuery.loading}
         scroll={{
           x: true // y: "50rem"
@@ -124,7 +123,6 @@ export function PartDispatchTableComponent({ bodyshop, job, billsQuery }) {
             )
         }}
         columns={columns}
-        mobileColumnKeys={["number", "employeeid", "percent_accepted", "actions"]}
         rowKey="id"
         dataSource={billsQuery.data ? billsQuery.data.parts_dispatch : []}
         onChange={handleTableChange}
diff --git a/client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx
index 13f0ceb48..ad61287b9 100644
--- a/client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx
@@ -1,8 +1,7 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
 import { useLazyQuery, useMutation } from "@apollo/client/react";
-import { Button, Drawer, Grid, Popconfirm, Space } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Drawer, Grid, Popconfirm, Space, Table } from "antd";
 import queryString from "query-string";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -66,7 +65,9 @@ export function PartsOrderListTableDrawerComponent({
   setTaskUpsertContext,
   isPartsEntry
 }) {
-  const screens = Grid.useBreakpoint();
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
 
   const bpoints = {
     xs: "100%",
@@ -76,14 +77,7 @@ export function PartsOrderListTableDrawerComponent({
     xl: "75%",
     xxl: "65%"
   };
-
-  let drawerPercentage = "100%";
-  if (screens.xxl) drawerPercentage = bpoints.xxl;
-  else if (screens.xl) drawerPercentage = bpoints.xl;
-  else if (screens.lg) drawerPercentage = bpoints.lg;
-  else if (screens.md) drawerPercentage = bpoints.md;
-  else if (screens.sm) drawerPercentage = bpoints.sm;
-  else if (screens.xs) drawerPercentage = bpoints.xs;
+  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
   const responsibilityCenters = bodyshop.md_responsibility_centers;
   const Templates = TemplateList("partsorder", { job });
 
@@ -193,7 +187,6 @@ export function PartsOrderListTableDrawerComponent({
               actions: { refetch: refetch },
               context: {
                 job: job,
-                parts_order: { id: record.id },
                 bill: {
                   vendorid: record.vendor.id,
                   is_credit_memo: record.return,
@@ -369,12 +362,11 @@ export function PartsOrderListTableDrawerComponent({
           }
           extra={recordActions(record)}
         />
-        <ResponsiveTable
+        <Table
           scroll={{
             x: true //y: "50rem"
           }}
           columns={columns}
-          mobileColumnKeys={["status", "line_desc", "actions", "quantity"]}
           rowKey="id"
           dataSource={record.parts_order_lines}
           onChange={handleTableChange}
diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
index 050fb2ec0..55f910f9f 100644
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -1,6 +1,6 @@
 import { DeleteFilled, EyeFilled, SyncOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client/react";
-import { Button, Card, Checkbox, Input, Popconfirm, Space } from "antd";
+import { Button, Card, Checkbox, Input, Popconfirm, Space, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaTasks } from "react-icons/fa";
@@ -21,7 +21,6 @@ import PrintWrapper from "../print-wrapper/print-wrapper.component";
 import PartsOrderDrawer from "./parts-order-list-table-drawer.component";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -163,7 +162,6 @@ export function PartsOrderListTableComponent({
               actions: { refetch: refetch },
               context: {
                 job: job,
-                parts_order: { id: record.id },
                 bill: {
                   vendorid: record.vendor.id,
                   is_credit_memo: record.return,
@@ -310,14 +308,13 @@ export function PartsOrderListTableComponent({
         setPartsReceiveContext={setPartsReceiveContext}
         setTaskUpsertContext={setTaskUpsertContext}
       />
-      <ResponsiveTable
+      <Table
         loading={billsQuery.loading}
         scroll={{
           x: true
           //y: "50rem"
         }}
         columns={columns}
-        mobileColumnKeys={["vendorname", "order_number", "order_date", "actions"]}
         rowKey="id"
         dataSource={filteredPartsOrders}
         onChange={handleTableChange}
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index bfb0cb1df..c59e2cbd3 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -158,21 +158,19 @@ export function PartsOrderModalComponent({
                         key={`${index}part_type`}
                         name={[field.name, "part_type"]}
                       >
-                        <Select
-                          disabled={!(sendType === "oec" && OEConnection_PriceChange.treatment === "on")}
-                          options={[
-                            { value: "PAA", label: t("joblines.fields.part_types.PAA") },
-                            { value: "PAC", label: t("joblines.fields.part_types.PAC") },
-                            { value: "PAL", label: t("joblines.fields.part_types.PAL") },
-                            { value: "PAG", label: t("joblines.fields.part_types.PAG") },
-                            { value: "PAM", label: t("joblines.fields.part_types.PAM") },
-                            { value: "PAP", label: t("joblines.fields.part_types.PAP") },
-                            { value: "PAN", label: t("joblines.fields.part_types.PAN") },
-                            { value: "PAO", label: t("joblines.fields.part_types.PAO") },
-                            { value: "PAR", label: t("joblines.fields.part_types.PAR") },
-                            { value: "PAS", label: t("joblines.fields.part_types.PAS") }
-                          ]}
-                        />
+                        <Select disabled={!(sendType === "oec" && OEConnection_PriceChange.treatment === "on")}>
+                          <Select.Option value="PAA">{t("joblines.fields.part_types.PAA")}</Select.Option>
+                          <Select.Option value="PAC">{t("joblines.fields.part_types.PAC")}</Select.Option>
+
+                          <Select.Option value="PAL">{t("joblines.fields.part_types.PAL")}</Select.Option>
+                          <Select.Option value="PAG">{t("joblines.fields.part_types.PAG")}</Select.Option>
+                          <Select.Option value="PAM">{t("joblines.fields.part_types.PAM")}</Select.Option>
+                          <Select.Option value="PAP">{t("joblines.fields.part_types.PAP")}</Select.Option>
+                          <Select.Option value="PAN">{t("joblines.fields.part_types.PAN")}</Select.Option>
+                          <Select.Option value="PAO">{t("joblines.fields.part_types.PAO")}</Select.Option>
+                          <Select.Option value="PAR">{t("joblines.fields.part_types.PAR")}</Select.Option>
+                          <Select.Option value="PAS">{t("joblines.fields.part_types.PAS")}</Select.Option>
+                        </Select>
                       </Form.Item>
                       <Form.Item
                         label={t("parts_orders.fields.oem_partno")}
diff --git a/client/src/components/parts-queue-card/parts-queue-card.component.jsx b/client/src/components/parts-queue-card/parts-queue-card.component.jsx
index 6e02725c0..65cbb62d1 100644
--- a/client/src/components/parts-queue-card/parts-queue-card.component.jsx
+++ b/client/src/components/parts-queue-card/parts-queue-card.component.jsx
@@ -11,8 +11,10 @@ import PartsQueueJobLinesComponent from "./parts-queue-job-lines.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function PartsQueueDetailCard() {
-  const screens = Grid.useBreakpoint();
-  
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
   const bpoints = {
     xs: "100%",
     sm: "100%",
@@ -21,14 +23,7 @@ export default function PartsQueueDetailCard() {
     xl: "75%",
     xxl: "60%"
   };
-  
-  let drawerPercentage = "100%";
-  if (screens.xxl) drawerPercentage = bpoints.xxl;
-  else if (screens.xl) drawerPercentage = bpoints.xl;
-  else if (screens.lg) drawerPercentage = bpoints.lg;
-  else if (screens.md) drawerPercentage = bpoints.md;
-  else if (screens.sm) drawerPercentage = bpoints.sm;
-  else if (screens.xs) drawerPercentage = bpoints.xs;
+  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
 
   const searchParams = queryString.parse(useLocation().search);
   const { selected } = searchParams;
diff --git a/client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx b/client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx
index 3a6ca5bd6..066e937e8 100644
--- a/client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx
+++ b/client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx
@@ -1,5 +1,4 @@
-import { Card } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Card, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -165,9 +164,8 @@ export function PartsQueueJobLinesComponent({ loading, jobLines }) {
 
   return (
     <Card title={t("jobs.labels.parts_lines")}>
-      <ResponsiveTable
+      <Table
         columns={columns}
-        mobileColumnKeys={["status", "line_desc", "line_no", "oem_partno"]}
         rowKey="id"
         loading={loading}
         pagination={false}
diff --git a/client/src/components/parts-queue-list/parts-queue.list.component.jsx b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
index 3cb5872f2..766ff9564 100644
--- a/client/src/components/parts-queue-list/parts-queue.list.component.jsx
+++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
@@ -1,6 +1,6 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Checkbox, Input, Space } from "antd";
+import { Button, Card, Checkbox, Input, Space, Table } from "antd";
 import _ from "lodash";
 import queryString from "query-string";
 import { useState } from "react";
@@ -19,7 +19,6 @@ import AlertComponent from "../alert/alert.component";
 import JobRemoveFromPartsQueue from "../job-remove-from-parst-queue/job-remove-from-parts-queue.component";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import JobPartsReceived from "../job-parts-received/job-parts-received.component";
 
@@ -311,7 +310,7 @@ export function PartsQueueListComponent({ bodyshop }) {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{
           placement: "top",
@@ -320,7 +319,6 @@ export function PartsQueueListComponent({ bodyshop }) {
           // total: data && data.jobs_aggregate.aggregate.count,
         }}
         columns={columns}
-        mobileColumnKeys={["ro_number", "ownr_ln", "status", "vehicle", "partsstatus"]}
         rowKey="id"
         dataSource={jobs}
         style={{ height: "100%" }}
diff --git a/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx b/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx
index 723ccb9db..3133fbe93 100644
--- a/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx
+++ b/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx
@@ -29,12 +29,13 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
                 })
               });
             }}
-            options={bodyshop.md_parts_locations.map((loc, idx) => ({
-              key: idx,
-              value: loc,
-              label: loc
-            }))}
-          />
+          >
+            {bodyshop.md_parts_locations.map((loc, idx) => (
+              <Select.Option key={idx} value={loc}>
+                {loc}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
       </LayoutFormRow>
       <Typography.Title level={4}>{t("parts_orders.labels.inthisorder")}</Typography.Title>
@@ -84,14 +85,13 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
                         key={`${index}location`}
                         name={[field.name, "location"]}
                       >
-                        <Select 
-                          style={{ width: "10rem" }}
-                          options={bodyshop.md_parts_locations.map((loc, idx) => ({
-                            key: idx,
-                            value: loc,
-                            label: loc
-                          }))}
-                        />
+                        <Select style={{ width: "10rem" }}>
+                          {bodyshop.md_parts_locations.map((loc, idx) => (
+                            <Select.Option key={idx} value={loc}>
+                              {loc}
+                            </Select.Option>
+                          ))}
+                        </Select>
                       </Form.Item>
                       <Form.Item
                         label={t("parts_orders.fields.quantity")}
diff --git a/client/src/components/parts-shop-info/parts-shop-info-email-presets.component.jsx b/client/src/components/parts-shop-info/parts-shop-info-email-presets.component.jsx
index 7620c7eff..4b63668b1 100644
--- a/client/src/components/parts-shop-info/parts-shop-info-email-presets.component.jsx
+++ b/client/src/components/parts-shop-info/parts-shop-info-email-presets.component.jsx
@@ -2,6 +2,8 @@ import { Button, Card, Divider, Form, Input, Select, Space } from "antd";
 import { DeleteOutlined, PlusOutlined } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 
+const { Option } = Select;
+
 export default function PartsShopInfoEmailPresets() {
   const { t } = useTranslation();
 
@@ -24,7 +26,13 @@ export default function PartsShopInfoEmailPresets() {
                   label={t("bodyshop.labels.email_type")}
                   rules={[{ required: true, message: t("bodyshop.errors.email_type_required") }]}
                 >
-                  <Select placeholder={t("bodyshop.placeholders.select_email_type")} options={emailTypes} />
+                  <Select placeholder={t("bodyshop.placeholders.select_email_type")}>
+                    {emailTypes.map((type) => (
+                      <Option key={type.value} value={type.value}>
+                        {type.label}
+                      </Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   {...restField}
diff --git a/client/src/components/payment-form/payment-form.component.jsx b/client/src/components/payment-form/payment-form.component.jsx
index a11c3e617..851ff6774 100644
--- a/client/src/components/payment-form/payment-form.component.jsx
+++ b/client/src/components/payment-form/payment-form.component.jsx
@@ -91,25 +91,20 @@ export function PaymentFormComponent({ form, bodyshop, disabled }) {
             }
           ]}
         >
-          <Select disabled={disabled}
-            options={Qb_Multi_Ar.treatment === "on" 
-              ? [
-                  { value: t("payments.labels.customer"), label: t("payments.labels.customer") },
-                  {
-                    label: t("payments.labels.external"),
-                    options: bodyshop.md_ins_cos.map((i, idx) => ({
-                      key: idx,
-                      value: i.name,
-                      label: i.name
-                    }))
-                  }
-                ]
-              : [
-                  { value: t("payments.labels.customer"), label: t("payments.labels.customer") },
-                  { value: t("payments.labels.insurance"), label: t("payments.labels.insurance") }
-                ]
-            }
-          />
+          <Select disabled={disabled}>
+            <Select.Option value={t("payments.labels.customer")}>{t("payments.labels.customer")}</Select.Option>
+            {Qb_Multi_Ar.treatment === "on" ? (
+              <Select.OptGroup label={t("payments.labels.external")}>
+                {bodyshop.md_ins_cos.map((i, idx) => (
+                  <Select.Option key={idx} value={i.name}>
+                    {i.name}
+                  </Select.Option>
+                ))}
+              </Select.OptGroup>
+            ) : (
+              <Select.Option value={t("payments.labels.insurance")}>{t("payments.labels.insurance")}</Select.Option>
+            )}
+          </Select>
         </Form.Item>
 
         <Form.Item
@@ -122,13 +117,13 @@ export function PaymentFormComponent({ form, bodyshop, disabled }) {
             }
           ]}
         >
-          <Select disabled={disabled}
-            options={bodyshop.md_payment_types.map((v, idx) => ({
-              key: idx,
-              value: v,
-              label: v
-            }))}
-          />
+          <Select disabled={disabled}>
+            {bodyshop.md_payment_types.map((v, idx) => (
+              <Select.Option key={idx} value={v}>
+                {v}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow>
diff --git a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
index dbf4e31b7..58259dcfb 100644
--- a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
+++ b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
@@ -1,6 +1,6 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client/react";
-import { Button, Card, Input, Space, Typography } from "antd";
+import { Button, Card, Input, Space, Table, Typography } from "antd";
 import axios from "axios";
 import queryString from "query-string";
 import { useEffect, useState } from "react";
@@ -19,7 +19,6 @@ import { alphaSort } from "../../utils/sorters";
 import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -259,7 +258,7 @@ export function PaymentsListPaginated({
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading || searchLoading}
         scroll={{ x: true }}
         pagination={
@@ -276,7 +275,6 @@ export function PaymentsListPaginated({
               }
         }
         columns={columns}
-        mobileColumnKeys={["ro_number", "owner", "date", "amount", "actions"]}
         rowKey="id"
         dataSource={search?.search ? openSearchResults : payments}
         onChange={handleTableChange}
diff --git a/client/src/components/phone-number-consent/phone-number-consent.component.jsx b/client/src/components/phone-number-consent/phone-number-consent.component.jsx
index 16dda1502..991731ea4 100644
--- a/client/src/components/phone-number-consent/phone-number-consent.component.jsx
+++ b/client/src/components/phone-number-consent/phone-number-consent.component.jsx
@@ -1,6 +1,5 @@
 import { useQuery } from "@apollo/client/react";
-import { Input, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Input, Table, Typography } from "antd";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -133,9 +132,8 @@ function PhoneNumberConsentList({ bodyshop }) {
         enterButton
       />
 
-      <ResponsiveTable
+      <Table
         columns={columns}
-        mobileColumnKeys={["phone_number", "created_at"]}
         dataSource={optOutData?.phone_number_opt_out}
         loading={optOutLoading /* || ownersLoading*/}
         rowKey="id"
diff --git a/client/src/components/production-list-table/production-list-config-manager.component.jsx b/client/src/components/production-list-table/production-list-config-manager.component.jsx
index 75e15b75d..23dcbdc0f 100644
--- a/client/src/components/production-list-table/production-list-config-manager.component.jsx
+++ b/client/src/components/production-list-table/production-list-config-manager.component.jsx
@@ -453,10 +453,10 @@ export function ProductionListConfigManager({
           }}
           onSelect={handleSelect}
           placeholder={t("production.labels.selectview")}
+          optionLabelProp="label"
           popupMatchSelectWidth={false}
           value={activeView}
           disabled={open || isAddingNewProfile} // Disable the Select box when the popover is open or adding a new profile
-          optionLabelProp="label"
         >
           {bodyshop?.production_config &&
             bodyshop.production_config
diff --git a/client/src/components/profile-shops/profile-shops.component.jsx b/client/src/components/profile-shops/profile-shops.component.jsx
index aed133d31..3bcb7dd29 100644
--- a/client/src/components/profile-shops/profile-shops.component.jsx
+++ b/client/src/components/profile-shops/profile-shops.component.jsx
@@ -1,5 +1,4 @@
-import { Button, Card, Col, Input, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Col, Input, Table, Typography } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -49,14 +48,7 @@ export default function ProfileShopsComponent({ loading, data, updateActiveShop
           />
         }
       >
-        <ResponsiveTable
-          pagination={false}
-          loading={loading}
-          columns={columns}
-          mobileColumnKeys={["actions", "shopname", "active"]}
-          rowKey="id"
-          dataSource={filteredData}
-        />
+        <Table pagination={false} loading={loading} columns={columns} rowKey="id" dataSource={filteredData} />
       </Card>
     </Col>
   );
diff --git a/client/src/components/responsive-table/responsive-table.component.jsx b/client/src/components/responsive-table/responsive-table.component.jsx
deleted file mode 100644
index 94ed7fc02..000000000
--- a/client/src/components/responsive-table/responsive-table.component.jsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { Grid, Table } from "antd";
-import { useMemo } from "react";
-import "./responsive-table.styles.scss";
-
-function ResponsiveTable({ className, columns, mobileColumnKeys, scroll, tableLayout, ...rest }) {
-  const screens = Grid.useBreakpoint();
-  const isPhone = !screens.md;
-  const isCompactViewport = !screens.lg;
-  const prefersHorizontalScroll = isPhone || isCompactViewport;
-  const isResponsiveFilteringEnabled = ["1", "true", "yes", "on"].includes(
-    String(import.meta.env.VITE_APP_ENABLE_RESPONSIVE_TABLE_FILTERING || "")
-      .trim()
-      .toLowerCase()
-  );
-
-  const resolvedColumns = useMemo(() => {
-    if (
-      !isResponsiveFilteringEnabled ||
-      !Array.isArray(columns) ||
-      !isPhone ||
-      !Array.isArray(mobileColumnKeys) ||
-      mobileColumnKeys.length === 0
-    ) {
-      return columns;
-    }
-
-    const visibleColumnKeys = new Set(mobileColumnKeys);
-    const filteredColumns = columns.filter((column) => {
-      const key = column?.key ?? column?.dataIndex;
-
-      // Keep columns with no stable key to avoid accidental loss.
-      if (key == null) return true;
-
-      if (Array.isArray(key)) {
-        return key.some((part) => visibleColumnKeys.has(part));
-      }
-
-      return visibleColumnKeys.has(key);
-    });
-
-    return filteredColumns.length > 0 ? filteredColumns : columns;
-  }, [columns, isPhone, isResponsiveFilteringEnabled, mobileColumnKeys]);
-
-  const resolvedScroll = useMemo(() => {
-    if (prefersHorizontalScroll) {
-      if (scroll == null) {
-        return { x: "max-content" };
-      }
-
-      if (typeof scroll !== "object" || Array.isArray(scroll)) {
-        return scroll;
-      }
-
-      const { x, ...baseScroll } = scroll;
-
-      return { ...baseScroll, x: x ?? "max-content" };
-    }
-
-    if (scroll == null) {
-      // Explicitly override ConfigProvider table.scroll desktop defaults.
-      return {};
-    }
-
-    if (typeof scroll !== "object" || Array.isArray(scroll)) {
-      return scroll;
-    }
-
-    const { x, ...desktopScroll } = scroll;
-
-    // On desktop we prefer fitting columns with ellipsis over forced horizontal scroll.
-    if (x == null) {
-      return desktopScroll;
-    }
-
-    return desktopScroll;
-  }, [prefersHorizontalScroll, scroll]);
-
-  const resolvedTableLayout = tableLayout ?? (prefersHorizontalScroll ? "auto" : "fixed");
-  const responsiveClassName = prefersHorizontalScroll ? undefined : "responsive-table-fit";
-  const resolvedClassName = [responsiveClassName, className].filter(Boolean).join(" ");
-
-  return (
-    <Table
-      className={resolvedClassName}
-      columns={resolvedColumns}
-      scroll={resolvedScroll}
-      tableLayout={resolvedTableLayout}
-      {...rest}
-    />
-  );
-}
-
-ResponsiveTable.Summary = Table.Summary;
-ResponsiveTable.Column = Table.Column;
-ResponsiveTable.ColumnGroup = Table.ColumnGroup;
-ResponsiveTable.SELECTION_COLUMN = Table.SELECTION_COLUMN;
-ResponsiveTable.EXPAND_COLUMN = Table.EXPAND_COLUMN;
-
-export default ResponsiveTable;
diff --git a/client/src/components/responsive-table/responsive-table.styles.scss b/client/src/components/responsive-table/responsive-table.styles.scss
deleted file mode 100644
index 349a46024..000000000
--- a/client/src/components/responsive-table/responsive-table.styles.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-.responsive-table-fit .ant-table-cell,
-.responsive-table-fit .ant-table-cell > * {
-  min-width: 0;
-}
-
-.responsive-table-fit .ant-table-content > table {
-  width: 100%;
-}
-
-.responsive-table-fit .ant-table-column-sorters {
-  width: 100%;
-}
-
-.responsive-table-fit .ant-table-column-title,
-.responsive-table-fit .ant-space,
-.responsive-table-fit .ant-space-item {
-  min-width: 0;
-}
-
-.responsive-table-fit .ant-table-cell-ellipsis > a,
-.responsive-table-fit .ant-table-cell-ellipsis > span {
-  display: block;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
index 8d85eacc3..18890e507 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -158,28 +158,20 @@ export function ScheduleJobModalComponent({
         </LayoutFormRow>
         <LayoutFormRow grow>
           <Form.Item name="color" label={t("appointments.fields.color")}>
-            <Select
-              allowClear
-              options={
-                bodyshop.appt_colors &&
-                bodyshop.appt_colors.map((color) => ({
-                  value: color.color.hex,
-                  label: color.label
-                }))
-              }
-            />
+            <Select allowClear>
+              {bodyshop.appt_colors &&
+                bodyshop.appt_colors.map((color) => (
+                  <Select.Option style={{ color: color.color.hex }} key={color.color.hex} value={color.color.hex}>
+                    {color.label}
+                  </Select.Option>
+                ))}
+            </Select>
           </Form.Item>
           <Form.Item name={"alt_transport"} label={t("jobs.fields.alt_transport")}>
-            <Select
-              allowClear
-              options={
-                bodyshop.appt_alt_transport &&
-                bodyshop.appt_alt_transport.map((alt) => ({
-                  value: alt,
-                  label: alt
-                }))
-              }
-            />
+            <Select allowClear>
+              {bodyshop.appt_alt_transport &&
+                bodyshop.appt_alt_transport.map((alt) => <Select.Option key={alt}>{alt}</Select.Option>)}
+            </Select>
           </Form.Item>
           <Form.Item name={"note"} label={t("appointments.fields.note")}>
             <Input />
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
index 2fd94f880..04e1e34b6 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
@@ -208,7 +208,7 @@ export function ScheduleJobModalContainer({
       onCancel={() => toggleModalVisible()}
       onOk={() => form.submit()}
       width={"90%"}
-      mask={{ closable: false }}
+      maskClosable={false}
       destroyOnHidden
       okButtonProps={{
         loading: loading
diff --git a/client/src/components/schedule-manual-event/schedule-manual-event.component.jsx b/client/src/components/schedule-manual-event/schedule-manual-event.component.jsx
index b8b45ab24..3294126dc 100644
--- a/client/src/components/schedule-manual-event/schedule-manual-event.component.jsx
+++ b/client/src/components/schedule-manual-event/schedule-manual-event.component.jsx
@@ -120,12 +120,13 @@ export function ScheduleManualEvent({ bodyshop, event }) {
             <FormDateTimePickerComponent />
           </Form.Item>
           <Form.Item label={t("appointments.fields.color")} name="color">
-            <Select
-              options={bodyshop.appt_colors.map((col) => ({
-                value: col.color.hex,
-                label: col.label
-              }))}
-            />
+            <Select>
+              {bodyshop.appt_colors.map((col, idx) => (
+                <Select.Option key={idx} value={col.color.hex}>
+                  {col.label}
+                </Select.Option>
+              ))}
+            </Select>
           </Form.Item>
 
           <Space wrap>
diff --git a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
index 2373cb004..3f06584d2 100644
--- a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
+++ b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
@@ -1,7 +1,6 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Input, Modal, Space, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Input, Modal, Space, Table, Typography } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
@@ -141,9 +140,8 @@ export default function ScoreboardJobsList() {
             </Space>
           }
         >
-          <ResponsiveTable
+          <Table
             columns={columns}
-            mobileColumnKeys={["ro_number", "owner", "vehicle", "date", "actions"]}
             rowKey="id"
             dataSource={data ? data.scoreboard : []}
             loading={loading}
diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx
index 8b900ba5a..8cc03c880 100644
--- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx
+++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx
@@ -1,5 +1,4 @@
-import { Card, Col, Row, Statistic, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Card, Col, Row, Statistic, Table, Typography } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -99,9 +98,8 @@ export function ScoreboardTicketsStats({ data }) {
           <Typography.Text type="secondary">{t("scoreboard.labels.calendarperiod")}</Typography.Text>
         </Col>
         <Col md={24} lg={20}>
-          <ResponsiveTable
+          <Table
             columns={columns}
-            mobileColumnKeys={["employee_number", "totalThisWeek", "totalLastWeek", "totalThisMonth"]}
             rowKey="employee_number"
             dataSource={tableData}
             id="employee_number"
diff --git a/client/src/components/shop-employees/shop-employees-form.component.jsx b/client/src/components/shop-employees/shop-employees-form.component.jsx
index 59a5b7e9f..804081071 100644
--- a/client/src/components/shop-employees/shop-employees-form.component.jsx
+++ b/client/src/components/shop-employees/shop-employees-form.component.jsx
@@ -1,8 +1,7 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useApolloClient, useMutation, useQuery } from "@apollo/client/react";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
-import { Button, Card, Form, Input, InputNumber, Select, Switch } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Form, Input, InputNumber, Select, Switch, Table } from "antd";
 import { useForm } from "antd/es/form/Form";
 import queryString from "query-string";
 import { useEffect } from "react";
@@ -326,20 +325,22 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
                           }
                         ]}
                       >
-                        <Select
-                          options={[
-                            { value: "timetickets.labels.shift", label: t("timetickets.labels.shift") },
-                            ...(bodyshop.cdk_dealerid ||
-                            bodyshop.pbs_serialnumber ||
-                            bodyshop.rr_dealerid ||
-                            Enhanced_Payroll.treatment === "on"
-                              ? CiecaSelect(false, true)
-                              : bodyshop.md_responsibility_centers.costs.map((c) => ({
-                                  value: c.name,
-                                  label: c.name
-                                })))
-                          ]}
-                        />
+                        <Select>
+                          <Select.Option key={"shift"} value="timetickets.labels.shift">
+                            {t("timetickets.labels.shift")}
+                          </Select.Option>
+
+                          {bodyshop.cdk_dealerid ||
+                          bodyshop.pbs_serialnumber ||
+                          bodyshop.rr_dealerid ||
+                          Enhanced_Payroll.treatment === "on"
+                            ? CiecaSelect(false, true)
+                            : bodyshop.md_responsibility_centers.costs.map((c) => (
+                                <Select.Option key={c.name} value={c.name}>
+                                  {c.name}
+                                </Select.Option>
+                              ))}
+                        </Select>
                       </Form.Item>
                       <Form.Item
                         label={t("employees.fields.rate")}
@@ -381,10 +382,9 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
         </Form.List>
       </Form>
 
-      <ResponsiveTable
+      <Table
         title={() => <ShopEmployeeAddVacation employee={data && data.employees_by_pk} />}
         columns={columns}
-        mobileColumnKeys={["start", "length", "actions"]}
         rowKey={"id"}
         dataSource={data?.employees_by_pk?.employee_vacations ?? []}
       />
diff --git a/client/src/components/shop-employees/shop-employees-list.component.jsx b/client/src/components/shop-employees/shop-employees-list.component.jsx
index e9082ac05..acbea5fd0 100644
--- a/client/src/components/shop-employees/shop-employees-list.component.jsx
+++ b/client/src/components/shop-employees/shop-employees-list.component.jsx
@@ -1,10 +1,9 @@
-import { Button } from "antd";
+import { Button, Table } from "antd";
 import queryString from "query-string";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation, useNavigate } from "react-router-dom";
 import { alphaSort } from "../../utils/sorters";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 export default function ShopEmployeesListComponent({ loading, employees }) {
   const { t } = useTranslation();
@@ -90,7 +89,7 @@ export default function ShopEmployeesListComponent({ loading, employees }) {
   ];
   return (
     <div>
-      <ResponsiveTable
+      <Table
         title={() => {
           return (
             <Button
@@ -107,7 +106,6 @@ export default function ShopEmployeesListComponent({ loading, employees }) {
         loading={loading}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["employee_number", "employee_name", "active"]}
         rowKey="id"
         dataSource={employees}
         rowSelection={{
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 00410f0f9..3eddfbfaa 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -1039,25 +1039,22 @@ export function ShopInfoGeneral({ form }) {
                         key={`${index}mod_lbr_ty`}
                         name={[field.name, "mod_lbr_ty"]}
                       >
-                        <Select
-                          allowClear
-                          options={[
-                            { value: "LAA", label: t("joblines.fields.lbr_types.LAA") },
-                            { value: "LAB", label: t("joblines.fields.lbr_types.LAB") },
-                            { value: "LAD", label: t("joblines.fields.lbr_types.LAD") },
-                            { value: "LAE", label: t("joblines.fields.lbr_types.LAE") },
-                            { value: "LAF", label: t("joblines.fields.lbr_types.LAF") },
-                            { value: "LAG", label: t("joblines.fields.lbr_types.LAG") },
-                            { value: "LAM", label: t("joblines.fields.lbr_types.LAM") },
-                            { value: "LAR", label: t("joblines.fields.lbr_types.LAR") },
-                            { value: "LAS", label: t("joblines.fields.lbr_types.LAS") },
-                            { value: "LAU", label: t("joblines.fields.lbr_types.LAU") },
-                            { value: "LA1", label: t("joblines.fields.lbr_types.LA1") },
-                            { value: "LA2", label: t("joblines.fields.lbr_types.LA2") },
-                            { value: "LA3", label: t("joblines.fields.lbr_types.LA3") },
-                            { value: "LA4", label: t("joblines.fields.lbr_types.LA4") }
-                          ]}
-                        />
+                        <Select allowClear>
+                          <Select.Option value="LAA">{t("joblines.fields.lbr_types.LAA")}</Select.Option>
+                          <Select.Option value="LAB">{t("joblines.fields.lbr_types.LAB")}</Select.Option>
+                          <Select.Option value="LAD">{t("joblines.fields.lbr_types.LAD")}</Select.Option>
+                          <Select.Option value="LAE">{t("joblines.fields.lbr_types.LAE")}</Select.Option>
+                          <Select.Option value="LAF">{t("joblines.fields.lbr_types.LAF")}</Select.Option>
+                          <Select.Option value="LAG">{t("joblines.fields.lbr_types.LAG")}</Select.Option>
+                          <Select.Option value="LAM">{t("joblines.fields.lbr_types.LAM")}</Select.Option>
+                          <Select.Option value="LAR">{t("joblines.fields.lbr_types.LAR")}</Select.Option>
+                          <Select.Option value="LAS">{t("joblines.fields.lbr_types.LAS")}</Select.Option>
+                          <Select.Option value="LAU">{t("joblines.fields.lbr_types.LAU")}</Select.Option>
+                          <Select.Option value="LA1">{t("joblines.fields.lbr_types.LA1")}</Select.Option>
+                          <Select.Option value="LA2">{t("joblines.fields.lbr_types.LA2")}</Select.Option>
+                          <Select.Option value="LA3">{t("joblines.fields.lbr_types.LA3")}</Select.Option>
+                          <Select.Option value="LA4">{t("joblines.fields.lbr_types.LA4")}</Select.Option>
+                        </Select>
                       </Form.Item>
                       <Form.Item
                         label={t("joblines.fields.mod_lb_hrs")}
@@ -1071,20 +1068,17 @@ export function ShopInfoGeneral({ form }) {
                         key={`${index}part_type`}
                         name={[field.name, "part_type"]}
                       >
-                        <Select
-                          allowClear
-                          options={[
-                            { value: "PAA", label: t("joblines.fields.part_types.PAA") },
-                            { value: "PAC", label: t("joblines.fields.part_types.PAC") },
-                            { value: "PAE", label: t("joblines.fields.part_types.PAE") },
-                            { value: "PAL", label: t("joblines.fields.part_types.PAL") },
-                            { value: "PAM", label: t("joblines.fields.part_types.PAM") },
-                            { value: "PAN", label: t("joblines.fields.part_types.PAN") },
-                            { value: "PAO", label: t("joblines.fields.part_types.PAO") },
-                            { value: "PAR", label: t("joblines.fields.part_types.PAR") },
-                            { value: "PAS", label: t("joblines.fields.part_types.PAS") }
-                          ]}
-                        />
+                        <Select allowClear>
+                          <Select.Option value="PAA">{t("joblines.fields.part_types.PAA")}</Select.Option>
+                          <Select.Option value="PAC">{t("joblines.fields.part_types.PAC")}</Select.Option>
+                          <Select.Option value="PAE">{t("joblines.fields.part_types.PAE")}</Select.Option>
+                          <Select.Option value="PAL">{t("joblines.fields.part_types.PAL")}</Select.Option>
+                          <Select.Option value="PAM">{t("joblines.fields.part_types.PAM")}</Select.Option>
+                          <Select.Option value="PAN">{t("joblines.fields.part_types.PAN")}</Select.Option>
+                          <Select.Option value="PAO">{t("joblines.fields.part_types.PAO")}</Select.Option>
+                          <Select.Option value="PAR">{t("joblines.fields.part_types.PAR")}</Select.Option>
+                          <Select.Option value="PAS">{t("joblines.fields.part_types.PAS")}</Select.Option>
+                        </Select>
                       </Form.Item>
                       <Form.Item
                         label={t("joblines.fields.oem_partno")}
diff --git a/client/src/components/shop-info/shop-info.intake.component.jsx b/client/src/components/shop-info/shop-info.intake.component.jsx
index 174a6ddf0..e71738af8 100644
--- a/client/src/components/shop-info/shop-info.intake.component.jsx
+++ b/client/src/components/shop-info/shop-info.intake.component.jsx
@@ -51,7 +51,13 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                           }
                         ]}
                       >
-                        <Select options={Object.keys(ConfigFormTypes).map((i) => ({ value: i, label: i }))} />
+                        <Select>
+                          {Object.keys(ConfigFormTypes).map((i) => (
+                            <Select.Option key={i} value={i}>
+                              {i}
+                            </Select.Option>
+                          ))}
+                        </Select>
                       </Form.Item>
                       <Form.Item
                         label={t("jobs.fields.intake.label")}
@@ -150,13 +156,13 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
             }
           ]}
         >
-          <Select
-            mode="multiple"
-            options={Object.keys(TemplateListGenerated).map((i) => ({
-              value: TemplateListGenerated[i].key,
-              label: TemplateListGenerated[i].title
-            }))}
-          />
+          <Select mode="multiple">
+            {Object.keys(TemplateListGenerated).map((i) => (
+              <Select.Option key={TemplateListGenerated[i].key} value={TemplateListGenerated[i].key}>
+                {TemplateListGenerated[i].title}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           name={["intakechecklist", "next_contact_hours"]}
@@ -199,7 +205,13 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
                           }
                         ]}
                       >
-                        <Select options={Object.keys(ConfigFormTypes).map((i) => ({ value: i, label: i }))} />
+                        <Select>
+                          {Object.keys(ConfigFormTypes).map((i) => (
+                            <Select.Option key={i} value={i}>
+                              {i}
+                            </Select.Option>
+                          ))}
+                        </Select>
                       </Form.Item>
 
                       <Form.Item
@@ -298,13 +310,13 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
             }
           ]}
         >
-          <Select
-            mode="multiple"
-            options={Object.keys(TemplateListGenerated).map((i) => ({
-              value: TemplateListGenerated[i].key,
-              label: TemplateListGenerated[i].title
-            }))}
-          />
+          <Select mode="multiple">
+            {Object.keys(TemplateListGenerated).map((i) => (
+              <Select.Option key={TemplateListGenerated[i].key} value={TemplateListGenerated[i].key}>
+                {TemplateListGenerated[i].title}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           name={["deliverchecklist", "actual_delivery"]}
diff --git a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
index 87013bdd2..f7f7c9a4a 100644
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -66,11 +66,11 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
   };
 
   const ReceivableCustomFieldSelect = (
-    <Select allowClear options={[
-      { value: "v_vin", label: "VIN" },
-      { value: "clm_no", label: "Claim No." },
-      { value: "ded_amt", label: "Deductible Amount" }
-    ]} />
+    <Select allowClear>
+      <Select.Option value="v_vin">VIN</Select.Option>
+      <Select.Option value="clm_no">Claim No.</Select.Option>
+      <Select.Option value="ded_amt">Deductible Amount</Select.Option>
+    </Select>
   );
 
   return (
@@ -518,12 +518,14 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                   key={`${index}control_type`}
                                   name={[field.name, "control_type"]}
                                 >
-                                  <Select allowClear showSearch options={[
-                                    { value: "ro_number", label: t("jobs.fields.ro_number") },
-                                    { value: "clm_no", label: t("jobs.fields.clm_no") },
-                                    { value: "po_number", label: t("jobs.fields.ponumber") },
-                                    { value: "account_number", label: t("jobs.fields.dms.control_type.account_number") }
-                                  ]} />
+                                  <Select allowClear showSearch>
+                                    <Select.Option value="ro_number">{t("jobs.fields.ro_number")}</Select.Option>
+                                    <Select.Option value="clm_no">{t("jobs.fields.clm_no")}</Select.Option>
+                                    <Select.Option value="po_number">{t("jobs.fields.ponumber")}</Select.Option>
+                                    <Select.Option value="account_number">
+                                      {t("jobs.fields.dms.control_type.account_number")}
+                                    </Select.Option>
+                                  </Select>
                                 </Form.Item>
                                 <Space align="center">
                                   <DeleteFilled
@@ -771,11 +773,17 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                   name={[field.name, "rr_item_type"]}
                                   rules={[{ required: true }]}
                                 >
-                                  <Select options={[
-                                    { value: "G", label: t("bodyshop.fields.responsibilitycenters.item_type_gog") },
-                                    { value: "P", label: t("bodyshop.fields.responsibilitycenters.item_type_paint") },
-                                    { value: "F", label: t("bodyshop.fields.responsibilitycenters.item_type_freight") }
-                                  ]} />
+                                  <Select>
+                                    <Select.Option value="G">
+                                      {t("bodyshop.fields.responsibilitycenters.item_type_gog")}
+                                    </Select.Option>
+                                    <Select.Option value="P">
+                                      {t("bodyshop.fields.responsibilitycenters.item_type_paint")}
+                                    </Select.Option>
+                                    <Select.Option value="F">
+                                      {t("bodyshop.fields.responsibilitycenters.item_type_freight")}
+                                    </Select.Option>
+                                  </Select>
                                 </Form.Item>
 
                                 <Form.Item
@@ -784,10 +792,14 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                   name={[field.name, "rr_cust_txbl_flag"]}
                                   rules={[{ required: true }]}
                                 >
-                                  <Select options={[
-                                    { value: "T", label: t("bodyshop.fields.responsibilitycenters.taxable") },
-                                    { value: "N", label: t("bodyshop.fields.responsibilitycenters.nontaxable") }
-                                  ]} />
+                                  <Select>
+                                    <Select.Option value="T">
+                                      {t("bodyshop.fields.responsibilitycenters.taxable")}
+                                    </Select.Option>
+                                    <Select.Option value="N">
+                                      {t("bodyshop.fields.responsibilitycenters.nontaxable")}
+                                    </Select.Option>
+                                  </Select>
                                 </Form.Item>
                               </>
                             )}
@@ -866,7 +878,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-ats`}
                                     name={[field.name, "costs", "ATS"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.laa")}
@@ -884,7 +902,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LAA`}
                                     name={[field.name, "costs", "LAA"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lab")}
@@ -902,7 +926,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LAB`}
                                     name={[field.name, "costs", "LAB"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lad")}
@@ -920,7 +950,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LAD`}
                                     name={[field.name, "costs", "LAD"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lae")}
@@ -938,7 +974,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LAE`}
                                     name={[field.name, "costs", "LAE"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.laf")}
@@ -956,7 +998,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LAF`}
                                     name={[field.name, "costs", "LAF"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lag")}
@@ -974,7 +1022,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LAG`}
                                     name={[field.name, "costs", "LAG"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lam")}
@@ -992,7 +1046,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LAM`}
                                     name={[field.name, "costs", "LAM"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lar")}
@@ -1010,7 +1070,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LAR`}
                                     name={[field.name, "costs", "LAR"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.las")}
@@ -1028,7 +1094,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LAS`}
                                     name={[field.name, "costs", "LAS"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lau")}
@@ -1046,7 +1118,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LAU`}
                                     name={[field.name, "costs", "LAU"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.la1")}
@@ -1064,7 +1142,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LA1`}
                                     name={[field.name, "costs", "LA1"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.la2")}
@@ -1082,7 +1166,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LA2`}
                                     name={[field.name, "costs", "LA2"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.la3")}
@@ -1100,7 +1190,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LA3`}
                                     name={[field.name, "costs", "LA3"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.la4")}
@@ -1118,7 +1214,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-LA4`}
                                     name={[field.name, "costs", "LA4"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.paa")}
@@ -1136,7 +1238,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PAA`}
                                     name={[field.name, "costs", "PAA"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pac")}
@@ -1154,7 +1262,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PAC`}
                                     name={[field.name, "costs", "PAC"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pag")}
@@ -1172,7 +1286,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PAG`}
                                     name={[field.name, "costs", "PAG"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pal")}
@@ -1190,7 +1310,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PAL`}
                                     name={[field.name, "costs", "PAL"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pam")}
@@ -1208,7 +1334,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PAM`}
                                     name={[field.name, "costs", "PAM"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pan")}
@@ -1226,7 +1358,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PAN`}
                                     name={[field.name, "costs", "PAN"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pao")}
@@ -1244,7 +1382,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PAO`}
                                     name={[field.name, "costs", "PAO"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pap")}
@@ -1262,7 +1406,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PAP`}
                                     name={[field.name, "costs", "PAP"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.par")}
@@ -1280,7 +1430,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PAR`}
                                     name={[field.name, "costs", "PAR"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pas")}
@@ -1298,7 +1454,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PAS`}
                                     name={[field.name, "costs", "PAS"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pasl")}
@@ -1316,7 +1478,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-PASL`}
                                     name={[field.name, "costs", "PASL"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.tow")}
@@ -1334,7 +1502,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-TOW`}
                                     name={[field.name, "costs", "TOW"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.mapa")}
@@ -1352,7 +1526,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-MAPA`}
                                     name={[field.name, "costs", "MAPA"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.mash")}
@@ -1370,7 +1550,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}costs-MASH`}
                                     name={[field.name, "costs", "MASH"]}
                                   >
-                                    <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {costOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                 </LayoutFormRow>
                                 <LayoutFormRow header={t("bodyshop.labels.dms.profitsmapping")} id="profitsmapping">
@@ -1390,7 +1576,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-ATS`}
                                     name={[field.name, "profits", "ATS"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.laa")}
@@ -1408,7 +1600,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LAA`}
                                     name={[field.name, "profits", "LAA"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lab")}
@@ -1426,7 +1624,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LAB`}
                                     name={[field.name, "profits", "LAB"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lad")}
@@ -1444,7 +1648,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LAD`}
                                     name={[field.name, "profits", "LAD"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lae")}
@@ -1462,7 +1672,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LAE`}
                                     name={[field.name, "profits", "LAE"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.laf")}
@@ -1480,7 +1696,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LAF`}
                                     name={[field.name, "profits", "LAF"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lag")}
@@ -1498,7 +1720,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LAG`}
                                     name={[field.name, "profits", "LAG"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lam")}
@@ -1516,7 +1744,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LAM`}
                                     name={[field.name, "profits", "LAM"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lar")}
@@ -1534,7 +1768,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LAR`}
                                     name={[field.name, "profits", "LAR"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.las")}
@@ -1552,7 +1792,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LAS`}
                                     name={[field.name, "profits", "LAS"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.lau")}
@@ -1570,7 +1816,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LAU`}
                                     name={[field.name, "profits", "LAU"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.la1")}
@@ -1588,7 +1840,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LA1`}
                                     name={[field.name, "profits", "LA1"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.la2")}
@@ -1606,7 +1864,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LA2`}
                                     name={[field.name, "profits", "LA2"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.la3")}
@@ -1624,7 +1888,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LA3`}
                                     name={[field.name, "profits", "LA3"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.la4")}
@@ -1642,7 +1912,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-LA4`}
                                     name={[field.name, "profits", "LA4"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.paa")}
@@ -1660,7 +1936,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PAA`}
                                     name={[field.name, "profits", "PAA"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pac")}
@@ -1678,7 +1960,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PAC`}
                                     name={[field.name, "profits", "PAC"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pag")}
@@ -1696,7 +1984,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PAG`}
                                     name={[field.name, "profits", "PAG"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pal")}
@@ -1714,7 +2008,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PAL`}
                                     name={[field.name, "profits", "PAL"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pam")}
@@ -1732,7 +2032,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PAM`}
                                     name={[field.name, "profits", "PAM"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pan")}
@@ -1750,7 +2056,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PAN`}
                                     name={[field.name, "profits", "PAN"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pao")}
@@ -1768,7 +2080,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PAO`}
                                     name={[field.name, "profits", "PAO"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pap")}
@@ -1786,7 +2104,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PAP`}
                                     name={[field.name, "profits", "PAP"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.par")}
@@ -1804,7 +2128,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PAR`}
                                     name={[field.name, "profits", "PAR"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pas")}
@@ -1822,7 +2152,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PAS`}
                                     name={[field.name, "profits", "PAS"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.pasl")}
@@ -1840,7 +2176,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-PASL`}
                                     name={[field.name, "profits", "PASL"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.tow")}
@@ -1858,7 +2200,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-TOW`}
                                     name={[field.name, "profits", "TOW"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.mapa")}
@@ -1876,7 +2224,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-MAPA`}
                                     name={[field.name, "profits", "MAPA"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                   <Form.Item
                                     label={t("bodyshop.fields.responsibilitycenters.mash")}
@@ -1894,7 +2248,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                     key={`${index}profits-MASH`}
                                     name={[field.name, "profits", "MASH"]}
                                   >
-                                    <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                                    <Select showSearch>
+                                      {profitOptions.map((item, idx) => (
+                                        <Select.Option key={idx} value={item}>
+                                          {item}
+                                        </Select.Option>
+                                      ))}
+                                    </Select>
                                   </Form.Item>
                                 </LayoutFormRow>
                               </div>
@@ -1934,7 +2294,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "ATS"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.laa")}
@@ -1951,7 +2317,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LAA"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lab")}
@@ -1968,7 +2340,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LAB"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lad")}
@@ -1985,7 +2363,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LAD"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lae")}
@@ -2002,7 +2386,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LAE"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.laf")}
@@ -2019,7 +2409,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LAF"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lag")}
@@ -2036,7 +2432,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LAG"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lam")}
@@ -2053,7 +2455,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LAM"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lar")}
@@ -2070,7 +2478,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LAR"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.las")}
@@ -2087,7 +2501,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LAS"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lau")}
@@ -2104,7 +2524,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LAU"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.la1")}
@@ -2121,7 +2547,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LA1"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.la2")}
@@ -2138,7 +2570,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LA2"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.la3")}
@@ -2155,7 +2593,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LA3"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.la4")}
@@ -2172,7 +2616,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "LA4"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.paa")}
@@ -2189,7 +2639,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PAA"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pac")}
@@ -2206,7 +2662,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PAC"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pag")}
@@ -2223,7 +2685,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PAG"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pal")}
@@ -2240,7 +2708,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PAL"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pam")}
@@ -2257,7 +2731,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PAM"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pan")}
@@ -2274,7 +2754,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PAN"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pao")}
@@ -2291,7 +2777,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PAO"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pap")}
@@ -2308,7 +2800,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PAP"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.par")}
@@ -2325,7 +2823,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PAR"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pas")}
@@ -2342,7 +2846,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PAS"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pasl")}
@@ -2359,7 +2869,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "PASL"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.tow")}
@@ -2376,7 +2892,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "TOW"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.mapa")}
@@ -2393,7 +2915,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "MAPA"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.mash")}
@@ -2410,7 +2938,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "costs", "MASH"]}
                 >
-                  <Select showSearch options={costOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {costOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
               </LayoutFormRow>
               <LayoutFormRow header={t("bodyshop.labels.defaultprofitsmapping")}>
@@ -2429,7 +2963,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "ATS"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.laa")}
@@ -2446,7 +2986,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LAA"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lab")}
@@ -2463,7 +3009,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LAB"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lad")}
@@ -2480,7 +3032,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LAD"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lae")}
@@ -2497,7 +3055,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LAE"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.laf")}
@@ -2514,7 +3078,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LAF"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lag")}
@@ -2531,7 +3101,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LAG"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lam")}
@@ -2548,7 +3124,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LAM"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lar")}
@@ -2565,7 +3147,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LAR"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.las")}
@@ -2582,7 +3170,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LAS"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.lau")}
@@ -2599,7 +3193,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LAU"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.la1")}
@@ -2616,7 +3216,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LA1"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.la2")}
@@ -2633,7 +3239,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LA2"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.la3")}
@@ -2650,7 +3262,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LA3"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.la4")}
@@ -2667,7 +3285,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "LA4"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.paa")}
@@ -2684,7 +3308,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PAA"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pac")}
@@ -2701,7 +3331,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PAC"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pag")}
@@ -2718,7 +3354,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PAG"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pal")}
@@ -2735,7 +3377,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PAL"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pam")}
@@ -2752,7 +3400,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PAM"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pan")}
@@ -2769,7 +3423,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PAN"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pao")}
@@ -2786,7 +3446,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PAO"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pap")}
@@ -2803,7 +3469,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PAP"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.par")}
@@ -2820,7 +3492,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PAR"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pas")}
@@ -2837,7 +3515,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PAS"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.pasl")}
@@ -2854,7 +3538,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "PASL"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.tow")}
@@ -2871,7 +3561,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "TOW"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.mapa")}
@@ -2888,7 +3584,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "MAPA"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
                 <Form.Item
                   label={t("bodyshop.fields.responsibilitycenters.mash")}
@@ -2905,7 +3607,13 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   ]}
                   name={["md_responsibility_centers", "defaults", "profits", "MASH"]}
                 >
-                  <Select showSearch options={profitOptions.map((item) => ({ value: item, label: item }))} />
+                  <Select showSearch>
+                    {profitOptions.map((item, idx) => (
+                      <Select.Option key={idx} value={item}>
+                        {item}
+                      </Select.Option>
+                    ))}
+                  </Select>
                 </Form.Item>
               </LayoutFormRow>
             </SelectorDiv>
diff --git a/client/src/components/shop-info/shop-info.rostatus.component.jsx b/client/src/components/shop-info/shop-info.rostatus.component.jsx
index 3f843a991..b5bcf643c 100644
--- a/client/src/components/shop-info/shop-info.rostatus.component.jsx
+++ b/client/src/components/shop-info/shop-info.rostatus.component.jsx
@@ -80,7 +80,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           }
         ]}
       >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
+        <Select mode="multiple">
+          {options.map((item, idx) => (
+            <Select.Option key={idx} value={item}>
+              {item}
+            </Select.Option>
+          ))}
+        </Select>
       </Form.Item>
       <Form.Item
         name={["md_ro_statuses", "pre_production_statuses"]}
@@ -93,7 +99,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           }
         ]}
       >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
+        <Select mode="multiple">
+          {options.map((item, idx) => (
+            <Select.Option key={idx} value={item}>
+              {item}
+            </Select.Option>
+          ))}
+        </Select>
       </Form.Item>
       <Form.Item
         name={["md_ro_statuses", "production_statuses"]}
@@ -106,7 +118,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           }
         ]}
       >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
+        <Select mode="multiple">
+          {options.map((item, idx) => (
+            <Select.Option key={idx} value={item}>
+              {item}
+            </Select.Option>
+          ))}
+        </Select>
       </Form.Item>
       <Form.Item
         name={["md_ro_statuses", "post_production_statuses"]}
@@ -119,7 +137,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           }
         ]}
       >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
+        <Select mode="multiple">
+          {options.map((item, idx) => (
+            <Select.Option key={idx} value={item}>
+              {item}
+            </Select.Option>
+          ))}
+        </Select>
       </Form.Item>
       <Form.Item
         name={["md_ro_statuses", "ready_statuses"]}
@@ -132,7 +156,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           }
         ]}
       >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
+        <Select mode="multiple">
+          {options.map((item, idx) => (
+            <Select.Option key={idx} value={item}>
+              {item}
+            </Select.Option>
+          ))}
+        </Select>
       </Form.Item>
       <Form.Item
         name={["md_ro_statuses", "additional_board_statuses"]}
@@ -145,7 +175,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           }
         ]}
       >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
+        <Select mode="multiple">
+          {options.map((item, idx) => (
+            <Select.Option key={idx} value={item}>
+              {item}
+            </Select.Option>
+          ))}
+        </Select>
       </Form.Item>
       <LayoutFormRow noDivider>
         <Form.Item
@@ -158,7 +194,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_scheduled"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_arrived")}
@@ -170,7 +212,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_arrived"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_exported")}
@@ -182,7 +230,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_exported"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_imported")}
@@ -194,7 +248,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_imported"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_invoiced")}
@@ -206,7 +266,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_invoiced"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_completed")}
@@ -218,7 +284,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_completed"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_delivered")}
@@ -230,7 +302,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_delivered"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_void")}
@@ -242,7 +320,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_void"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select>
+            {options.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
       </LayoutFormRow>
       {Production_List_Status_Colors.treatment === "on" && (
@@ -268,7 +352,13 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
                                 }
                               ]}
                             >
-                              <Select options={productionStatus.map((item) => ({ value: item, label: item }))} />
+                              <Select>
+                                {productionStatus.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
                             </Form.Item>
                             <DeleteFilled
                               onClick={() => {
diff --git a/client/src/components/shop-info/shop-info.speedprint.component.jsx b/client/src/components/shop-info/shop-info.speedprint.component.jsx
index 08d9e816a..bb1b8b313 100644
--- a/client/src/components/shop-info/shop-info.speedprint.component.jsx
+++ b/client/src/components/shop-info/shop-info.speedprint.component.jsx
@@ -60,13 +60,13 @@ export default function ShopInfoSpeedPrint() {
                       }
                     ]}
                   >
-                    <Select
-                      mode="multiple"
-                      options={Object.keys(TemplateListGenerated).map((key) => ({
-                        value: TemplateListGenerated[key].key,
-                        label: TemplateListGenerated[key].title
-                      }))}
-                    />
+                    <Select mode="multiple">
+                      {Object.keys(TemplateListGenerated).map((key, idx) => (
+                        <Select.Option key={idx} value={TemplateListGenerated[key].key}>
+                          {TemplateListGenerated[key].title}
+                        </Select.Option>
+                      ))}
+                    </Select>
                   </Form.Item>
 
                   <Space wrap>
diff --git a/client/src/components/shop-info/shop-intellipay-config.component.jsx b/client/src/components/shop-info/shop-intellipay-config.component.jsx
index bdbf80c02..da7b4d1fc 100644
--- a/client/src/components/shop-info/shop-intellipay-config.component.jsx
+++ b/client/src/components/shop-info/shop-intellipay-config.component.jsx
@@ -43,43 +43,85 @@ export function ShopInfoIntellipay({ bodyshop, form }) {
           label={t("bodyshop.fields.intellipay_config.payment_map.visa")}
           name={["intellipay_config", "payment_map", "visa"]}
         >
-          <Select showSearch options={bodyshop.md_payment_types.map((item) => ({ value: item, label: item }))} />
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.intellipay_config.payment_map.mast")}
           name={["intellipay_config", "payment_map", "mast"]}
         >
-          <Select showSearch options={bodyshop.md_payment_types.map((item) => ({ value: item, label: item }))} />
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.intellipay_config.payment_map.amex")}
           name={["intellipay_config", "payment_map", "amex"]}
         >
-          <Select showSearch options={bodyshop.md_payment_types.map((item) => ({ value: item, label: item }))} />
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.intellipay_config.payment_map.disc")}
           name={["intellipay_config", "payment_map", "disc"]}
         >
-          <Select showSearch options={bodyshop.md_payment_types.map((item) => ({ value: item, label: item }))} />
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.intellipay_config.payment_map.dnrs")}
           name={["intellipay_config", "payment_map", "dnrs"]}
         >
-          <Select showSearch options={bodyshop.md_payment_types.map((item) => ({ value: item, label: item }))} />
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.intellipay_config.payment_map.jcb")}
           name={["intellipay_config", "payment_map", "jcb"]}
         >
-          <Select showSearch options={bodyshop.md_payment_types.map((item) => ({ value: item, label: item }))} />
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.intellipay_config.payment_map.intr")}
           name={["intellipay_config", "payment_map", "intr"]}
         >
-          <Select showSearch options={bodyshop.md_payment_types.map((item) => ({ value: item, label: item }))} />
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
       </LayoutFormRow>
     </>
diff --git a/client/src/components/shop-teams/shop-employee-teams.list.jsx b/client/src/components/shop-teams/shop-employee-teams.list.jsx
index 4c0ac837b..2d3ccf9c0 100644
--- a/client/src/components/shop-teams/shop-employee-teams.list.jsx
+++ b/client/src/components/shop-teams/shop-employee-teams.list.jsx
@@ -1,8 +1,7 @@
-import { Button } from "antd";
+import { Button, Table } from "antd";
 import queryString from "query-string";
 import { useTranslation } from "react-i18next";
 import { useLocation, useNavigate } from "react-router-dom";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 export default function ShopEmployeeTeamsListComponent({ loading, employee_teams }) {
   const { t } = useTranslation();
@@ -28,7 +27,7 @@ export default function ShopEmployeeTeamsListComponent({ loading, employee_teams
 
   return (
     <div>
-      <ResponsiveTable
+      <Table
         title={() => {
           return (
             <Button
@@ -45,7 +44,6 @@ export default function ShopEmployeeTeamsListComponent({ loading, employee_teams
         loading={loading}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["name"]}
         rowKey="id"
         dataSource={employee_teams}
         rowSelection={{
diff --git a/client/src/components/shop-users/shop-users.component.jsx b/client/src/components/shop-users/shop-users.component.jsx
index d3fd16b45..b625e7060 100644
--- a/client/src/components/shop-users/shop-users.component.jsx
+++ b/client/src/components/shop-users/shop-users.component.jsx
@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client/react";
-import { Button } from "antd";
+import { Button, Table } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -7,7 +7,6 @@ import { QUERY_SHOP_ASSOCIATIONS } from "../../graphql/user.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 import ShopUsersAuthEdit from "../shop-users-auth-edit/shop-users-auth-edit.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -67,11 +66,10 @@ export function ShopInfoUsersComponent({ bodyshop }) {
   }
   return (
     <div>
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["email", "authlevel", "actions"]}
         rowKey="id"
         dataSource={data && data.associations}
       />
diff --git a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
index b57b15d40..f37edddf8 100644
--- a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
+++ b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
@@ -1,5 +1,5 @@
 import { CarOutlined, SettingOutlined, SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space, Typography } from "antd";
+import { Button, Card, Input, Space, Table, Typography } from "antd";
 import axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
@@ -20,7 +20,6 @@ import * as Sentry from "@sentry/react";
 import getPartsBasePath from "../../utils/getPartsBasePath.js";
 import { toggleDarkMode } from "../../redux/application/application.actions.js";
 import { FaMoon, FaSun } from "react-icons/fa";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -244,7 +243,7 @@ export function SimplifiedPartsJobsListComponent({
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading || searchLoading}
         pagination={
           search?.search
@@ -260,7 +259,6 @@ export function SimplifiedPartsJobsListComponent({
               }
         }
         columns={columns}
-        mobileColumnKeys={["ro_number", "ownr_ln", "status", "vehicle", "partsstatus"]}
         rowKey="id"
         dataSource={search?.search ? openSearchResults : jobs}
         onChange={handleTableChange}
diff --git a/client/src/components/task-list/task-list.component.jsx b/client/src/components/task-list/task-list.component.jsx
index 0bd9682fc..7aa0447e7 100644
--- a/client/src/components/task-list/task-list.component.jsx
+++ b/client/src/components/task-list/task-list.component.jsx
@@ -7,7 +7,7 @@ import {
   PlusCircleFilled,
   SyncOutlined
 } from "@ant-design/icons";
-import { Button, Card, Space, Switch } from "antd";
+import { Button, Card, Space, Switch, Table } from "antd";
 import queryString from "query-string";
 import { useCallback, useEffect } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,7 +20,6 @@ import dayjs from "../../utils/day";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import PriorityLabel from "../../utils/tasksPriorityLabel.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils.js";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 /**
  * Task List Component
@@ -231,9 +230,9 @@ function TaskListComponent({
     {
       title: t("tasks.fields.actions"),
       key: "toggleCompleted",
-      width: 260,
+      width: "8%",
       render: (text, record) => (
-        <Space orientation="horizontal" size="small" style={{ maxWidth: "100%", whiteSpace: "nowrap" }}>
+        <Space orientation="horizontal">
           <ShareToTeamsButton
             linkText=""
             urlOverride={`${window.location.origin}/manage/tasks/alltasks?taskid=${record.id}`}
@@ -346,7 +345,7 @@ function TaskListComponent({
 
   return (
     <Card title={titleTranslation} extra={tasksExtra()}>
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{
           pageSize: pageLimit,
@@ -356,8 +355,8 @@ function TaskListComponent({
           showQuickJumper: true
         }}
         columns={columns}
-        mobileColumnKeys={["title", "due_date", "priority", "toggleCompleted"]}
         rowKey="id"
+        scroll={{ x: true }}
         dataSource={tasks}
         onChange={handleTableChange}
         expandable={{
diff --git a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
index 31677fcba..6db04d3be 100644
--- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
+++ b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
@@ -57,23 +57,21 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
             }
           ]}
         >
-          <Select
-            options={
-              emps &&
-              emps.rates.map((item) => ({
-                value: item.cost_center,
-                label:
-                  item.cost_center === "timetickets.labels.shift"
+          <Select>
+            {emps &&
+              emps.rates.map((item) => (
+                <Select.Option key={item.cost_center} value={item.cost_center}>
+                  {item.cost_center === "timetickets.labels.shift"
                     ? t(item.cost_center)
                     : bodyshop.cdk_dealerid ||
                         bodyshop.pbs_serialnumber ||
                         bodyshop.rr_dealerid ||
                         Enhanced_Payroll.treatment === "on"
                       ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
-                      : item.cost_center
-              }))
-            }
-          />
+                      : item.cost_center}
+                </Select.Option>
+              ))}
+          </Select>
         </Form.Item>
       </LayoutFormRow>
       <Divider />
diff --git a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
index 9742f4120..2baea1cdf 100644
--- a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
+++ b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
@@ -201,22 +201,22 @@ export function TechClockOffButton({
                 }
               ]}
             >
-              <Select disabled={isShiftTicket}
-                options={
-                  isShiftTicket
-                    ? [{ value: "timetickets.labels.shift", label: t("timetickets.labels.shift") }]
-                    : emps &&
-                      emps.rates.map((item) => ({
-                        value: item.cost_center,
-                        label:
-                          item.cost_center === "timetickets.labels.shift"
-                            ? t(item.cost_center)
-                            : hasDmsKey
-                              ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
-                              : item.cost_center
-                      }))
-                }
-              />
+              <Select disabled={isShiftTicket}>
+                {isShiftTicket ? (
+                  <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
+                ) : (
+                  emps &&
+                  emps.rates.map((item) => (
+                    <Select.Option key={item.cost_center}>
+                      {item.cost_center === "timetickets.labels.shift"
+                        ? t(item.cost_center)
+                        : hasDmsKey
+                          ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
+                          : item.cost_center}
+                    </Select.Option>
+                  ))
+                )}
+              </Select>
             </Form.Item>
 
             {isShiftTicket ? (
@@ -232,12 +232,11 @@ export function TechClockOffButton({
                   }
                 ]}
               >
-                <Select
-                  options={bodyshop.md_ro_statuses.production_statuses.map((item) => ({
-                    value: item,
-                    label: item
-                  }))}
-                />
+                <Select>
+                  {bodyshop.md_ro_statuses.production_statuses.map((item) => (
+                    <Select.Option key={item}></Select.Option>
+                  ))}
+                </Select>
               </Form.Item>
             )}
 
diff --git a/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx b/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
index f6414ac28..ab5f73bed 100644
--- a/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
+++ b/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
@@ -1,6 +1,6 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Input, Space } from "antd";
+import { Button, Card, Input, Space, Table } from "antd";
 import queryString from "query-string";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -13,7 +13,6 @@ import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -171,11 +170,10 @@ export function TechLookupJobsList({ bodyshop }) {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={false}
         columns={columns}
-        mobileColumnKeys={["ro_number", "owner", "status", "vehicle"]}
         rowKey="id"
         dataSource={jobs}
         scroll={{ x: true }}
diff --git a/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx b/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx
index c594f164e..9d08e463b 100644
--- a/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx
@@ -1,6 +1,5 @@
 import { useQuery } from "@apollo/client/react";
-import { Button, Form, InputNumber, Modal, Radio, Select, Space, Typography } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Form, InputNumber, Modal, Radio, Select, Space, Table, Typography } from "antd";
 import Dinero from "dinero.js";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -99,18 +98,7 @@ export function TimeTicketListTeamPay({ bodyshop, context }) {
             <Form.Item name="percent">
               <Space.Compact>
                 <InputNumber min={0} max={100} precision={1} />
-                <span
-                  style={{
-                    padding: "0 11px",
-                    backgroundColor: "#fafafa",
-                    border: "1px solid #d9d9d9",
-                    borderLeft: 0,
-                    display: "flex",
-                    alignItems: "center"
-                  }}
-                >
-                  %
-                </span>
+                <span style={{ padding: "0 11px", backgroundColor: "#fafafa", border: "1px solid #d9d9d9", borderLeft: 0, display: "flex", alignItems: "center" }}>%</span>
               </Space.Compact>
             </Form.Item>
           </LayoutFormRow>
@@ -146,7 +134,7 @@ export function TimeTicketListTeamPay({ bodyshop, context }) {
               }
 
               return (
-                <ResponsiveTable
+                <Table
                   dataSource={data}
                   rowKey={"employeeid"}
                   title={() => (
@@ -194,7 +182,6 @@ export function TimeTicketListTeamPay({ bodyshop, context }) {
                       key: "pay"
                     }
                   ]}
-                  mobileColumnKeys={["employee", "cost_center", "productivehrs", "pay"]}
                 />
               );
             }}
diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
index 5c4fda4eb..43c222eee 100644
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -1,7 +1,6 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
-import { Button, Card, Checkbox, Space } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Checkbox, Space, Table } from "antd";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -328,10 +327,9 @@ export function TimeTicketList({
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         columns={columns}
-        mobileColumnKeys={["ro_number", "date", "actions", "committed_at"]}
         rowKey="id"
         scroll={{
           x: true
@@ -342,23 +340,23 @@ export function TimeTicketList({
           if (Enhanced_Payroll.treatment === "on") return null;
           if (Enhanced_Payroll.treatment === "off")
             return (
-              <ResponsiveTable.Summary.Row>
-                <ResponsiveTable.Summary.Cell>{t("general.labels.totals")}</ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell />
-                <ResponsiveTable.Summary.Cell />
-                <ResponsiveTable.Summary.Cell>{totals.productivehrs.toFixed(1)}</ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell>{totals.actualhrs.toFixed(1)}</ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell>
+              <Table.Summary.Row>
+                <Table.Summary.Cell>{t("general.labels.totals")}</Table.Summary.Cell>
+                <Table.Summary.Cell />
+                <Table.Summary.Cell />
+                <Table.Summary.Cell>{totals.productivehrs.toFixed(1)}</Table.Summary.Cell>
+                <Table.Summary.Cell>{totals.actualhrs.toFixed(1)}</Table.Summary.Cell>
+                <Table.Summary.Cell>
                   {totals.actualhrs === 0 || !totals.actualhrs
                     ? "∞"
                     : `${((totals.productivehrs / totals.actualhrs) * 100).toFixed(
                         2
                       )}% ${t("timetickets.labels.efficiency")}`}
-                </ResponsiveTable.Summary.Cell>
-                <ResponsiveTable.Summary.Cell />
-                <ResponsiveTable.Summary.Cell />
-                <ResponsiveTable.Summary.Cell />
-              </ResponsiveTable.Summary.Row>
+                </Table.Summary.Cell>
+                <Table.Summary.Cell />
+                <Table.Summary.Cell />
+                <Table.Summary.Cell />
+              </Table.Summary.Row>
             );
         }}
         locale={{
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index 7d6daed41..35926e16c 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -21,7 +21,6 @@ import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
 import JobEmployeeAssignmentsContainer from "./../job-employee-assignments/job-employee-assignments.container";
-import { PayrollLaborAllocationsTable } from "../labor-allocations-table/labor-allocations-table.payroll.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -50,7 +49,7 @@ export function TimeTicketModalComponent({
     splitKey: bodyshop.imexshopid
   });
 
-  const [loadLineTicketData, { loading, data: lineTicketData, refetch }] = useLazyQuery(GET_LINE_TICKET_BY_PK, {
+  const [loadLineTicketData, { loading, data: lineTicketData }] = useLazyQuery(GET_LINE_TICKET_BY_PK, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
@@ -92,22 +91,21 @@ export function TimeTicketModalComponent({
       value={value === "timetickets.labels.shift" ? t(value) : value}
       {...props}
       disabled={value === "timetickets.labels.shift" || disabled}
-      options={
-        emps &&
-        emps.rates.map((item) => ({
-          value: item.cost_center,
-          label:
-            item.cost_center === "timetickets.labels.shift"
+    >
+      {emps &&
+        emps.rates.map((item) => (
+          <Select.Option key={item.cost_center} value={item.cost_center}>
+            {item.cost_center === "timetickets.labels.shift"
               ? t(item.cost_center)
               : bodyshop.cdk_dealerid ||
                   bodyshop.pbs_serialnumber ||
                   bodyshop.rr_dealerid ||
                   Enhanced_Payroll.treatment === "on"
                 ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
-                : item.cost_center
-        }))
-      }
-    />
+                : item.cost_center}
+          </Select.Option>
+        ))}
+    </Select>
   );
 
   const MemoInput = ({ value, ...props }) => (
@@ -322,34 +320,13 @@ export function TimeTicketModalComponent({
         </Form.Item>
       </LayoutFormRow>
 
-      <LaborAllocationContainer
-        jobid={watchedJobId || null}
-        loading={loading}
-        lineTicketData={lineTicketData}
-        bodyshop={bodyshop}
-        refetch={refetch}
-      />
+      <LaborAllocationContainer jobid={watchedJobId || null} loading={loading} lineTicketData={lineTicketData} />
     </div>
   );
 }
 
-export function LaborAllocationContainer({
-  jobid,
-  loading,
-  lineTicketData,
-  hideTimeTickets = false,
-  bodyshop,
-  refetch
-}) {
+export function LaborAllocationContainer({ jobid, loading, lineTicketData, hideTimeTickets = false }) {
   const { t } = useTranslation();
-  const {
-    treatments: { Enhanced_Payroll }
-  } = useTreatmentsWithConfig({
-    attributes: {},
-    names: ["Enhanced_Payroll"],
-    splitKey: bodyshop.imexshopid
-  });
-
   if (loading) return <LoadingSkeleton />;
   if (!lineTicketData) return null;
   if (!jobid) return null;
@@ -360,23 +337,12 @@ export function LaborAllocationContainer({
         <JobEmployeeAssignmentsContainer job={lineTicketData.jobs_by_pk} />
       </Card>
 
-      {Enhanced_Payroll.treatment === "on" ? (
-        <PayrollLaborAllocationsTable
-          jobId={jobid}
-          joblines={lineTicketData.joblines}
-          timetickets={lineTicketData.timetickets}
-          adjustments={lineTicketData.jobs_by_pk.lbr_adjustments}
-          refetch={refetch}
-          bodyshop={bodyshop}
-        />
-      ) : (
-        <LaborAllocationsTable
-          jobId={jobid}
-          joblines={lineTicketData.joblines}
-          timetickets={lineTicketData.timetickets}
-          adjustments={lineTicketData.jobs_by_pk.lbr_adjustments}
-        />
-      )}
+      <LaborAllocationsTable
+        jobId={jobid}
+        joblines={lineTicketData.joblines}
+        timetickets={lineTicketData.timetickets}
+        adjustments={lineTicketData.jobs_by_pk.lbr_adjustments}
+      />
 
       {!hideTimeTickets && (
         <TimeTicketList loading={loading} timetickets={jobid ? lineTicketData.timetickets : []} techConsole />
diff --git a/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx
index 0569fc595..2cff01a05 100644
--- a/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx
+++ b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx
@@ -20,15 +20,13 @@ export function TimeTicketShiftFormComponent() {
           }
         ]}
       >
-        <Select
-          options={[
-            { value: "timetickets.labels.amshift", label: t("timetickets.labels.amshift") },
-            { value: "timetickets.labels.ambreak", label: t("timetickets.labels.ambreak") },
-            { value: "timetickets.labels.lunch", label: t("timetickets.labels.lunch") },
-            { value: "timetickets.labels.pmshift", label: t("timetickets.labels.pmshift") },
-            { value: "timetickets.labels.pmbreak", label: t("timetickets.labels.pmbreak") }
-          ]}
-        />
+        <Select>
+          <Select.Option value="timetickets.labels.amshift">{t("timetickets.labels.amshift")}</Select.Option>
+          <Select.Option value="timetickets.labels.ambreak">{t("timetickets.labels.ambreak")}</Select.Option>
+          <Select.Option value="timetickets.labels.lunch">{t("timetickets.labels.lunch")}</Select.Option>
+          <Select.Option value="timetickets.labels.pmshift">{t("timetickets.labels.pmshift")}</Select.Option>
+          <Select.Option value="timetickets.labels.pmbreak">{t("timetickets.labels.pmbreak")}</Select.Option>
+        </Select>
       </Form.Item>
     </div>
   );
diff --git a/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx b/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx
index b876cc958..0cef49897 100644
--- a/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx
+++ b/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx
@@ -1,5 +1,4 @@
-import { Card, Col, Row } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Card, Col, Row, Table } from "antd";
 import _ from "lodash";
 import dayjs from "../../utils/day";
 import { useMemo, useState } from "react";
@@ -214,13 +213,12 @@ const JobRelatedTicketsTable = ({ loading, jobTickets, startDate, endDate }) =>
 
   return (
     <Card title={t("timetickets.labels.jobhours")}>
-      <ResponsiveTable
+      <Table
         loading={loading}
         scroll={{
           x: true // y: "50rem"
         }}
         columns={columns}
-        mobileColumnKeys={["total", "actions", "empname", "actHrs"]}
         rowKey="id"
         dataSource={data}
         onChange={handleTableChange}
@@ -290,13 +288,12 @@ const ShiftRelatedTicketsTable = ({ loading, shiftTickets, startDate, endDate })
 
   return (
     <Card title={t("timetickets.labels.clockhours")}>
-      <ResponsiveTable
+      <Table
         loading={loading}
         scroll={{
           x: true // y: "50rem"
         }}
         columns={columns}
-        mobileColumnKeys={["total", "actions", "empname", "actHrs"]}
         rowKey="id"
         dataSource={data}
         onChange={handleTableChange}
diff --git a/client/src/components/tt-approvals-list/tt-approvals-list.component.jsx b/client/src/components/tt-approvals-list/tt-approvals-list.component.jsx
index e1b591414..13f900bb8 100644
--- a/client/src/components/tt-approvals-list/tt-approvals-list.component.jsx
+++ b/client/src/components/tt-approvals-list/tt-approvals-list.component.jsx
@@ -1,6 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Space, Tag } from "antd";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
+import { Button, Card, Space, Table, Tag } from "antd";
 import Dinero from "dinero.js";
 import queryString from "query-string";
 import { useState } from "react";
@@ -181,10 +180,9 @@ export function TtApprovalsListComponent({
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         columns={columns}
-        mobileColumnKeys={["ro_number", "date", "employeeid", "cost_center"]}
         rowKey="id"
         scroll={{
           x: true
diff --git a/client/src/components/vehicle-detail-jobs/vehicle-detail-jobs.component.jsx b/client/src/components/vehicle-detail-jobs/vehicle-detail-jobs.component.jsx
index 15cb9f09b..b3cb1c5c7 100644
--- a/client/src/components/vehicle-detail-jobs/vehicle-detail-jobs.component.jsx
+++ b/client/src/components/vehicle-detail-jobs/vehicle-detail-jobs.component.jsx
@@ -1,4 +1,4 @@
-import { Card } from "antd";
+import { Card, Table } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -12,7 +12,6 @@ import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-displa
 import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
 import { selectIsPartsEntry } from "../../redux/application/application.selectors";
 import getPartsBasePath from "../../utils/getPartsBasePath.js";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -108,9 +107,8 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop, isPartsEntry })
         />
       }
     >
-      <ResponsiveTable
+      <Table
         columns={columns}
-        mobileColumnKeys={["ro_number", "owner", "status", "actual_completion"]}
         rowKey="id"
         scroll={{ x: true }}
         dataSource={vehicle.jobs}
diff --git a/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx b/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx
index c49b94f2f..b11851588 100644
--- a/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx
+++ b/client/src/components/vehicle-search-select/vehicle-search-select.component.jsx
@@ -9,6 +9,8 @@ import {
 } from "../../graphql/vehicles.queries";
 import AlertComponent from "../alert/alert.component";
 
+const { Option } = Select;
+
 const VehicleSearchSelect = ({ value, onChange, onBlur, disabled, ref }) => {
   const [callSearch, { loading, error, data }] = useLazyQuery(SEARCH_VEHICLES_FOR_AUTOCOMPLETE);
 
@@ -71,12 +73,15 @@ const VehicleSearchSelect = ({ value, onChange, onBlur, disabled, ref }) => {
         onSelect={handleSelect}
         notFoundContent={loading ? <LoadingOutlined /> : <Empty />}
         onBlur={onBlur}
-        options={theOptions?.map((o) => ({
-          key: o.id,
-          value: o.id,
-          label: `${o.v_vin || ""} ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${o.v_model_desc || ""} `
-        }))}
-      />
+      >
+        {theOptions
+          ? theOptions.map((o) => (
+              <Option key={o.id} value={o.id}>
+                {`${o.v_vin || ""} ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${o.v_model_desc || ""} `}
+              </Option>
+            ))
+          : null}
+      </Select>
       {idLoading || loading ? <LoadingOutlined /> : null}
       {error ? <AlertComponent title={error.message} type="error" /> : null}
       {idError ? <AlertComponent title={idError.message} type="error" /> : null}
diff --git a/client/src/components/vehicles-list/vehicles-list.component.jsx b/client/src/components/vehicles-list/vehicles-list.component.jsx
index 41cc1d764..d901cfb13 100644
--- a/client/src/components/vehicles-list/vehicles-list.component.jsx
+++ b/client/src/components/vehicles-list/vehicles-list.component.jsx
@@ -1,5 +1,5 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space, Typography } from "antd";
+import { Button, Card, Input, Space, Table, Typography } from "antd";
 import queryString from "query-string";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -7,7 +7,6 @@ import { Link, useLocation, useNavigate } from "react-router-dom";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import { pageLimit } from "../../utils/config";
 import { alphaSort } from "../../utils/sorters";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 export default function VehiclesListComponent({ loading, vehicles, total, refetch, basePath = "/manage" }) {
   const search = queryString.parse(useLocation().search);
@@ -104,11 +103,10 @@ export default function VehiclesListComponent({ loading, vehicles, total, refetc
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ placement: "top", pageSize: pageLimit, current: parseInt(page || 1), total: total }}
         columns={columns}
-        mobileColumnKeys={["v_vin", "description", "plate_no"]}
         rowKey="id"
         scroll={{ x: true }}
         dataSource={vehicles}
diff --git a/client/src/components/vendor-search-select/vendor-search-select.component.jsx b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
index ac4baa509..a8c0d5a24 100644
--- a/client/src/components/vendor-search-select/vendor-search-select.component.jsx
+++ b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
@@ -3,81 +3,28 @@ import { Select, Space, Tag } from "antd";
 import { useEffect, useState } from "react";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 
+const { Option } = Select;
+
 // To be used as a form element only.
 
 const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, preferredMake, showPhone, ref }) => {
   const [option, setOption] = useState(value);
 
-  // Sync internal state when value prop changes (e.g., from form.setFieldsValue)
   useEffect(() => {
-    if (value !== option) {
-      setOption(value);
+    if (value !== option && onChange) {
+      onChange(option);
     }
-  }, [value, option]);
-
-  const handleChange = (newValue) => {
-    setOption(newValue);
-    if (onChange) {
-      onChange(newValue);
-    }
-  };
+  }, [value, option, onChange]);
 
   const favorites =
     preferredMake && options
       ? options.filter((o) => o.favorite.filter((f) => f.toLowerCase() === preferredMake.toLowerCase()).length > 0)
       : [];
 
-  const formatOption = (o, isFavorite = false) => ({
-    key: isFavorite ? `favorite-${o.id}` : o.id,
-    value: o.id,
-    name: o.name,
-    discount: o.discount,
-    label: (
-      <div
-        style={{
-          display: "flex",
-          alignItems: "center",
-          flexWrap: "nowrap",
-          width: "100%"
-        }}
-      >
-        <div
-          style={{
-            flex: 1,
-            minWidth: 0,
-            overflow: "hidden",
-            textOverflow: "ellipsis",
-            whiteSpace: "nowrap"
-          }}
-        >
-          {o.name}
-        </div>
-        <Space style={{ marginLeft: "1rem" }}>
-          {isFavorite && <HeartOutlined style={{ color: "red" }} />}
-          {!isFavorite &&
-            o.tags?.map((tag, idx) => (
-              <Tag key={idx} style={{ marginLeft: "0.5rem" }}>
-                {tag}
-              </Tag>
-            ))}
-          {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
-          {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
-        </Space>
-      </div>
-    )
-  });
-
-  const allOptions = [
-    ...(favorites?.map((o) => formatOption(o, true)) || []),
-    ...(options?.map((o) => formatOption(o, false)) || [])
-  ];
-
   return (
     <Select
       ref={ref}
-      showSearch={{
-        optionFilterProp: "name"
-      }}
+      showSearch
       value={option}
       style={{
         width: "100%"
@@ -111,12 +58,77 @@ const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, pref
         );
       }}
       popupMatchSelectWidth={false}
-      onChange={handleChange}
+      onChange={setOption}
+      optionFilterProp="name"
       onSelect={onSelect}
       disabled={disabled || false}
       optionLabelProp="name"
-      options={allOptions}
-    />
+    >
+      {favorites &&
+        favorites.map((o) => (
+          <Option key={`favorite-${o.id}`} value={o.id} name={o.name} discount={o.discount}>
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                flexWrap: "nowrap",
+                width: "100%"
+              }}
+            >
+              <div
+                style={{
+                  flex: 1,
+                  minWidth: 0,
+                  overflow: "hidden",
+                  textOverflow: "ellipsis",
+                  whiteSpace: "nowrap"
+                }}
+              >
+                {o.name}
+              </div>
+              <Space style={{ marginLeft: "1rem" }}>
+                <HeartOutlined style={{ color: "red" }} />
+                {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
+                {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
+              </Space>
+            </div>
+          </Option>
+        ))}
+      {options &&
+        options.map((o) => (
+          <Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                flexWrap: "nowrap",
+                width: "100%"
+              }}
+            >
+              <div
+                style={{
+                  flex: 1,
+                  minWidth: 0,
+                  overflow: "hidden",
+                  textOverflow: "ellipsis",
+                  whiteSpace: "nowrap"
+                }}
+              >
+                {o.name}
+              </div>
+              <Space style={{ marginLeft: "1rem" }}>
+                {o.tags?.map((tag, idx) => (
+                  <Tag key={idx} style={{ marginLeft: "0.5rem" }}>
+                    {tag}
+                  </Tag>
+                ))}
+                {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
+                {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
+              </Space>
+            </div>
+          </Option>
+        ))}
+    </Select>
   );
 };
 export default VendorSearchSelect;
diff --git a/client/src/components/vendors-list/vendors-list.component.jsx b/client/src/components/vendors-list/vendors-list.component.jsx
index 0c46fadf9..64eba3d6a 100644
--- a/client/src/components/vendors-list/vendors-list.component.jsx
+++ b/client/src/components/vendors-list/vendors-list.component.jsx
@@ -1,11 +1,10 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Input, Space, Tag } from "antd";
+import { Button, Card, Input, Space, Table, Tag } from "antd";
 import queryString from "query-string";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation } from "react-router-dom";
 import { alphaSort } from "../../utils/sorters";
-import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 export default function VendorsListComponent({ handleNewVendor, loading, handleOnRowClick, vendors, refetch }) {
   const search = queryString.parse(useLocation().search);
@@ -86,11 +85,10 @@ export default function VendorsListComponent({ handleNewVendor, loading, handleO
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{ placement: "top" }}
         columns={columns}
-        mobileColumnKeys={["name", "phone", "city"]}
         rowKey="id"
         onChange={handleTableChange}
         dataSource={filteredVendors}
diff --git a/client/src/contexts/SocketIO/socketProvider.jsx b/client/src/contexts/SocketIO/socketProvider.jsx
index 3539908b8..75b80d62f 100644
--- a/client/src/contexts/SocketIO/socketProvider.jsx
+++ b/client/src/contexts/SocketIO/socketProvider.jsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import SocketIO from "socket.io-client";
 import { auth } from "../../firebase/firebase.utils";
 import { store } from "../../redux/store";
@@ -18,7 +18,6 @@ import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import { INITIAL_NOTIFICATIONS, SocketContext } from "./useSocket.js";
 
 const LIMIT = INITIAL_NOTIFICATIONS;
-const TOKEN_SYNC_INTERVAL_MS = 10 * 60 * 1000;
 
 /**
  * Socket Provider - Scenario Notifications / Web Socket related items
@@ -31,7 +30,6 @@ const TOKEN_SYNC_INTERVAL_MS = 10 * 60 * 1000;
  */
 const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
   const socketRef = useRef(null);
-  const tokenSyncIntervalRef = useRef(null);
   const [clientId, setClientId] = useState(null);
   const [isConnected, setIsConnected] = useState(false);
   const notification = useNotification();
@@ -149,30 +147,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
     onError: (err) => console.error("MARK_ALL_NOTIFICATIONS_READ error:", err)
   });
 
-  const reconnectSocket = useCallback(
-    async ({ forceRefreshToken = true } = {}) => {
-      const socketInstance = socketRef.current;
-      if (!socketInstance || !auth.currentUser || !bodyshop?.id) return false;
-
-      try {
-        const token = await auth.currentUser.getIdToken(forceRefreshToken);
-        socketInstance.auth = { token, bodyshopId: bodyshop.id };
-
-        if (socketInstance.connected) {
-          socketInstance.emit("update-token", { token, bodyshopId: bodyshop.id });
-        }
-
-        socketInstance.disconnect();
-        socketInstance.connect();
-        return true;
-      } catch (error) {
-        console.error("Socket reconnect failed:", error?.message || error);
-        return false;
-      }
-    },
-    [bodyshop?.id]
-  );
-
   useEffect(() => {
     const initializeSocket = async (token) => {
       if (!bodyshop?.id || socketRef.current) return;
@@ -280,60 +254,25 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
         }
       };
 
-      const syncCurrentTokenToSocket = async () => {
-        try {
-          if (!auth.currentUser || !bodyshop?.id) return;
-          const token = await auth.currentUser.getIdToken();
-          socketInstance.auth = { token, bodyshopId: bodyshop.id };
-          socketInstance.emit("update-token", { token, bodyshopId: bodyshop.id });
-        } catch (error) {
-          console.error("Failed to sync token to socket:", error?.message || error);
-        }
-      };
-
-      const forceRefreshAndSyncToken = async () => {
-        try {
-          if (!auth.currentUser || !bodyshop?.id) return;
-          const token = await auth.currentUser.getIdToken(true);
-          socketInstance.auth = { token, bodyshopId: bodyshop.id };
-          socketInstance.emit("update-token", { token, bodyshopId: bodyshop.id });
-        } catch (error) {
-          console.error("Failed to force-refresh token for socket:", error?.message || error);
-        }
-      };
-
       const handleConnect = () => {
         socketInstance.emit("join-bodyshop-room", bodyshop.id);
-        syncCurrentTokenToSocket();
         setClientId(socketInstance.id);
         setIsConnected(true);
         store.dispatch(setWssStatus("connected"));
       };
 
       const handleReconnect = () => {
-        forceRefreshAndSyncToken();
         setIsConnected(true);
         store.dispatch(setWssStatus("connected"));
       };
 
-      const handleTokenUpdated = ({ success, error }) => {
-        if (success) return;
-        const err = String(error || "");
-        if (/stale token|id-token-expired/i.test(err)) {
-          forceRefreshAndSyncToken();
-        }
-      };
-
       const handleConnectionError = (err) => {
         console.error("Socket connection error:", err);
         setIsConnected(false);
-        if (err?.message?.includes("auth/id-token-expired")) {
+        if (err.message.includes("auth/id-token-expired")) {
           console.warn("Token expired, refreshing...");
           auth.currentUser?.getIdToken(true).then((newToken) => {
-            socketInstance.auth = { token: newToken, bodyshopId: bodyshop.id };
-            if (socketInstance.connected) {
-              socketInstance.emit("update-token", { token: newToken, bodyshopId: bodyshop.id });
-            }
+            socketInstance.auth = { token: newToken };
             socketInstance.connect();
           });
         } else {
@@ -574,23 +513,10 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
       socketInstance.on("notification", handleNotification);
       socketInstance.on("sync-notification-read", handleSyncNotificationRead);
       socketInstance.on("sync-all-notifications-read", handleSyncAllNotificationsRead);
-      socketInstance.on("token-updated", handleTokenUpdated);
-
-      if (tokenSyncIntervalRef.current) {
-        clearInterval(tokenSyncIntervalRef.current);
-      }
-      tokenSyncIntervalRef.current = setInterval(() => {
-        if (!socketInstance.connected) return;
-        syncCurrentTokenToSocket();
-      }, TOKEN_SYNC_INTERVAL_MS);
     };
 
     const unsubscribe = auth.onIdTokenChanged(async (user) => {
       if (!user) {
-        if (tokenSyncIntervalRef.current) {
-          clearInterval(tokenSyncIntervalRef.current);
-          tokenSyncIntervalRef.current = null;
-        }
         socketRef.current?.disconnect();
         socketRef.current = null;
         setIsConnected(false);
@@ -599,10 +525,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
 
       const token = await user.getIdToken();
       if (socketRef.current) {
-        socketRef.current.auth = { token, bodyshopId: bodyshop.id };
-        if (socketRef.current.connected) {
-          socketRef.current.emit("update-token", { token, bodyshopId: bodyshop.id });
-        }
+        socketRef.current.emit("update-token", { token, bodyshopId: bodyshop.id });
       } else {
         initializeSocket(token).catch((err) =>
           console.error("Something went wrong Initializing Sockets:", err?.message || "")
@@ -612,10 +535,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
 
     return () => {
       unsubscribe();
-      if (tokenSyncIntervalRef.current) {
-        clearInterval(tokenSyncIntervalRef.current);
-        tokenSyncIntervalRef.current = null;
-      }
       if (socketRef.current) {
         socketRef.current.disconnect();
         socketRef.current = null;
@@ -630,7 +549,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
         socket: socketRef.current,
         clientId,
         isConnected,
-        reconnectSocket,
         markNotificationRead,
         markAllNotificationsRead,
         scenarioNotificationsOn: Realtime_Notifications_UI?.treatment === "on"
diff --git a/client/src/graphql/bills.queries.js b/client/src/graphql/bills.queries.js
index f7cad4209..03be22e61 100644
--- a/client/src/graphql/bills.queries.js
+++ b/client/src/graphql/bills.queries.js
@@ -185,7 +185,6 @@ export const QUERY_BILL_BY_PK = gql`
           id
         }
         jobline {
-          alt_partno
           oem_partno
           part_type
         }
diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx
index de6b143be..383f1df1c 100644
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -1,5 +1,5 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
-import { Button, Card, Checkbox, Input, Space, Typography } from "antd";
+import { Button, Card, Checkbox, Input, Space, Table, Typography } from "antd";
 import { useQuery } from "@apollo/client/react";
 import axios from "axios";
 import queryString from "query-string";
@@ -18,7 +18,6 @@ import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import ResponsiveTable from "../../components/responsive-table/responsive-table.component";
 
 const mapDispatchToProps = (dispatch) => ({
   setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" }))
@@ -230,7 +229,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
     >
       <PartsOrderModalContainer />
 
-      <ResponsiveTable
+      <Table
         loading={loading || searchLoading}
         // scroll={{
         //   x: "50%", // y: "40rem"
@@ -250,7 +249,6 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
               }
         }
         columns={columns}
-        mobileColumnKeys={["vendorname", "invoice_number", "ro_number", "total", "actions"]}
         rowKey="id"
         dataSource={search?.search ? openSearchResults : data}
         onChange={handleTableChange}
diff --git a/client/src/pages/dms-payables/dms-payables.container.jsx b/client/src/pages/dms-payables/dms-payables.container.jsx
index 113d4b584..d49b0bf05 100644
--- a/client/src/pages/dms-payables/dms-payables.container.jsx
+++ b/client/src/pages/dms-payables/dms-payables.container.jsx
@@ -119,13 +119,12 @@ export function DmsContainer({ setBreadcrumbs, setSelectedHeader }) {
                     setLogLevel(value);
                     socket.emit("set-log-level", value);
                   }}
-                  options={[
-                    { key: "DEBUG", value: "DEBUG", label: "DEBUG" },
-                    { key: "INFO", value: "INFO", label: "INFO" },
-                    { key: "WARN", value: "WARN", label: "WARN" },
-                    { key: "ERROR", value: "ERROR", label: "ERROR" }
-                  ]}
-                />
+                >
+                  <Select.Option key="DEBUG">DEBUG</Select.Option>
+                  <Select.Option key="INFO">INFO</Select.Option>
+                  <Select.Option key="WARN">WARN</Select.Option>
+                  <Select.Option key="ERROR">ERROR</Select.Option>
+                </Select>
                 <Button onClick={() => setLogs([])}>Clear Logs</Button>
                 <Button
                   onClick={() => {
diff --git a/client/src/pages/dms/dms.container.jsx b/client/src/pages/dms/dms.container.jsx
index d3a1e374d..22d79a0bb 100644
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -11,7 +11,7 @@ import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import { insertAuditTrail, setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
@@ -29,8 +29,7 @@ import DmsAllocationsSummary from "../../components/dms-allocations-summary/dms-
 import RrAllocationsSummary from "../../components/dms-allocations-summary/rr-dms-allocations-summary.component";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-  currentUser: selectCurrentUser
+  bodyshop: selectBodyshop
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -66,41 +65,7 @@ const DMS_SOCKET_EVENTS = {
   }
 };
 
-const stripRrXmlFromPayload = (input) => {
-  if (input == null || typeof input !== "object") return input;
-
-  let target = null;
-  try {
-    target = JSON.parse(JSON.stringify(input));
-  } catch {
-    // Fallback to in-place scrub if cloning fails.
-    target = input;
-  }
-
-  const scrub = (node) => {
-    if (node == null || typeof node !== "object") return;
-    if (Array.isArray(node)) {
-      node.forEach(scrub);
-      return;
-    }
-
-    delete node.requestXml;
-    delete node.responseXml;
-
-    if (node.xml && typeof node.xml === "object") {
-      delete node.xml.request;
-      delete node.xml.response;
-      if (Object.keys(node.xml).length === 0) delete node.xml;
-    }
-
-    Object.values(node).forEach(scrub);
-  };
-
-  scrub(target);
-  return target;
-};
-
-export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
+export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
   const {
     treatments: { Fortellis }
   } = useTreatmentsWithConfig({
@@ -112,16 +77,6 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
   const { t } = useTranslation();
   const [resetAfterReconnect, setResetAfterReconnect] = useState(false);
   const [allocationsSummary, setAllocationsSummary] = useState(null);
-  const [reconnectNonce, setReconnectNonce] = useState(0);
-
-  const isDevEnv = import.meta.env.DEV;
-  const isProdEnv = import.meta.env.PROD;
-  const userEmail = (currentUser?.email || "").toLowerCase();
-
-  const devEmails = ["imex.dev", "rome.dev"];
-  const prodEmails = ["imex.prod", "rome.prod", "imex.test", "rome.test"];
-  const hasValidEmail = (emails) => emails.some((email) => userEmail.endsWith(email));
-  const canViewSensitiveRrXml = (isDevEnv && hasValidEmail(devEmails)) || (isProdEnv && hasValidEmail(prodEmails));
 
   // Compute a single normalized mode and pick the proper socket
   const mode = getDmsMode(bodyshop, Fortellis.treatment); // "rr" | "fortellis" | "cdk" | "pbs" | "none"
@@ -159,7 +114,7 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
 
   const notification = useNotification();
 
-  const { socket: wsssocket, reconnectSocket } = useSocket();
+  const { socket: wsssocket } = useSocket();
   const activeSocket = useMemo(() => (isWssMode(mode) ? wsssocket : legacySocket), [mode, wsssocket]);
 
   const [isConnected, setIsConnected] = useState(!!activeSocket?.connected);
@@ -208,44 +163,21 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
   const providerLabel = useMemo(
     () =>
       ({
-        [DMS_MAP.reynolds]: t("dms.labels.provider_reynolds"),
-        [DMS_MAP.fortellis]: t("dms.labels.provider_fortellis"),
-        [DMS_MAP.cdk]: t("dms.labels.provider_cdk"),
-        [DMS_MAP.pbs]: t("dms.labels.provider_pbs")
-      })[mode] || t("dms.labels.provider_dms"),
-    [mode, t]
+        [DMS_MAP.reynolds]: "Reynolds",
+        [DMS_MAP.fortellis]: "Fortellis",
+        [DMS_MAP.cdk]: "CDK",
+        [DMS_MAP.pbs]: "PBS"
+      })[mode] || "DMS",
+    [mode]
   );
 
-  const transportLabel = isWssMode(mode) ? t("dms.labels.transport_wss") : t("dms.labels.transport_ws");
+  const transportLabel = isWssMode(mode) ? "(WSS)" : "(WS)";
 
-  const bannerMessage = t("dms.labels.banner_message", {
-    provider: providerLabel,
-    transport: transportLabel,
-    status: isConnected ? t("dms.labels.banner_status_connected") : t("dms.labels.banner_status_disconnected")
-  });
+  const bannerMessage = `Posting to ${providerLabel} | ${transportLabel} | ${
+    isConnected ? "Connected" : "Disconnected"
+  }`;
 
   const resetKey = useMemo(() => `${mode || "none"}-${jobId || "none"}`, [mode, jobId]);
-  const customerSelectorKey = useMemo(() => `${resetKey}-${reconnectNonce}`, [resetKey, reconnectNonce]);
-
-  const handleReconnectClick = async () => {
-    setResetAfterReconnect(true);
-    setReconnectNonce((n) => n + 1);
-
-    if (!activeSocket) return;
-
-    if (isWssMode(mode)) {
-      setActiveLogLevel(logLevel);
-      const didReconnect = await reconnectSocket?.({ forceRefreshToken: true });
-      if (!didReconnect) {
-        activeSocket.disconnect();
-        setTimeout(() => activeSocket.connect(), 100);
-      }
-      return;
-    }
-
-    activeSocket.disconnect();
-    setTimeout(() => activeSocket.connect(), 100);
-  };
 
   // 🔄 Hard reset of local + server-side DMS context when the page/job loads
   useEffect(() => {
@@ -285,7 +217,6 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
   }, [jobId, mode, activeSocket]);
 
   const handleExportFailed = (payload = {}) => {
-    const safePayload = canViewSensitiveRrXml ? payload : stripRrXmlFromPayload(payload);
     const { title, friendlyMessage, error: errText, severity, errorCode, vendorStatusCode } = payload;
 
     const msg =
@@ -293,7 +224,7 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
       errText ||
       t("dms.errors.exportfailedgeneric", "We couldn't complete the export. Please try again.");
 
-    const vendorTitle = title || (isRrMode ? t("dms.labels.provider_reynolds") : t("dms.labels.provider_dms"));
+    const vendorTitle = title || (isRrMode ? "Reynolds" : "DMS");
 
     const isRrOpenRoLimit =
       isRrMode &&
@@ -316,7 +247,7 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
         timestamp: new Date(),
         level: (sev || "error").toUpperCase(),
         message: `${vendorTitle}: ${msg}`,
-        meta: { errorCode, vendorStatusCode, raw: safePayload, blockedByOpenRoLimit: !!isRrOpenRoLimit }
+        meta: { errorCode, vendorStatusCode, raw: payload, blockedByOpenRoLimit: !!isRrOpenRoLimit }
       }
     ]);
   };
@@ -368,9 +299,7 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
         {
           timestamp: new Date(),
           level: "warn",
-          message: t("dms.labels.reconnected_export_service", {
-            provider: isRrMode ? t("dms.labels.provider_reynolds") : providerLabel
-          })
+          message: `Reconnected to ${isRrMode ? "RR" : mode === DMS_MAP.fortellis ? "Fortellis" : "DMS"} Export Service`
         }
       ]);
     };
@@ -389,16 +318,11 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
     // Logs
     const onLog = isRrMode
       ? (payload = {}) => {
-          const safePayload = canViewSensitiveRrXml ? payload : stripRrXmlFromPayload(payload);
           const normalized = {
-            timestamp: safePayload.timestamp
-              ? new Date(safePayload.timestamp)
-              : safePayload.ts
-                ? new Date(safePayload.ts)
-                : new Date(),
-            level: (safePayload.level || "INFO").toUpperCase(),
-            message: safePayload.message || safePayload.msg || "",
-            meta: safePayload.meta ?? safePayload.ctx ?? safePayload.details ?? null
+            timestamp: payload.timestamp ? new Date(payload.timestamp) : payload.ts ? new Date(payload.ts) : new Date(),
+            level: (payload.level || "INFO").toUpperCase(),
+            message: payload.message || payload.msg || "",
+            meta: payload.meta ?? payload.ctx ?? payload.details ?? null
           };
           setLogs((prev) => [...prev, normalized]);
         }
@@ -434,12 +358,14 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
         {
           timestamp: new Date(),
           level: "INFO",
-          message: t("dms.labels.rr_validation_message")
+          message:
+            "Repair Order created in Reynolds. Complete validation in Reynolds, then click Finished/Close to finalize."
         }
       ]);
       notification.info({
-        title: t("dms.labels.rr_validation_notice_title"),
-        description: t("dms.labels.rr_validation_notice_description"),
+        title: "Reynolds RO created",
+        description:
+          "Complete validation in Reynolds, then click Finished/Close to finalize and mark this export complete.",
         duration: 8
       });
     };
@@ -451,7 +377,8 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
         {
           timestamp: new Date(),
           level: "INFO",
-          message: t("dms.labels.rr_validation_message"),
+          message:
+            "Repair Order created in Reynolds. Complete validation in Reynolds, then click Finished/Close to finalize.",
           meta: { payload }
         }
       ]);
@@ -479,19 +406,7 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
         activeSocket.disconnect();
       }
     };
-  }, [
-    mode,
-    activeSocket,
-    channels,
-    logLevel,
-    notification,
-    t,
-    insertAuditTrail,
-    history,
-    isRrMode,
-    providerLabel,
-    canViewSensitiveRrXml
-  ]);
+  }, [mode, activeSocket, channels, logLevel, notification, t, insertAuditTrail, history]);
 
   // RR finalize callback (unchanged public behavior)
   const handleRrValidationFinished = () => {
@@ -513,7 +428,7 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
 
   // Check if Reynolds mode requires early RO
   const hasEarlyRO = !!(data.jobs_by_pk?.dms_id && data.jobs_by_pk?.dms_customer_id && data.jobs_by_pk?.dms_advisor_id);
-
+  
   if (isRrMode && !hasEarlyRO) {
     return (
       <Result
@@ -534,7 +449,7 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
       <AlertComponent style={{ marginBottom: 10 }} title={bannerMessage} type="warning" showIcon closable />
 
       <Row gutter={[16, 16]}>
-        <Col xs={24} xxl={10} className="dms-equal-height-col dms-top-panel-col">
+        <Col md={24} lg={10} className="dms-equal-height-col">
           {!isRrMode ? (
             <DmsAllocationsSummary
               key={resetKey}
@@ -574,7 +489,7 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
           )}
         </Col>
 
-        <Col xs={24} xxl={14} className="dms-equal-height-col dms-top-panel-col">
+        <Col md={24} lg={14} className="dms-equal-height-col">
           <DmsPostForm
             key={resetKey}
             socket={activeSocket}
@@ -588,7 +503,6 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
         </Col>
 
         <DmsCustomerSelector
-          key={customerSelectorKey}
           jobid={jobId}
           job={data?.jobs_by_pk}
           bodyshop={bodyshop}
@@ -613,32 +527,43 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
                       <Switch
                         checked={colorizeJson}
                         onChange={setColorizeJson}
-                        checkedChildren={t("dms.labels.color_json")}
-                        unCheckedChildren={t("dms.labels.plain_json")}
+                        checkedChildren="Color JSON"
+                        unCheckedChildren="Plain JSON"
                       />
-                      <Button onClick={toggleDetailsAll}>
-                        {detailsOpen ? t("dms.labels.collapse_all") : t("dms.labels.expand_all")}
-                      </Button>
+                      <Button onClick={toggleDetailsAll}>{detailsOpen ? "Collapse All" : "Expand All"}</Button>
                     </>
                   )}
 
                   <Select
-                    placeholder={t("dms.labels.log_level")}
+                    placeholder="Log Level"
                     value={logLevel}
                     onChange={(value) => {
                       setLogLevel(value);
                       setActiveLogLevel(value);
                     }}
-                    options={[
-                      { key: "SILLY", value: "SILLY", label: "SILLY" },
-                      { key: "DEBUG", value: "DEBUG", label: "DEBUG" },
-                      { key: "INFO", value: "INFO", label: "INFO" },
-                      { key: "WARN", value: "WARN", label: "WARN" },
-                      { key: "ERROR", value: "ERROR", label: "ERROR" }
-                    ]}
-                  />
-                  <Button onClick={() => setLogs([])}>{t("dms.labels.clear_logs")}</Button>
-                  <Button onClick={handleReconnectClick}> {t("dms.labels.reconnect")}</Button>
+                  >
+                    <Select.Option key="SILLY">SILLY</Select.Option>
+                    <Select.Option key="DEBUG">DEBUG</Select.Option>
+                    <Select.Option key="INFO">INFO</Select.Option>
+                    <Select.Option key="WARN">WARN</Select.Option>
+                    <Select.Option key="ERROR">ERROR</Select.Option>
+                  </Select>
+                  <Button onClick={() => setLogs([])}>Clear Logs</Button>
+                  <Button
+                    onClick={() => {
+                      setLogs([]);
+                      setResetAfterReconnect(true);
+                      if (isWssMode(mode)) {
+                        setActiveLogLevel(logLevel);
+                      }
+                      if (activeSocket) {
+                        activeSocket.disconnect();
+                        setTimeout(() => activeSocket.connect(), 100);
+                      }
+                    }}
+                  >
+                    Reconnect
+                  </Button>
                 </Space>
               }
             >
@@ -650,7 +575,6 @@ export function DmsContainer({ bodyshop, currentUser, setBreadcrumbs, setSelecte
                 detailsNonce={detailsNonce}
                 colorizeJson={isRrMode ? colorizeJson : false}
                 showDetails={isRrMode}
-                allowXmlPayload={canViewSensitiveRrXml}
               />
             </Card>
           </div>
diff --git a/client/src/pages/export-logs/export-logs.page.component.jsx b/client/src/pages/export-logs/export-logs.page.component.jsx
index 487adeffc..a30e863ac 100644
--- a/client/src/pages/export-logs/export-logs.page.component.jsx
+++ b/client/src/pages/export-logs/export-logs.page.component.jsx
@@ -1,6 +1,6 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Checkbox, Input, Space, Typography } from "antd";
+import { Button, Card, Checkbox, Input, Space, Table, Typography } from "antd";
 import _ from "lodash";
 import queryString from "query-string";
 import { useTranslation } from "react-i18next";
@@ -8,7 +8,6 @@ import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import AlertComponent from "../../components/alert/alert.component";
-import ResponsiveTable from "../../components/responsive-table/responsive-table.component";
 import { QUERY_EXPORT_LOG_PAGINATED } from "../../graphql/accounting.queries";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { pageLimit } from "../../utils/config";
@@ -187,7 +186,7 @@ export function ExportLogsPageComponent() {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{
           placement: "top",
@@ -196,7 +195,6 @@ export function ExportLogsPageComponent() {
           total: data && data.search_exportlog_aggregate.aggregate.count
         }}
         columns={columns}
-        mobileColumnKeys={["created_at", "ro_number", "successful", "message"]}
         rowKey="id"
         dataSource={data?.search_exportlog}
         style={{ height: "100%" }}
diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx
index c12695afd..6587e8399 100644
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -440,15 +440,13 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                                   }
                                 ]}
                               >
-                                <Select
-                                  style={{ minWidth: "12rem" }}
-                                  disabled={jobRO}
-                                  options={bodyshop.md_ins_cos.map((s) => ({
-                                    key: s.name,
-                                    value: s.name,
-                                    label: s.name
-                                  }))}
-                                />
+                                <Select style={{ minWidth: "12rem" }} disabled={jobRO}>
+                                  {bodyshop.md_ins_cos.map((s) => (
+                                    <Select.Option key={s.name} value={s.name}>
+                                      {s.name}
+                                    </Select.Option>
+                                  ))}
+                                </Select>
                               </Form.Item>
 
                               <Form.Item
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index ea7adf655..d8ec210ec 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -237,13 +237,7 @@ export function JobsDetailPage({
             "rate_mapa",
             "rate_mahw",
             "rate_mash",
-            "rate_matd",
-            "flat_rate_ats",
-            "state_tax_rate",
-            "tax_lbr_rt",
-            "tax_shop_mat_rt",
-            "tax_paint_mat_rt",
-            "tax_sub_rt"
+            "rate_matd"
           ],
           (meta) => meta && meta.touched
         );
diff --git a/client/src/pages/phonebook/phonebook.page.component.jsx b/client/src/pages/phonebook/phonebook.page.component.jsx
index 87abcdb32..9e7901f89 100644
--- a/client/src/pages/phonebook/phonebook.page.component.jsx
+++ b/client/src/pages/phonebook/phonebook.page.component.jsx
@@ -1,6 +1,6 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Input, Space, Typography } from "antd";
+import { Button, Card, Input, Space, Table, Typography } from "antd";
 import _ from "lodash";
 import queryString from "query-string";
 import { useTranslation } from "react-i18next";
@@ -8,7 +8,6 @@ import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import AlertComponent from "../../components/alert/alert.component";
-import ResponsiveTable from "../../components/responsive-table/responsive-table.component";
 import { QUERY_PHONEBOOK_PAGINATED } from "../../graphql/phonebook.queries";
 import { selectAuthLevel, selectBodyshop } from "../../redux/user/user.selectors";
 import ChatOpenButton from "../../components/chat-open-button/chat-open-button.component";
@@ -173,7 +172,7 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{
           placement: "top",
@@ -182,7 +181,6 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
           total: data && data.search_phonebook_aggregate.aggregate.count
         }}
         columns={columns}
-        mobileColumnKeys={["firstname", "lastname", "company", "phone1", "phone2"]}
         rowKey="id"
         dataSource={data?.search_phonebook}
         //scroll={{ x: true }}
diff --git a/client/src/pages/phonebook/phonebook.page.container.jsx b/client/src/pages/phonebook/phonebook.page.container.jsx
index 2445b8ba5..3a2fd2917 100644
--- a/client/src/pages/phonebook/phonebook.page.container.jsx
+++ b/client/src/pages/phonebook/phonebook.page.container.jsx
@@ -39,8 +39,10 @@ export function PhonebookContainer({ setBreadcrumbs, setSelectedHeader }) {
 
   const navigate = useNavigate();
 
-  const screens = Grid.useBreakpoint();
-  
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
   const bpoints = {
     xs: "100%",
     sm: "100%",
@@ -49,15 +51,7 @@ export function PhonebookContainer({ setBreadcrumbs, setSelectedHeader }) {
     xl: "50%",
     xxl: "45%"
   };
-  
-  // Get the largest active breakpoint
-  let drawerPercentage = "100%";
-  if (screens.xxl) drawerPercentage = bpoints.xxl;
-  else if (screens.xl) drawerPercentage = bpoints.xl;
-  else if (screens.lg) drawerPercentage = bpoints.lg;
-  else if (screens.md) drawerPercentage = bpoints.md;
-  else if (screens.sm) drawerPercentage = bpoints.sm;
-  else if (screens.xs) drawerPercentage = bpoints.xs;
+  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
 
   return (
     <RbacWrapper action="phonebook:view">
diff --git a/client/src/pages/shop-vendor/shop-vendor.page.component.jsx b/client/src/pages/shop-vendor/shop-vendor.page.component.jsx
index fe77d7f19..3ba7cebf0 100644
--- a/client/src/pages/shop-vendor/shop-vendor.page.component.jsx
+++ b/client/src/pages/shop-vendor/shop-vendor.page.component.jsx
@@ -8,8 +8,10 @@ export default function ShopVendorPageComponent() {
   const { selectedvendor } = Object.fromEntries(searchParams);
   const navigate = useNavigate();
 
-  const screens = Grid.useBreakpoint();
-  
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
   const bpoints = {
     xs: "100%",
     sm: "100%",
@@ -18,14 +20,7 @@ export default function ShopVendorPageComponent() {
     xl: "50%",
     xxl: "45%"
   };
-  
-  let drawerPercentage = "100%";
-  if (screens.xxl) drawerPercentage = bpoints.xxl;
-  else if (screens.xl) drawerPercentage = bpoints.xl;
-  else if (screens.lg) drawerPercentage = bpoints.lg;
-  else if (screens.md) drawerPercentage = bpoints.md;
-  else if (screens.sm) drawerPercentage = bpoints.sm;
-  else if (screens.xs) drawerPercentage = bpoints.xs;
+  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
 
   return (
     <div>
diff --git a/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx b/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx
index 322880710..6fad4f6bc 100644
--- a/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx
+++ b/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx
@@ -1,7 +1,6 @@
 import { useQuery } from "@apollo/client/react";
 import { useState } from "react";
-import { Button, Card, Input, Space } from "antd";
-import ResponsiveTable from "../../components/responsive-table/responsive-table.component";
+import { Button, Card, Input, Space, Table } from "antd";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { QUERY_JOBS_TECH_ASIGNED_TO_BY_TEAM } from "../../graphql/jobs.queries";
@@ -189,11 +188,10 @@ export function TechAssignedProdJobs({ setTimeTicketTaskContext, technician, bod
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={false}
         columns={columns}
-        mobileColumnKeys={["ro_number", "owner", "status", "vehicle", "plate_no"]}
         rowKey="id"
         dataSource={jobs}
         scroll={{ x: true }}
diff --git a/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx b/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx
index 51b5fbaf6..2578ba665 100644
--- a/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx
+++ b/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx
@@ -1,7 +1,6 @@
 import { MinusCircleTwoTone, PlusCircleTwoTone, SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Space } from "antd";
-import ResponsiveTable from "../../components/responsive-table/responsive-table.component";
+import { Button, Card, Space, Table } from "antd";
 import queryString from "query-string";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -109,7 +108,7 @@ export function TechDispatchedParts({ technician, bodyshop }) {
         </Space>
       }
     >
-      <ResponsiveTable
+      <Table
         loading={loading}
         pagination={{
           pageSize: 25,
@@ -118,7 +117,6 @@ export function TechDispatchedParts({ technician, bodyshop }) {
           showSizeChanger: false
         }}
         columns={columns}
-        mobileColumnKeys={["ro_number", "status", "vehicle", "actions"]}
         rowKey="id"
         dataSource={parts_dispatch}
         scroll={{ x: true }}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 02e952d61..626ab5e4c 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -161,14 +161,12 @@
       "fields": {
         "actual_cost": "Actual Cost",
         "actual_price": "Retail",
-        "confidence": "Confidence",
         "cost_center": "Cost Center",
         "federal_tax_applicable": "Fed. Tax?",
         "jobline": "Job Line",
         "line_desc": "Line Description",
         "local_tax_applicable": "Loc. Tax?",
         "location": "Location",
-        "oem_partno": "Part #",
         "quantity": "Quantity",
         "state_tax_applicable": "St. Tax?"
       },
@@ -193,8 +191,6 @@
         "return": "Return Items"
       },
       "errors": {
-        "calculating_totals": "Error Calculating Totals",
-        "calculating_totals_generic": "Please ensure all fields are properly completed. ",
         "creating": "Error adding bill.  {{error}}",
         "deleting": "Error deleting bill. {{error}}",
         "existinginventoryline": "This bill cannot be deleted as it is tied to items in inventory.",
@@ -221,24 +217,6 @@
       },
       "labels": {
         "actions": "Actions",
-        "ai": {
-          "accept_and_continue": "Accept and Continue",
-          "confidence": {
-            "breakdown": "Confidence Breakdown",
-            "match": "Jobline Match",
-            "missing_data": "Missing Data",
-            "ocr": "Optical Character Recognition",
-            "overall": "Overall"
-          },
-          "disclaimer_title": "AI Scan Beta Disclaimer",
-          "generic_failure": "Failed to process invoice.",
-          "multipage": "The is a multi-page document.  Processing will take a few moments.",
-          "processing": "Analyzing Bill",
-          "scan": "AI Bill Scanner",
-          "scancomplete": "AI Scan Complete",
-          "scanfailed": "AI Scan Failed",
-          "scanstarted": "AI Scan Started"
-        },
         "bill_lines": "Bill Lines",
         "bill_total": "Bill Total Amount",
         "billcmtotal": "Credit Memos",
@@ -1074,36 +1052,7 @@
         "earlyrorequired.message": "This job requires an early Repair Order to be created before posting to Reynolds. Please use the admin panel to create the early RO first."
       },
       "labels": {
-        "refreshallocations": "Refresh to see DMS Allocations.",
-        "provider_reynolds": "Reynolds",
-        "provider_fortellis": "Fortellis",
-        "provider_cdk": "CDK",
-        "provider_pbs": "PBS",
-        "provider_dms": "DMS",
-        "transport_wss": "(WSS)",
-        "transport_ws": "(WS)",
-        "banner_status_connected": "Connected",
-        "banner_status_disconnected": "Disconnected",
-        "banner_message": "Posting to {{provider}} | {{transport}} | {{status}}",
-        "reconnected_export_service": "Reconnected to {{provider}} Export Service",
-        "rr_validation_message": "Repair Order created in Reynolds. Complete validation in Reynolds, then click Finished/Close to finalize.",
-        "rr_validation_notice_title": "Reynolds RO created",
-        "rr_validation_notice_description": "Complete validation in Reynolds, then click Finished/Close to finalize and mark this export complete.",
-        "color_json": "Color JSON",
-        "plain_json": "Plain JSON",
-        "collapse_all": "Collapse All",
-        "expand_all": "Expand All",
-        "log_level": "Log Level",
-        "clear_logs": "Clear Logs",
-        "reconnect": "Reconnect",
-        "details": "Details",
-        "hide_details": "Hide details",
-        "copy": "Copy",
-        "copied": "Copied",
-        "copy_request": "Copy Request",
-        "copy_response": "Copy Response",
-        "request_xml": "Request XML",
-        "response_xml": "Response XML"
+        "refreshallocations": "Refresh to see DMS Allocations."
       }
     },
     "documents": {
@@ -1342,11 +1291,10 @@
         "vehicle": "Vehicle"
       },
       "labels": {
-        "actions": "Actions",
         "apply": "Apply",
+        "actions": "Actions",
         "areyousure": "Are you sure?",
         "barcode": "Barcode",
-        "beta": "BETA",
         "cancel": "Are you sure you want to cancel? Your changes will not be saved.",
         "changelog": "Change Log",
         "clear": "Clear",
@@ -1419,7 +1367,6 @@
         "unknown": "Unknown",
         "unsavedchanges": "Unsaved changes.",
         "username": "Username",
-        "validationerror": "Please fix the following errors:",
         "view": "View",
         "wednesday": "Wednesday",
         "yes": "Yes"
@@ -1445,7 +1392,6 @@
         "unsavedchangespopup": "You have unsaved changes. Are you sure you want to leave?"
       },
       "validation": {
-        "array": "Please select at least one option.",
         "dateRangeExceeded": "The date range has been exceeded.",
         "invalidemail": "Please enter a valid email.",
         "invalidphone": "Please enter a valid phone number.",
@@ -1876,14 +1822,14 @@
             "name": "Payer Name",
             "payer_type": "Payer"
           },
-          "rr_opcode": "RR OpCode",
-          "rr_opcode_base": "Base",
-          "rr_opcode_prefix": "Prefix",
-          "rr_opcode_suffix": "Suffix",
           "sale": "Sale",
           "sale_dms_acctnumber": "Sale DMS Acct #",
           "story": "Story",
-          "vinowner": "VIN Owner"
+          "vinowner": "VIN Owner",
+          "rr_opcode": "RR OpCode",
+          "rr_opcode_prefix": "Prefix",
+          "rr_opcode_suffix": "Suffix",
+          "rr_opcode_base": "Base"
         },
         "dms_allocation": "DMS Allocation",
         "driveable": "Driveable",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index f10585f6f..664c5081c 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -161,14 +161,12 @@
       "fields": {
         "actual_cost": "",
         "actual_price": "",
-        "confidence": "",
         "cost_center": "",
         "federal_tax_applicable": "",
         "jobline": "",
         "line_desc": "",
         "local_tax_applicable": "",
         "location": "",
-        "oem_partno": "",
         "quantity": "",
         "state_tax_applicable": ""
       },
@@ -193,8 +191,6 @@
         "return": ""
       },
       "errors": {
-        "calculating_totals": "",
-        "calculating_totals_generic": "",
         "creating": "",
         "deleting": "",
         "existinginventoryline": "",
@@ -221,24 +217,6 @@
       },
       "labels": {
         "actions": "",
-        "ai": {
-          "accept_and_continue": "",
-          "confidence": {
-            "breakdown": "",
-            "match": "",
-            "missing_data": "",
-            "ocr": "",
-            "overall": ""
-          },
-          "disclaimer_title": "",
-          "generic_failure": "",
-          "multipage": "",
-          "processing": "",
-          "scan": "",
-          "scancomplete": "",
-          "scanfailed": "",
-          "scanstarted": ""
-        },
         "bill_lines": "",
         "bill_total": "",
         "billcmtotal": "",
@@ -1074,36 +1052,7 @@
         "earlyrorequired.message": ""
       },
       "labels": {
-        "refreshallocations": "",
-        "provider_reynolds": "",
-        "provider_fortellis": "",
-        "provider_cdk": "",
-        "provider_pbs": "",
-        "provider_dms": "",
-        "transport_wss": "",
-        "transport_ws": "",
-        "banner_status_connected": "",
-        "banner_status_disconnected": "",
-        "banner_message": "",
-        "reconnected_export_service": "",
-        "rr_validation_message": "",
-        "rr_validation_notice_title": "",
-        "rr_validation_notice_description": "",
-        "color_json": "",
-        "plain_json": "",
-        "collapse_all": "",
-        "expand_all": "",
-        "log_level": "",
-        "clear_logs": "",
-        "reconnect": "",
-        "details": "",
-        "hide_details": "",
-        "copy": "",
-        "copied": "",
-        "copy_request": "",
-        "copy_response": "",
-        "request_xml": "",
-        "response_xml": ""
+        "refreshallocations": ""
       }
     },
     "documents": {
@@ -1342,11 +1291,10 @@
         "vehicle": ""
       },
       "labels": {
-        "actions": "Comportamiento",
         "apply": "",
+        "actions": "Comportamiento",
         "areyousure": "",
         "barcode": "código de barras",
-        "beta": "",
         "cancel": "",
         "changelog": "",
         "clear": "",
@@ -1419,7 +1367,6 @@
         "unknown": "Desconocido",
         "unsavedchanges": "",
         "username": "",
-        "validationerror": "",
         "view": "",
         "wednesday": "",
         "yes": ""
@@ -1445,7 +1392,6 @@
         "unsavedchangespopup": ""
       },
       "validation": {
-        "array": "Por favor seleccione al menos una opción.",
         "dateRangeExceeded": "",
         "invalidemail": "Por favor introduzca una dirección de correo electrónico válida.",
         "invalidphone": "",
@@ -1876,14 +1822,14 @@
             "name": "",
             "payer_type": ""
           },
-          "rr_opcode": "",
-          "rr_opcode_base": "",
-          "rr_opcode_prefix": "",
-          "rr_opcode_suffix": "",
           "sale": "",
           "sale_dms_acctnumber": "",
           "story": "",
-          "vinowner": ""
+          "vinowner": "",
+          "rr_opcode": "",
+          "rr_opcode_prefix": "",
+          "rr_opcode_suffix": "",
+          "rr_opcode_base": ""
         },
         "dms_allocation": "",
         "driveable": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 4f7edc58d..67a14d5ff 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -161,14 +161,12 @@
       "fields": {
         "actual_cost": "",
         "actual_price": "",
-        "confidence": "",
         "cost_center": "",
         "federal_tax_applicable": "",
         "jobline": "",
         "line_desc": "",
         "local_tax_applicable": "",
         "location": "",
-        "oem_partno": "",
         "quantity": "",
         "state_tax_applicable": ""
       },
@@ -193,8 +191,6 @@
         "return": ""
       },
       "errors": {
-        "calculating_totals": "",
-        "calculating_totals_generic": "",
         "creating": "",
         "deleting": "",
         "existinginventoryline": "",
@@ -221,24 +217,6 @@
       },
       "labels": {
         "actions": "",
-        "ai": {
-          "accept_and_continue": "",
-          "confidence": {
-            "breakdown": "",
-            "match": "",
-            "missing_data": "",
-            "ocr": "",
-            "overall": ""
-          },
-          "disclaimer_title": "",
-          "generic_failure": "",
-          "multipage": "",
-          "processing": "",
-          "scan": "",
-          "scancomplete": "",
-          "scanfailed": "",
-          "scanstarted": ""
-        },
         "bill_lines": "",
         "bill_total": "",
         "billcmtotal": "",
@@ -1074,36 +1052,7 @@
         "earlyrorequired.message": ""
       },
       "labels": {
-        "refreshallocations": "",
-        "provider_reynolds": "",
-        "provider_fortellis": "",
-        "provider_cdk": "",
-        "provider_pbs": "",
-        "provider_dms": "",
-        "transport_wss": "",
-        "transport_ws": "",
-        "banner_status_connected": "",
-        "banner_status_disconnected": "",
-        "banner_message": "",
-        "reconnected_export_service": "",
-        "rr_validation_message": "",
-        "rr_validation_notice_title": "",
-        "rr_validation_notice_description": "",
-        "color_json": "",
-        "plain_json": "",
-        "collapse_all": "",
-        "expand_all": "",
-        "log_level": "",
-        "clear_logs": "",
-        "reconnect": "",
-        "details": "",
-        "hide_details": "",
-        "copy": "",
-        "copied": "",
-        "copy_request": "",
-        "copy_response": "",
-        "request_xml": "",
-        "response_xml": ""
+        "refreshallocations": ""
       }
     },
     "documents": {
@@ -1342,11 +1291,10 @@
         "vehicle": ""
       },
       "labels": {
-        "actions": "actes",
         "apply": "",
+        "actions": "actes",
         "areyousure": "",
         "barcode": "code à barre",
-        "beta": "",
         "cancel": "",
         "changelog": "",
         "clear": "",
@@ -1419,7 +1367,6 @@
         "unknown": "Inconnu",
         "unsavedchanges": "",
         "username": "",
-        "validationerror": "",
         "view": "",
         "wednesday": "",
         "yes": ""
@@ -1445,7 +1392,6 @@
         "unsavedchangespopup": ""
       },
       "validation": {
-        "array": "Veuillez sélectionner au moins une option.",
         "dateRangeExceeded": "",
         "invalidemail": "S'il vous plaît entrer un email valide.",
         "invalidphone": "",
@@ -1876,14 +1822,14 @@
             "name": "",
             "payer_type": ""
           },
-          "rr_opcode": "",
-          "rr_opcode_base": "",
-          "rr_opcode_prefix": "",
-          "rr_opcode_suffix": "",
           "sale": "",
           "sale_dms_acctnumber": "",
           "story": "",
-          "vinowner": ""
+          "vinowner": "",
+          "rr_opcode": "",
+          "rr_opcode_prefix": "",
+          "rr_opcode_suffix": "",
+          "rr_opcode_base": ""
         },
         "dms_allocation": "",
         "driveable": "",
diff --git a/client/src/utils/Ciecaselect.jsx b/client/src/utils/Ciecaselect.jsx
index cffe05fa8..5d4bea6ef 100644
--- a/client/src/utils/Ciecaselect.jsx
+++ b/client/src/utils/Ciecaselect.jsx
@@ -1,43 +1,44 @@
+import { Select } from "antd";
 import i18n from "../translations/i18n";
 
 export default function CiecaSelect(parts = true, labor = true) {
-  const options = [];
-  
-  if (labor) {
-    options.push(
-      { value: "LAA", label: i18n.t("joblines.fields.lbr_types.LAA") },
-      { value: "LAB", label: i18n.t("joblines.fields.lbr_types.LAB") },
-      { value: "LAD", label: i18n.t("joblines.fields.lbr_types.LAD") },
-      { value: "LAE", label: i18n.t("joblines.fields.lbr_types.LAE") },
-      { value: "LAF", label: i18n.t("joblines.fields.lbr_types.LAF") },
-      { value: "LAG", label: i18n.t("joblines.fields.lbr_types.LAG") },
-      { value: "LAM", label: i18n.t("joblines.fields.lbr_types.LAM") },
-      { value: "LAR", label: i18n.t("joblines.fields.lbr_types.LAR") },
-      { value: "LAS", label: i18n.t("joblines.fields.lbr_types.LAS") },
-      { value: "LAU", label: i18n.t("joblines.fields.lbr_types.LAU") },
-      { value: "LA1", label: i18n.t("joblines.fields.lbr_types.LA1") },
-      { value: "LA2", label: i18n.t("joblines.fields.lbr_types.LA2") },
-      { value: "LA3", label: i18n.t("joblines.fields.lbr_types.LA3") },
-      { value: "LA4", label: i18n.t("joblines.fields.lbr_types.LA4") }
-    );
-  }
-  
-  if (parts) {
-    options.push(
-      { value: "PAA", label: i18n.t("joblines.fields.part_types.PAA") },
-      { value: "PAC", label: i18n.t("joblines.fields.part_types.PAC") },
-      { value: "PAL", label: i18n.t("joblines.fields.part_types.PAL") },
-      { value: "PAG", label: i18n.t("joblines.fields.part_types.PAG") },
-      { value: "PAM", label: i18n.t("joblines.fields.part_types.PAM") },
-      { value: "PAP", label: i18n.t("joblines.fields.part_types.PAP") },
-      { value: "PAN", label: i18n.t("joblines.fields.part_types.PAN") },
-      { value: "PAO", label: i18n.t("joblines.fields.part_types.PAO") },
-      { value: "PAR", label: i18n.t("joblines.fields.part_types.PAR") },
-      { value: "PAS", label: i18n.t("joblines.fields.part_types.PAS") }
-    );
-  }
-  
-  return options;
+  return (
+    <>
+      {labor && (
+        <>
+          <Select.Option value="LAA">{i18n.t("joblines.fields.lbr_types.LAA")}</Select.Option>
+          <Select.Option value="LAB">{i18n.t("joblines.fields.lbr_types.LAB")}</Select.Option>
+          <Select.Option value="LAD">{i18n.t("joblines.fields.lbr_types.LAD")}</Select.Option>
+          <Select.Option value="LAE">{i18n.t("joblines.fields.lbr_types.LAE")}</Select.Option>
+          <Select.Option value="LAF">{i18n.t("joblines.fields.lbr_types.LAF")}</Select.Option>
+          <Select.Option value="LAG">{i18n.t("joblines.fields.lbr_types.LAG")}</Select.Option>
+          <Select.Option value="LAM">{i18n.t("joblines.fields.lbr_types.LAM")}</Select.Option>
+          <Select.Option value="LAR">{i18n.t("joblines.fields.lbr_types.LAR")}</Select.Option>
+          <Select.Option value="LAS">{i18n.t("joblines.fields.lbr_types.LAS")}</Select.Option>
+          <Select.Option value="LAU">{i18n.t("joblines.fields.lbr_types.LAU")}</Select.Option>
+          <Select.Option value="LA1">{i18n.t("joblines.fields.lbr_types.LA1")}</Select.Option>
+          <Select.Option value="LA2">{i18n.t("joblines.fields.lbr_types.LA2")}</Select.Option>
+          <Select.Option value="LA3">{i18n.t("joblines.fields.lbr_types.LA3")}</Select.Option>
+          <Select.Option value="LA4">{i18n.t("joblines.fields.lbr_types.LA4")}</Select.Option>
+        </>
+      )}
+      {parts && (
+        <>
+          <Select.Option value="PAA">{i18n.t("joblines.fields.part_types.PAA")}</Select.Option>
+          <Select.Option value="PAC">{i18n.t("joblines.fields.part_types.PAC")}</Select.Option>
+
+          <Select.Option value="PAL">{i18n.t("joblines.fields.part_types.PAL")}</Select.Option>
+          <Select.Option value="PAG">{i18n.t("joblines.fields.part_types.PAG")}</Select.Option>
+          <Select.Option value="PAM">{i18n.t("joblines.fields.part_types.PAM")}</Select.Option>
+          <Select.Option value="PAP">{i18n.t("joblines.fields.part_types.PAP")}</Select.Option>
+          <Select.Option value="PAN">{i18n.t("joblines.fields.part_types.PAN")}</Select.Option>
+          <Select.Option value="PAO">{i18n.t("joblines.fields.part_types.PAO")}</Select.Option>
+          <Select.Option value="PAR">{i18n.t("joblines.fields.part_types.PAR")}</Select.Option>
+          <Select.Option value="PAS">{i18n.t("joblines.fields.part_types.PAS")}</Select.Option>
+        </>
+      )}
+    </>
+  );
 }
 
 export function GetPartTypeName(part_type) {
diff --git a/package-lock.json b/package-lock.json
index e50bc924b..a72ac3df6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,25 +9,23 @@
       "version": "0.2.0",
       "license": "UNLICENSED",
       "dependencies": {
-        "@aws-sdk/client-cloudwatch-logs": "^3.997.0",
-        "@aws-sdk/client-elasticache": "^3.997.0",
-        "@aws-sdk/client-s3": "^3.997.0",
-        "@aws-sdk/client-secrets-manager": "^3.997.0",
-        "@aws-sdk/client-ses": "^3.997.0",
-        "@aws-sdk/client-sqs": "^3.997.0",
-        "@aws-sdk/client-textract": "^3.997.0",
-        "@aws-sdk/credential-provider-node": "^3.972.12",
-        "@aws-sdk/lib-storage": "^3.997.0",
-        "@aws-sdk/s3-request-presigner": "^3.997.0",
+        "@aws-sdk/client-cloudwatch-logs": "^3.978.0",
+        "@aws-sdk/client-elasticache": "^3.978.0",
+        "@aws-sdk/client-s3": "^3.978.0",
+        "@aws-sdk/client-secrets-manager": "^3.978.0",
+        "@aws-sdk/client-ses": "^3.978.0",
+        "@aws-sdk/credential-provider-node": "^3.972.3",
+        "@aws-sdk/lib-storage": "^3.978.0",
+        "@aws-sdk/s3-request-presigner": "^3.978.0",
         "@opensearch-project/opensearch": "^2.13.0",
         "@socket.io/admin-ui": "^0.5.1",
         "@socket.io/redis-adapter": "^8.3.0",
         "archiver": "^7.0.1",
         "aws4": "^1.13.2",
-        "axios": "^1.13.5",
+        "axios": "^1.13.4",
         "axios-curlirize": "^2.0.0",
         "better-queue": "^3.8.12",
-        "bullmq": "^5.70.1",
+        "bullmq": "^5.67.2",
         "chart.js": "^4.5.1",
         "cloudinary": "^2.9.0",
         "compression": "^1.8.1",
@@ -35,18 +33,17 @@
         "cors": "^2.8.6",
         "crisp-status-reporter": "^1.2.2",
         "dinero.js": "^1.9.1",
-        "dotenv": "^17.3.1",
+        "dotenv": "^17.2.3",
         "express": "^4.21.1",
-        "fast-xml-parser": "^5.4.1",
-        "firebase-admin": "^13.6.1",
-        "fuse.js": "^7.1.0",
-        "graphql": "^16.13.0",
+        "fast-xml-parser": "^5.3.4",
+        "firebase-admin": "^13.6.0",
+        "graphql": "^16.12.0",
         "graphql-request": "^6.1.0",
         "intuit-oauth": "^4.2.2",
-        "ioredis": "^5.9.3",
+        "ioredis": "^5.9.2",
         "json-2-csv": "^5.5.10",
         "jsonwebtoken": "^9.0.3",
-        "juice": "^11.1.1",
+        "juice": "^11.1.0",
         "lodash": "^4.17.23",
         "moment": "^2.30.1",
         "moment-timezone": "^0.6.0",
@@ -54,17 +51,16 @@
         "mustache": "^4.2.0",
         "node-persist": "^4.0.4",
         "nodemailer": "^6.10.0",
-        "pdf-lib": "^1.17.1",
-        "phone": "^3.1.71",
+        "phone": "^3.1.70",
         "query-string": "7.1.3",
         "recursive-diff": "^1.0.9",
-        "rimraf": "^6.1.3",
+        "rimraf": "^6.1.2",
         "skia-canvas": "^3.0.8",
-        "soap": "^1.7.1",
+        "soap": "^1.6.4",
         "socket.io": "^4.8.3",
         "socket.io-adapter": "^2.5.6",
         "ssh2-sftp-client": "^11.0.0",
-        "twilio": "^5.12.2",
+        "twilio": "^5.12.0",
         "uuid": "^11.1.0",
         "winston": "^3.19.0",
         "winston-cloudwatch": "^6.3.0",
@@ -77,7 +73,7 @@
         "@eslint/js": "^9.39.2",
         "eslint": "^9.39.2",
         "eslint-plugin-react": "^7.37.5",
-        "globals": "^17.3.0",
+        "globals": "^17.2.0",
         "mock-require": "^3.0.3",
         "p-limit": "^3.1.0",
         "prettier": "^3.8.1",
@@ -292,52 +288,52 @@
       }
     },
     "node_modules/@aws-sdk/client-cloudwatch-logs": {
-      "version": "3.997.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.997.0.tgz",
-      "integrity": "sha512-u0h34MhUdCOhmLcSBQVygxqpwS6AsYMjl5Brj/bFgsQpSh9zVy32ZSHROCvXKfvV3webY///WP44ZiXuSgQzZA==",
+      "version": "3.978.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.978.0.tgz",
+      "integrity": "sha512-5CYs/EKL5gissOLVxn40bAmIfmXFXlYko7beJ5lLPKKyWmW7vhzQeIfcmWZwxg9jtAeNsrZW8twkRni8hMHenw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/credential-provider-node": "^3.972.12",
-        "@aws-sdk/middleware-host-header": "^3.972.4",
-        "@aws-sdk/middleware-logger": "^3.972.4",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.4",
-        "@aws-sdk/middleware-user-agent": "^3.972.13",
-        "@aws-sdk/region-config-resolver": "^3.972.4",
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/util-endpoints": "^3.996.1",
-        "@aws-sdk/util-user-agent-browser": "^3.972.4",
-        "@aws-sdk/util-user-agent-node": "^3.972.12",
-        "@smithy/config-resolver": "^4.4.7",
-        "@smithy/core": "^3.23.4",
-        "@smithy/eventstream-serde-browser": "^4.2.9",
-        "@smithy/eventstream-serde-config-resolver": "^4.3.9",
-        "@smithy/eventstream-serde-node": "^4.2.9",
-        "@smithy/fetch-http-handler": "^5.3.10",
-        "@smithy/hash-node": "^4.2.9",
-        "@smithy/invalid-dependency": "^4.2.9",
-        "@smithy/middleware-content-length": "^4.2.9",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/middleware-retry": "^4.4.35",
-        "@smithy/middleware-serde": "^4.2.10",
-        "@smithy/middleware-stack": "^4.2.9",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/node-http-handler": "^4.4.11",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-body-length-browser": "^4.2.1",
-        "@smithy/util-body-length-node": "^4.2.2",
-        "@smithy/util-defaults-mode-browser": "^4.3.34",
-        "@smithy/util-defaults-mode-node": "^4.2.37",
-        "@smithy/util-endpoints": "^3.2.9",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-retry": "^4.2.9",
-        "@smithy/util-utf8": "^4.2.1",
+        "@aws-sdk/core": "^3.973.4",
+        "@aws-sdk/credential-provider-node": "^3.972.2",
+        "@aws-sdk/middleware-host-header": "^3.972.2",
+        "@aws-sdk/middleware-logger": "^3.972.2",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.2",
+        "@aws-sdk/middleware-user-agent": "^3.972.4",
+        "@aws-sdk/region-config-resolver": "^3.972.2",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-endpoints": "3.972.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.2",
+        "@aws-sdk/util-user-agent-node": "^3.972.2",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/core": "^3.22.0",
+        "@smithy/eventstream-serde-browser": "^4.2.8",
+        "@smithy/eventstream-serde-config-resolver": "^4.3.8",
+        "@smithy/eventstream-serde-node": "^4.2.8",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/hash-node": "^4.2.8",
+        "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/middleware-content-length": "^4.2.8",
+        "@smithy/middleware-endpoint": "^4.4.12",
+        "@smithy/middleware-retry": "^4.4.29",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/middleware-stack": "^4.2.8",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-body-length-browser": "^4.2.0",
+        "@smithy/util-body-length-node": "^4.2.1",
+        "@smithy/util-defaults-mode-browser": "^4.3.28",
+        "@smithy/util-defaults-mode-node": "^4.2.31",
+        "@smithy/util-endpoints": "^3.2.8",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-retry": "^4.2.8",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -345,50 +341,50 @@
       }
     },
     "node_modules/@aws-sdk/client-elasticache": {
-      "version": "3.997.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-elasticache/-/client-elasticache-3.997.0.tgz",
-      "integrity": "sha512-M8YsSXAT6Whi3sKwCFXKh4ZxkNeAHYGNh0NTxyDpuWZAThRb+bzxKngivH0zTNuyOcmlR3/arPzD1+a9AyuycA==",
+      "version": "3.978.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-elasticache/-/client-elasticache-3.978.0.tgz",
+      "integrity": "sha512-SE7NGyMVXC2cl3L9UMFLR+DQeqsZYDAnh9qJDcM5Jj/WCtsLzvbloPtRWMXaxNTU+D/RFzkIxIaPvvugmlB/Ew==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/credential-provider-node": "^3.972.12",
-        "@aws-sdk/middleware-host-header": "^3.972.4",
-        "@aws-sdk/middleware-logger": "^3.972.4",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.4",
-        "@aws-sdk/middleware-user-agent": "^3.972.13",
-        "@aws-sdk/region-config-resolver": "^3.972.4",
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/util-endpoints": "^3.996.1",
-        "@aws-sdk/util-user-agent-browser": "^3.972.4",
-        "@aws-sdk/util-user-agent-node": "^3.972.12",
-        "@smithy/config-resolver": "^4.4.7",
-        "@smithy/core": "^3.23.4",
-        "@smithy/fetch-http-handler": "^5.3.10",
-        "@smithy/hash-node": "^4.2.9",
-        "@smithy/invalid-dependency": "^4.2.9",
-        "@smithy/middleware-content-length": "^4.2.9",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/middleware-retry": "^4.4.35",
-        "@smithy/middleware-serde": "^4.2.10",
-        "@smithy/middleware-stack": "^4.2.9",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/node-http-handler": "^4.4.11",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-body-length-browser": "^4.2.1",
-        "@smithy/util-body-length-node": "^4.2.2",
-        "@smithy/util-defaults-mode-browser": "^4.3.34",
-        "@smithy/util-defaults-mode-node": "^4.2.37",
-        "@smithy/util-endpoints": "^3.2.9",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-retry": "^4.2.9",
-        "@smithy/util-utf8": "^4.2.1",
-        "@smithy/util-waiter": "^4.2.9",
+        "@aws-sdk/core": "^3.973.4",
+        "@aws-sdk/credential-provider-node": "^3.972.2",
+        "@aws-sdk/middleware-host-header": "^3.972.2",
+        "@aws-sdk/middleware-logger": "^3.972.2",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.2",
+        "@aws-sdk/middleware-user-agent": "^3.972.4",
+        "@aws-sdk/region-config-resolver": "^3.972.2",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-endpoints": "3.972.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.2",
+        "@aws-sdk/util-user-agent-node": "^3.972.2",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/core": "^3.22.0",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/hash-node": "^4.2.8",
+        "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/middleware-content-length": "^4.2.8",
+        "@smithy/middleware-endpoint": "^4.4.12",
+        "@smithy/middleware-retry": "^4.4.29",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/middleware-stack": "^4.2.8",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-body-length-browser": "^4.2.0",
+        "@smithy/util-body-length-node": "^4.2.1",
+        "@smithy/util-defaults-mode-browser": "^4.3.28",
+        "@smithy/util-defaults-mode-node": "^4.2.31",
+        "@smithy/util-endpoints": "^3.2.8",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-retry": "^4.2.8",
+        "@smithy/util-utf8": "^4.2.0",
+        "@smithy/util-waiter": "^4.2.8",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -396,65 +392,65 @@
       }
     },
     "node_modules/@aws-sdk/client-s3": {
-      "version": "3.997.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.997.0.tgz",
-      "integrity": "sha512-a4z12iq/bJVJXfVOOKsYMDhxZwf+n8xieCuW+zI07qtRAuMiKr2vUtHPBbKncrF+hqnsq/Wmh48bu2yziGhIbg==",
+      "version": "3.978.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.978.0.tgz",
+      "integrity": "sha512-2chs05VbfgRNb5ZEYIwooeHCaL+DjwvrW3ElkslI71ltEqVNdeWvB7hbkLWPPKazV3kjY3H90pLDY8mMqsET+A==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha1-browser": "5.2.0",
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/credential-provider-node": "^3.972.12",
-        "@aws-sdk/middleware-bucket-endpoint": "^3.972.4",
-        "@aws-sdk/middleware-expect-continue": "^3.972.4",
-        "@aws-sdk/middleware-flexible-checksums": "^3.972.11",
-        "@aws-sdk/middleware-host-header": "^3.972.4",
-        "@aws-sdk/middleware-location-constraint": "^3.972.4",
-        "@aws-sdk/middleware-logger": "^3.972.4",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.4",
-        "@aws-sdk/middleware-sdk-s3": "^3.972.13",
-        "@aws-sdk/middleware-ssec": "^3.972.4",
-        "@aws-sdk/middleware-user-agent": "^3.972.13",
-        "@aws-sdk/region-config-resolver": "^3.972.4",
-        "@aws-sdk/signature-v4-multi-region": "^3.996.1",
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/util-endpoints": "^3.996.1",
-        "@aws-sdk/util-user-agent-browser": "^3.972.4",
-        "@aws-sdk/util-user-agent-node": "^3.972.12",
-        "@smithy/config-resolver": "^4.4.7",
-        "@smithy/core": "^3.23.4",
-        "@smithy/eventstream-serde-browser": "^4.2.9",
-        "@smithy/eventstream-serde-config-resolver": "^4.3.9",
-        "@smithy/eventstream-serde-node": "^4.2.9",
-        "@smithy/fetch-http-handler": "^5.3.10",
-        "@smithy/hash-blob-browser": "^4.2.10",
-        "@smithy/hash-node": "^4.2.9",
-        "@smithy/hash-stream-node": "^4.2.9",
-        "@smithy/invalid-dependency": "^4.2.9",
-        "@smithy/md5-js": "^4.2.9",
-        "@smithy/middleware-content-length": "^4.2.9",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/middleware-retry": "^4.4.35",
-        "@smithy/middleware-serde": "^4.2.10",
-        "@smithy/middleware-stack": "^4.2.9",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/node-http-handler": "^4.4.11",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-body-length-browser": "^4.2.1",
-        "@smithy/util-body-length-node": "^4.2.2",
-        "@smithy/util-defaults-mode-browser": "^4.3.34",
-        "@smithy/util-defaults-mode-node": "^4.2.37",
-        "@smithy/util-endpoints": "^3.2.9",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-retry": "^4.2.9",
-        "@smithy/util-stream": "^4.5.14",
-        "@smithy/util-utf8": "^4.2.1",
-        "@smithy/util-waiter": "^4.2.9",
+        "@aws-sdk/core": "^3.973.4",
+        "@aws-sdk/credential-provider-node": "^3.972.2",
+        "@aws-sdk/middleware-bucket-endpoint": "^3.972.2",
+        "@aws-sdk/middleware-expect-continue": "^3.972.2",
+        "@aws-sdk/middleware-flexible-checksums": "^3.972.2",
+        "@aws-sdk/middleware-host-header": "^3.972.2",
+        "@aws-sdk/middleware-location-constraint": "^3.972.2",
+        "@aws-sdk/middleware-logger": "^3.972.2",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.2",
+        "@aws-sdk/middleware-sdk-s3": "^3.972.4",
+        "@aws-sdk/middleware-ssec": "^3.972.2",
+        "@aws-sdk/middleware-user-agent": "^3.972.4",
+        "@aws-sdk/region-config-resolver": "^3.972.2",
+        "@aws-sdk/signature-v4-multi-region": "3.972.0",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-endpoints": "3.972.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.2",
+        "@aws-sdk/util-user-agent-node": "^3.972.2",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/core": "^3.22.0",
+        "@smithy/eventstream-serde-browser": "^4.2.8",
+        "@smithy/eventstream-serde-config-resolver": "^4.3.8",
+        "@smithy/eventstream-serde-node": "^4.2.8",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/hash-blob-browser": "^4.2.9",
+        "@smithy/hash-node": "^4.2.8",
+        "@smithy/hash-stream-node": "^4.2.8",
+        "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/md5-js": "^4.2.8",
+        "@smithy/middleware-content-length": "^4.2.8",
+        "@smithy/middleware-endpoint": "^4.4.12",
+        "@smithy/middleware-retry": "^4.4.29",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/middleware-stack": "^4.2.8",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-body-length-browser": "^4.2.0",
+        "@smithy/util-body-length-node": "^4.2.1",
+        "@smithy/util-defaults-mode-browser": "^4.3.28",
+        "@smithy/util-defaults-mode-node": "^4.2.31",
+        "@smithy/util-endpoints": "^3.2.8",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-retry": "^4.2.8",
+        "@smithy/util-stream": "^4.5.10",
+        "@smithy/util-utf8": "^4.2.0",
+        "@smithy/util-waiter": "^4.2.8",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -462,49 +458,49 @@
       }
     },
     "node_modules/@aws-sdk/client-secrets-manager": {
-      "version": "3.997.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.997.0.tgz",
-      "integrity": "sha512-5r+1P1iuILRhtKk7j5gEvfiJpweHk5TWXFJl5BKKKuE47esgd2R5cAwyPJId/5cPJln2yC9qevz9zneoLpWNVw==",
+      "version": "3.978.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.978.0.tgz",
+      "integrity": "sha512-jhK0HIb6ALjNgsYQzptTc9kSn47uvXpJ1Ys9gdryloBa6fISKEHPz4P1Mgmn9Ph8pAR2F4ZL+bLbQYkox+MvBQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/credential-provider-node": "^3.972.12",
-        "@aws-sdk/middleware-host-header": "^3.972.4",
-        "@aws-sdk/middleware-logger": "^3.972.4",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.4",
-        "@aws-sdk/middleware-user-agent": "^3.972.13",
-        "@aws-sdk/region-config-resolver": "^3.972.4",
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/util-endpoints": "^3.996.1",
-        "@aws-sdk/util-user-agent-browser": "^3.972.4",
-        "@aws-sdk/util-user-agent-node": "^3.972.12",
-        "@smithy/config-resolver": "^4.4.7",
-        "@smithy/core": "^3.23.4",
-        "@smithy/fetch-http-handler": "^5.3.10",
-        "@smithy/hash-node": "^4.2.9",
-        "@smithy/invalid-dependency": "^4.2.9",
-        "@smithy/middleware-content-length": "^4.2.9",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/middleware-retry": "^4.4.35",
-        "@smithy/middleware-serde": "^4.2.10",
-        "@smithy/middleware-stack": "^4.2.9",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/node-http-handler": "^4.4.11",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-body-length-browser": "^4.2.1",
-        "@smithy/util-body-length-node": "^4.2.2",
-        "@smithy/util-defaults-mode-browser": "^4.3.34",
-        "@smithy/util-defaults-mode-node": "^4.2.37",
-        "@smithy/util-endpoints": "^3.2.9",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-retry": "^4.2.9",
-        "@smithy/util-utf8": "^4.2.1",
+        "@aws-sdk/core": "^3.973.4",
+        "@aws-sdk/credential-provider-node": "^3.972.2",
+        "@aws-sdk/middleware-host-header": "^3.972.2",
+        "@aws-sdk/middleware-logger": "^3.972.2",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.2",
+        "@aws-sdk/middleware-user-agent": "^3.972.4",
+        "@aws-sdk/region-config-resolver": "^3.972.2",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-endpoints": "3.972.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.2",
+        "@aws-sdk/util-user-agent-node": "^3.972.2",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/core": "^3.22.0",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/hash-node": "^4.2.8",
+        "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/middleware-content-length": "^4.2.8",
+        "@smithy/middleware-endpoint": "^4.4.12",
+        "@smithy/middleware-retry": "^4.4.29",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/middleware-stack": "^4.2.8",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-body-length-browser": "^4.2.0",
+        "@smithy/util-body-length-node": "^4.2.1",
+        "@smithy/util-defaults-mode-browser": "^4.3.28",
+        "@smithy/util-defaults-mode-node": "^4.2.31",
+        "@smithy/util-endpoints": "^3.2.8",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-retry": "^4.2.8",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -512,152 +508,99 @@
       }
     },
     "node_modules/@aws-sdk/client-ses": {
-      "version": "3.997.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-ses/-/client-ses-3.997.0.tgz",
-      "integrity": "sha512-FkzdUCmZagYJLcA3gEh7naDnCLdpNda1uwknMw0QwlVzeKm/SJtrLpR83nuCdbgn2yD8oiUWYp04n7pw4x9zWg==",
+      "version": "3.978.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-ses/-/client-ses-3.978.0.tgz",
+      "integrity": "sha512-DDVUjOBwi39tKwhRWpdc6toY3L08igegee8FRqysGr5NwwJOFGzHyQ233DXGQRii7v++AGoWNvVlOeBXNyytKg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/credential-provider-node": "^3.972.12",
-        "@aws-sdk/middleware-host-header": "^3.972.4",
-        "@aws-sdk/middleware-logger": "^3.972.4",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.4",
-        "@aws-sdk/middleware-user-agent": "^3.972.13",
-        "@aws-sdk/region-config-resolver": "^3.972.4",
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/util-endpoints": "^3.996.1",
-        "@aws-sdk/util-user-agent-browser": "^3.972.4",
-        "@aws-sdk/util-user-agent-node": "^3.972.12",
-        "@smithy/config-resolver": "^4.4.7",
-        "@smithy/core": "^3.23.4",
-        "@smithy/fetch-http-handler": "^5.3.10",
-        "@smithy/hash-node": "^4.2.9",
-        "@smithy/invalid-dependency": "^4.2.9",
-        "@smithy/middleware-content-length": "^4.2.9",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/middleware-retry": "^4.4.35",
-        "@smithy/middleware-serde": "^4.2.10",
-        "@smithy/middleware-stack": "^4.2.9",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/node-http-handler": "^4.4.11",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-body-length-browser": "^4.2.1",
-        "@smithy/util-body-length-node": "^4.2.2",
-        "@smithy/util-defaults-mode-browser": "^4.3.34",
-        "@smithy/util-defaults-mode-node": "^4.2.37",
-        "@smithy/util-endpoints": "^3.2.9",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-retry": "^4.2.9",
-        "@smithy/util-utf8": "^4.2.1",
-        "@smithy/util-waiter": "^4.2.9",
+        "@aws-sdk/core": "^3.973.4",
+        "@aws-sdk/credential-provider-node": "^3.972.2",
+        "@aws-sdk/middleware-host-header": "^3.972.2",
+        "@aws-sdk/middleware-logger": "^3.972.2",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.2",
+        "@aws-sdk/middleware-user-agent": "^3.972.4",
+        "@aws-sdk/region-config-resolver": "^3.972.2",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-endpoints": "3.972.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.2",
+        "@aws-sdk/util-user-agent-node": "^3.972.2",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/core": "^3.22.0",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/hash-node": "^4.2.8",
+        "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/middleware-content-length": "^4.2.8",
+        "@smithy/middleware-endpoint": "^4.4.12",
+        "@smithy/middleware-retry": "^4.4.29",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/middleware-stack": "^4.2.8",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-body-length-browser": "^4.2.0",
+        "@smithy/util-body-length-node": "^4.2.1",
+        "@smithy/util-defaults-mode-browser": "^4.3.28",
+        "@smithy/util-defaults-mode-node": "^4.2.31",
+        "@smithy/util-endpoints": "^3.2.8",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-retry": "^4.2.8",
+        "@smithy/util-utf8": "^4.2.0",
+        "@smithy/util-waiter": "^4.2.8",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/client-sqs": {
-      "version": "3.997.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sqs/-/client-sqs-3.997.0.tgz",
-      "integrity": "sha512-1kj518kNZn2Vnpb7x5WyBcQ4ajrq4WaCgC3ru7KI56LiGfl8/djVXn/kmV05QeFAc57snSdQggAmuRwlCJJp/g==",
+    "node_modules/@aws-sdk/client-sso": {
+      "version": "3.975.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.975.0.tgz",
+      "integrity": "sha512-HpgJuleH7P6uILxzJKQOmlHdwaCY+xYC6VgRDzlwVEqU/HXjo4m2gOAyjUbpXlBOCWfGgMUzfBlNJ9z3MboqEQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/credential-provider-node": "^3.972.12",
-        "@aws-sdk/middleware-host-header": "^3.972.4",
-        "@aws-sdk/middleware-logger": "^3.972.4",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.4",
-        "@aws-sdk/middleware-sdk-sqs": "^3.972.9",
-        "@aws-sdk/middleware-user-agent": "^3.972.13",
-        "@aws-sdk/region-config-resolver": "^3.972.4",
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/util-endpoints": "^3.996.1",
-        "@aws-sdk/util-user-agent-browser": "^3.972.4",
-        "@aws-sdk/util-user-agent-node": "^3.972.12",
-        "@smithy/config-resolver": "^4.4.7",
-        "@smithy/core": "^3.23.4",
-        "@smithy/fetch-http-handler": "^5.3.10",
-        "@smithy/hash-node": "^4.2.9",
-        "@smithy/invalid-dependency": "^4.2.9",
-        "@smithy/md5-js": "^4.2.9",
-        "@smithy/middleware-content-length": "^4.2.9",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/middleware-retry": "^4.4.35",
-        "@smithy/middleware-serde": "^4.2.10",
-        "@smithy/middleware-stack": "^4.2.9",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/node-http-handler": "^4.4.11",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-body-length-browser": "^4.2.1",
-        "@smithy/util-body-length-node": "^4.2.2",
-        "@smithy/util-defaults-mode-browser": "^4.3.34",
-        "@smithy/util-defaults-mode-node": "^4.2.37",
-        "@smithy/util-endpoints": "^3.2.9",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-retry": "^4.2.9",
-        "@smithy/util-utf8": "^4.2.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/client-textract": {
-      "version": "3.997.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-textract/-/client-textract-3.997.0.tgz",
-      "integrity": "sha512-pl9zXetJZkdQ0rCSjlg2Kpm3E9zYAZm/WA+POy1nPF0oRB0c07/x8apF1GzVlZNNR81hw4JU58pRKSfFSETyrg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-crypto/sha256-browser": "5.2.0",
-        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/credential-provider-node": "^3.972.12",
-        "@aws-sdk/middleware-host-header": "^3.972.4",
-        "@aws-sdk/middleware-logger": "^3.972.4",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.4",
-        "@aws-sdk/middleware-user-agent": "^3.972.13",
-        "@aws-sdk/region-config-resolver": "^3.972.4",
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/util-endpoints": "^3.996.1",
-        "@aws-sdk/util-user-agent-browser": "^3.972.4",
-        "@aws-sdk/util-user-agent-node": "^3.972.12",
-        "@smithy/config-resolver": "^4.4.7",
-        "@smithy/core": "^3.23.4",
-        "@smithy/fetch-http-handler": "^5.3.10",
-        "@smithy/hash-node": "^4.2.9",
-        "@smithy/invalid-dependency": "^4.2.9",
-        "@smithy/middleware-content-length": "^4.2.9",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/middleware-retry": "^4.4.35",
-        "@smithy/middleware-serde": "^4.2.10",
-        "@smithy/middleware-stack": "^4.2.9",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/node-http-handler": "^4.4.11",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-body-length-browser": "^4.2.1",
-        "@smithy/util-body-length-node": "^4.2.2",
-        "@smithy/util-defaults-mode-browser": "^4.3.34",
-        "@smithy/util-defaults-mode-node": "^4.2.37",
-        "@smithy/util-endpoints": "^3.2.9",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-retry": "^4.2.9",
-        "@smithy/util-utf8": "^4.2.1",
+        "@aws-sdk/core": "^3.973.1",
+        "@aws-sdk/middleware-host-header": "^3.972.1",
+        "@aws-sdk/middleware-logger": "^3.972.1",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.1",
+        "@aws-sdk/middleware-user-agent": "^3.972.2",
+        "@aws-sdk/region-config-resolver": "^3.972.1",
+        "@aws-sdk/types": "^3.973.0",
+        "@aws-sdk/util-endpoints": "3.972.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.1",
+        "@aws-sdk/util-user-agent-node": "^3.972.1",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/core": "^3.21.1",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/hash-node": "^4.2.8",
+        "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/middleware-content-length": "^4.2.8",
+        "@smithy/middleware-endpoint": "^4.4.11",
+        "@smithy/middleware-retry": "^4.4.27",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/middleware-stack": "^4.2.8",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.10.12",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-body-length-browser": "^4.2.0",
+        "@smithy/util-body-length-node": "^4.2.1",
+        "@smithy/util-defaults-mode-browser": "^4.3.26",
+        "@smithy/util-defaults-mode-node": "^4.2.29",
+        "@smithy/util-endpoints": "^3.2.8",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-retry": "^4.2.8",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -665,23 +608,23 @@
       }
     },
     "node_modules/@aws-sdk/core": {
-      "version": "3.973.13",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.13.tgz",
-      "integrity": "sha512-eCFiLyBhJR7c/i8hZOETdzj2wsLFzi2L/w9/jajOgwmGqO8xrUExqkTZqdjROkwU62owqeqSuw4sIzlCv1E/ww==",
+      "version": "3.973.4",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.4.tgz",
+      "integrity": "sha512-8Rk+kPP74YiR47x54bxYlKZswsaSh0a4XvvRUMLvyS/koNawhsGu/+qSZxREqUeTO+GkKpFvSQIsAZR+deUP+g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/xml-builder": "^3.972.6",
-        "@smithy/core": "^3.23.4",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/signature-v4": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-utf8": "^4.2.1",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/xml-builder": "^3.972.2",
+        "@smithy/core": "^3.22.0",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/signature-v4": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -689,12 +632,12 @@
       }
     },
     "node_modules/@aws-sdk/crc64-nvme": {
-      "version": "3.972.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/crc64-nvme/-/crc64-nvme-3.972.1.tgz",
-      "integrity": "sha512-CmT9RrQol36hUdvp4dk+BRV47JBRIE+I46yAOKyb/SoMH7mKOBwk6jUpFZhF8B+LCnWnefnM6jT/WsfQ5M1kCQ==",
+      "version": "3.972.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/crc64-nvme/-/crc64-nvme-3.972.0.tgz",
+      "integrity": "sha512-ThlLhTqX68jvoIVv+pryOdb5coP1cX1/MaTbB9xkGDCbWbsqQcLqzPxuSoW1DCnAAIacmXCWpzUNOB9pv+xXQw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.12.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -702,15 +645,15 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-env": {
-      "version": "3.972.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.11.tgz",
-      "integrity": "sha512-hbyoFuVm3qOAGfIPS9t7jCs8GFLFoaOs8ZmYp/chqciuHDyEGv+J365ip7YSvXSrxxUbeW9NyB1hTLt40NBMRg==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.2.tgz",
+      "integrity": "sha512-wzH1EdrZsytG1xN9UHaK12J9+kfrnd2+c8y0LVoS4O4laEjPoie1qVK3k8/rZe7KOtvULzyMnO3FT4Krr9Z0Dg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/core": "^3.973.2",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -718,20 +661,20 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-http": {
-      "version": "3.972.13",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.13.tgz",
-      "integrity": "sha512-a864QxQWFkdCZ5wQF0QZNKTbqAc/DFQNeARp4gOyZZdql5RHjj4CppUSfwAzS9cpw2IPY3eeJjWqLZ1QiDB/6w==",
+      "version": "3.972.4",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.4.tgz",
+      "integrity": "sha512-OC7F3ipXV12QfDEWybQGHLzoeHBlAdx/nLzPfHP0Wsabu3JBffu5nlzSaJNf7to9HGtOW8Bpu8NX0ugmDrCbtw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/fetch-http-handler": "^5.3.10",
-        "@smithy/node-http-handler": "^4.4.11",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-stream": "^4.5.14",
+        "@aws-sdk/core": "^3.973.4",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-stream": "^4.5.10",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -739,24 +682,24 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-ini": {
-      "version": "3.972.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.11.tgz",
-      "integrity": "sha512-kvPFn626ABLzxmjFMoqMRtmFKMeiUdWPhwxhmuPu233tqHnNuXzHv0MtrZlkzHd+rwlh9j0zCbQo89B54wIazQ==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.2.tgz",
+      "integrity": "sha512-Jrb8sLm6k8+L7520irBrvCtdLxNtrG7arIxe9TCeMJt/HxqMGJdbIjw8wILzkEHLMIi4MecF2FbXCln7OT1Tag==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/credential-provider-env": "^3.972.11",
-        "@aws-sdk/credential-provider-http": "^3.972.13",
-        "@aws-sdk/credential-provider-login": "^3.972.11",
-        "@aws-sdk/credential-provider-process": "^3.972.11",
-        "@aws-sdk/credential-provider-sso": "^3.972.11",
-        "@aws-sdk/credential-provider-web-identity": "^3.972.11",
-        "@aws-sdk/nested-clients": "^3.996.1",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/credential-provider-imds": "^4.2.9",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/shared-ini-file-loader": "^4.4.4",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/core": "^3.973.2",
+        "@aws-sdk/credential-provider-env": "^3.972.2",
+        "@aws-sdk/credential-provider-http": "^3.972.3",
+        "@aws-sdk/credential-provider-login": "^3.972.2",
+        "@aws-sdk/credential-provider-process": "^3.972.2",
+        "@aws-sdk/credential-provider-sso": "^3.972.2",
+        "@aws-sdk/credential-provider-web-identity": "^3.972.2",
+        "@aws-sdk/nested-clients": "3.975.0",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/credential-provider-imds": "^4.2.8",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/shared-ini-file-loader": "^4.4.3",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -764,18 +707,18 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.11.tgz",
-      "integrity": "sha512-stdy09EpBTmsxGiXe1vB5qtXNww9wact36/uWLlSV0/vWbCOUAY2JjhPXoDVLk8n+E6r0M5HeZseLk+iTtifxg==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.2.tgz",
+      "integrity": "sha512-mlaw2aiI3DrimW85ZMn3g7qrtHueidS58IGytZ+mbFpsYLK5wMjCAKZQtt7VatLMtSBG/dn/EY4njbnYXIDKeQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/nested-clients": "^3.996.1",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/shared-ini-file-loader": "^4.4.4",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/core": "^3.973.2",
+        "@aws-sdk/nested-clients": "3.975.0",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/shared-ini-file-loader": "^4.4.3",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -783,22 +726,22 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-node": {
-      "version": "3.972.12",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.12.tgz",
-      "integrity": "sha512-gMWGnHbNSKWRj+PAiuSg0EDpEwpyIgk0v9U6EuZ1C/5/BUv25Way+E+UFB7r+YYkscuBJMJ+ai8E2K0Q8dx50g==",
+      "version": "3.972.3",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.3.tgz",
+      "integrity": "sha512-iu+JwWHM7tHowKqE+8wNmI3sM6mPEiI9Egscz2BEV7adyKmV95oR9tBO4VIOl72FGDi7X9mXg19VtqIpSkEEsA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/credential-provider-env": "^3.972.11",
-        "@aws-sdk/credential-provider-http": "^3.972.13",
-        "@aws-sdk/credential-provider-ini": "^3.972.11",
-        "@aws-sdk/credential-provider-process": "^3.972.11",
-        "@aws-sdk/credential-provider-sso": "^3.972.11",
-        "@aws-sdk/credential-provider-web-identity": "^3.972.11",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/credential-provider-imds": "^4.2.9",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/shared-ini-file-loader": "^4.4.4",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/credential-provider-env": "^3.972.2",
+        "@aws-sdk/credential-provider-http": "^3.972.4",
+        "@aws-sdk/credential-provider-ini": "^3.972.2",
+        "@aws-sdk/credential-provider-process": "^3.972.2",
+        "@aws-sdk/credential-provider-sso": "^3.972.2",
+        "@aws-sdk/credential-provider-web-identity": "^3.972.2",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/credential-provider-imds": "^4.2.8",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/shared-ini-file-loader": "^4.4.3",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -806,16 +749,16 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-process": {
-      "version": "3.972.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.11.tgz",
-      "integrity": "sha512-B049fvbv41vf0Fs5bCtbzHpruBDp61sPiFDxUmkAJ/zvgSAturpj2rqzV1rj2clg4mb44Uxp9rgpcODexNFlFA==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.2.tgz",
+      "integrity": "sha512-NLKLTT7jnUe9GpQAVkPTJO+cs2FjlQDt5fArIYS7h/Iw/CvamzgGYGFRVD2SE05nOHCMwafUSi42If8esGFV+g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/shared-ini-file-loader": "^4.4.4",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/core": "^3.973.2",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/shared-ini-file-loader": "^4.4.3",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -823,18 +766,18 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-sso": {
-      "version": "3.972.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.11.tgz",
-      "integrity": "sha512-vX9z8skN8vPtamVWmSCm4KQohub+1uMuRzIo4urZ2ZUMBAl1bqHatVD/roCb3qRfAyIGvZXCA/AWS03BQRMyCQ==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.2.tgz",
+      "integrity": "sha512-YpwDn8g3gCGUl61cCV0sRxP2pFIwg+ZsMfWQ/GalSyjXtRkctCMFA+u0yPb/Q4uTfNEiya1Y4nm0C5rIHyPW5Q==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/nested-clients": "^3.996.1",
-        "@aws-sdk/token-providers": "3.997.0",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/shared-ini-file-loader": "^4.4.4",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/client-sso": "3.975.0",
+        "@aws-sdk/core": "^3.973.2",
+        "@aws-sdk/token-providers": "3.975.0",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/shared-ini-file-loader": "^4.4.3",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -842,17 +785,17 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-web-identity": {
-      "version": "3.972.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.11.tgz",
-      "integrity": "sha512-VR2Ju/QBdOjnWNIYuxRml63eFDLGc6Zl8aDwLi1rzgWo3rLBgtaWhWVBAijhVXzyPdQIOqdL8hvll5ybqumjeQ==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.2.tgz",
+      "integrity": "sha512-x9DAiN9Qz+NjJ99ltDiVQ8d511M/tuF/9MFbe2jUgo7HZhD6+x4S3iT1YcP07ndwDUjmzKGmeOEgE24k4qvfdg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/nested-clients": "^3.996.1",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/shared-ini-file-loader": "^4.4.4",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/core": "^3.973.2",
+        "@aws-sdk/nested-clients": "3.975.0",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/shared-ini-file-loader": "^4.4.3",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -860,14 +803,14 @@
       }
     },
     "node_modules/@aws-sdk/lib-storage": {
-      "version": "3.997.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.997.0.tgz",
-      "integrity": "sha512-G5z1CBZVCRStYjgCg3Qu9LjtWAGCUa0JouPU3o8nplSIzpBE4CCJBiWZj7q1/qiIyEBxChf9apqHYJMNN1LDOQ==",
+      "version": "3.978.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.978.0.tgz",
+      "integrity": "sha512-SvKpOdmhwI2mk4So73o2CDFWepcLO66p1YnngPPe9lrRl+apePsvyC++kwG2yYOTBVsRtsrvJwNBgPoDTO5itg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/abort-controller": "^4.2.9",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/smithy-client": "^4.11.7",
+        "@smithy/abort-controller": "^4.2.8",
+        "@smithy/middleware-endpoint": "^4.4.12",
+        "@smithy/smithy-client": "^4.11.1",
         "buffer": "5.6.0",
         "events": "3.3.0",
         "stream-browserify": "3.0.0",
@@ -877,21 +820,21 @@
         "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "@aws-sdk/client-s3": "^3.997.0"
+        "@aws-sdk/client-s3": "3.978.0"
       }
     },
     "node_modules/@aws-sdk/middleware-bucket-endpoint": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.972.4.tgz",
-      "integrity": "sha512-4W+1SPx5eWetSurqk7WNnldNr++k4UYcP2XmPnCf8yLFdUZ4NKKJA3j+zVuWmhOu7xKmEAyo9j3f+cy22CEVKg==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.972.2.tgz",
+      "integrity": "sha512-ofuXBnitp9j8t05O4NQVrpMZDECPtUhRIWdLzR35baR5njOIPY7YqNtJE+yELVpSn2m4jt2sV1ezYMBY4/Lo+w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
+        "@aws-sdk/types": "^3.973.1",
         "@aws-sdk/util-arn-parser": "^3.972.2",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-config-provider": "^4.2.1",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-config-provider": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -899,14 +842,14 @@
       }
     },
     "node_modules/@aws-sdk/middleware-expect-continue": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.972.4.tgz",
-      "integrity": "sha512-lxU2ieIWtK9nqWxA+W4ldev31tRPjkkdt+QDBWGiwUNJsNwSJFVhkuIV9cbBPxTCT0nmYyJwvJ/2TYYJLMwmMA==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.972.2.tgz",
+      "integrity": "sha512-d9bBQlGk1T5j5rWfof20M2tErddOSoSLDauP2/yyuXfeOfQRCSBUZNrApSxjJ9Hw+/RDGR/XL+LEOqmXxSlV3A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -914,24 +857,24 @@
       }
     },
     "node_modules/@aws-sdk/middleware-flexible-checksums": {
-      "version": "3.972.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.972.11.tgz",
-      "integrity": "sha512-niA/vhtS/xR4hEHIsPLEvgsccpqve+uJ4Gtizctsa21HfHmIZi5bWJD8kPcN+SfAgrlnuBG2YKFX0rRbzylg7A==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.972.2.tgz",
+      "integrity": "sha512-GgWVZJdzXzqhXxzNAYB3TnZCj7d5rZNdovqSIV91e97nowHVaExRoyaZ3H/Ydqot7veHGPTl8nBp464zZeLDTQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/crc32": "5.2.0",
         "@aws-crypto/crc32c": "5.2.0",
         "@aws-crypto/util": "5.2.0",
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/crc64-nvme": "^3.972.1",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/is-array-buffer": "^4.2.1",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-stream": "^4.5.14",
-        "@smithy/util-utf8": "^4.2.1",
+        "@aws-sdk/core": "^3.973.2",
+        "@aws-sdk/crc64-nvme": "3.972.0",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/is-array-buffer": "^4.2.0",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-stream": "^4.5.10",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -939,14 +882,14 @@
       }
     },
     "node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.4.tgz",
-      "integrity": "sha512-4q2Vg7/zOB10huDBLjzzTwVjBpG22X3J3ief2XrJEgTaANZrNfA3/cGbCVNAibSbu/nIYA7tDk8WCdsIzDDc4Q==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.2.tgz",
+      "integrity": "sha512-42hZ8jEXT2uR6YybCzNq9OomqHPw43YIfRfz17biZjMQA4jKSQUaHIl6VvqO2Ddl5904pXg2Yd/ku78S0Ikgog==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -954,13 +897,13 @@
       }
     },
     "node_modules/@aws-sdk/middleware-location-constraint": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.972.4.tgz",
-      "integrity": "sha512-EP1qs0JV2smcKhZpwDMuzMBx9Q5qyU/RuZ02/qh/yBA3jnZKuNhB1lsQKkicvXg7LOeoqyxXLKOP/PJOugX8yg==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.972.2.tgz",
+      "integrity": "sha512-pyayzpq+VQiG1o9pEUyr6BXEJ2g2t4JIPdNxDkIHp2AhR63Gy/10WQkXTBOgRnfQ7/aLPLOnjRIWwOPp0CfUlA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -968,13 +911,13 @@
       }
     },
     "node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.4.tgz",
-      "integrity": "sha512-xFqPvTysuZAHSkdygT+ken/5rzkR7fhOoDPejAJQslZpp0XBepmCJnDOqA57ERtCTBpu8wpjTFI1ETd4S0AXEw==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.2.tgz",
+      "integrity": "sha512-iUzdXKOgi4JVDDEG/VvoNw50FryRCEm0qAudw12DcZoiNJWl0rN6SYVLcL1xwugMfQncCXieK5UBlG6mhH7iYA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -982,15 +925,15 @@
       }
     },
     "node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.4.tgz",
-      "integrity": "sha512-tVbRaayUZ7y2bOb02hC3oEPTqQf2A0HpPDwdMl1qTmye/q8Mq1F1WiIoFkQwG/YQFvbyErYIDMbYzIlxzzLtjQ==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.2.tgz",
+      "integrity": "sha512-/mzlyzJDtngNFd/rAYvqx29a2d0VuiYKN84Y/Mu9mGw7cfMOCyRK+896tb9wV6MoPRHUX7IXuKCIL8nzz2Pz5A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
+        "@aws-sdk/types": "^3.973.1",
         "@aws/lambda-invoke-store": "^0.2.2",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/types": "^4.12.1",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -998,41 +941,24 @@
       }
     },
     "node_modules/@aws-sdk/middleware-sdk-s3": {
-      "version": "3.972.13",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.13.tgz",
-      "integrity": "sha512-rGBz1n6PFxg1+5mnN1/IczesPwx0W39DZt2JPjqPiZAZ7LAqH8FS4AsawSNZqr+UFJfqtTXYpeLQnMfbMAgHhg==",
+      "version": "3.972.4",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.4.tgz",
+      "integrity": "sha512-lradfn72Td7lswhZKi86VKRNkDtmQR7bq9shX1kaPK1itjThxfcx7ogXSvMm/0cuqoYGic8UUXQOaK4kpU933g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/types": "^3.973.2",
+        "@aws-sdk/core": "^3.973.4",
+        "@aws-sdk/types": "^3.973.1",
         "@aws-sdk/util-arn-parser": "^3.972.2",
-        "@smithy/core": "^3.23.4",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/signature-v4": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-config-provider": "^4.2.1",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-stream": "^4.5.14",
-        "@smithy/util-utf8": "^4.2.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/middleware-sdk-sqs": {
-      "version": "3.972.9",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sqs/-/middleware-sdk-sqs-3.972.9.tgz",
-      "integrity": "sha512-wM2OXD1J2KeIOv/sWTmt+FrOhoR0Ujj5jtoW69ArXJqobY2hFJj8CLRuOEGWoVUNRUcNQBKvL8QbkzrAI7tnCw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-hex-encoding": "^4.2.1",
-        "@smithy/util-utf8": "^4.2.1",
+        "@smithy/core": "^3.22.0",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/signature-v4": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-config-provider": "^4.2.0",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-stream": "^4.5.10",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1040,13 +966,13 @@
       }
     },
     "node_modules/@aws-sdk/middleware-ssec": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.972.4.tgz",
-      "integrity": "sha512-jzysKNnfwqjTOeF4s1QcxYQ8WB1ZIw/KMhOAX2UGYsmpVPHZ1cV6IYRfBQnt0qnDYom1pU3b5jOG8TA9n6LAbQ==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.972.2.tgz",
+      "integrity": "sha512-HJ3OmQnlQ1es6esrDWnx3nVPhBAN89WaFCzsDcb6oT7TMjBPUfZ5+1BpI7B0Hnme8cc6kp7qc4cgo2plrlROJA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1054,17 +980,17 @@
       }
     },
     "node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.972.13",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.13.tgz",
-      "integrity": "sha512-p1kVYbzBxRmhuOHoL/ANJPCedqUxnVgkEjxPoxt5pQv/yzppHM7aBWciYEE9TZY59M421D3GjLfZIZBoEFboVQ==",
+      "version": "3.972.4",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.4.tgz",
+      "integrity": "sha512-6sU8jrSJvY/lqSnU6IYsa8SrCKwOZ4Enl6O4xVJo8RCq9Bdr5Giuw2eUaJAk9GPcpr4OFcmSFv3JOLhpKGeRZA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/util-endpoints": "^3.996.1",
-        "@smithy/core": "^3.23.4",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/core": "^3.973.4",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-endpoints": "3.972.0",
+        "@smithy/core": "^3.22.0",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1072,48 +998,48 @@
       }
     },
     "node_modules/@aws-sdk/nested-clients": {
-      "version": "3.996.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.1.tgz",
-      "integrity": "sha512-XHVLFRGkuV2gh2uwBahCt65ALMb5wMpqplXEZIvFnWOCPlk60B7h7M5J9Em243K8iICDiWY6KhBEqVGfjTqlLA==",
+      "version": "3.975.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.975.0.tgz",
+      "integrity": "sha512-OkeFHPlQj2c/Y5bQGkX14pxhDWUGUFt3LRHhjcDKsSCw6lrxKcxN3WFZN0qbJwKNydP+knL5nxvfgKiCLpTLRA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/middleware-host-header": "^3.972.4",
-        "@aws-sdk/middleware-logger": "^3.972.4",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.4",
-        "@aws-sdk/middleware-user-agent": "^3.972.13",
-        "@aws-sdk/region-config-resolver": "^3.972.4",
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/util-endpoints": "^3.996.1",
-        "@aws-sdk/util-user-agent-browser": "^3.972.4",
-        "@aws-sdk/util-user-agent-node": "^3.972.12",
-        "@smithy/config-resolver": "^4.4.7",
-        "@smithy/core": "^3.23.4",
-        "@smithy/fetch-http-handler": "^5.3.10",
-        "@smithy/hash-node": "^4.2.9",
-        "@smithy/invalid-dependency": "^4.2.9",
-        "@smithy/middleware-content-length": "^4.2.9",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/middleware-retry": "^4.4.35",
-        "@smithy/middleware-serde": "^4.2.10",
-        "@smithy/middleware-stack": "^4.2.9",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/node-http-handler": "^4.4.11",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-body-length-browser": "^4.2.1",
-        "@smithy/util-body-length-node": "^4.2.2",
-        "@smithy/util-defaults-mode-browser": "^4.3.34",
-        "@smithy/util-defaults-mode-node": "^4.2.37",
-        "@smithy/util-endpoints": "^3.2.9",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-retry": "^4.2.9",
-        "@smithy/util-utf8": "^4.2.1",
+        "@aws-sdk/core": "^3.973.1",
+        "@aws-sdk/middleware-host-header": "^3.972.1",
+        "@aws-sdk/middleware-logger": "^3.972.1",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.1",
+        "@aws-sdk/middleware-user-agent": "^3.972.2",
+        "@aws-sdk/region-config-resolver": "^3.972.1",
+        "@aws-sdk/types": "^3.973.0",
+        "@aws-sdk/util-endpoints": "3.972.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.1",
+        "@aws-sdk/util-user-agent-node": "^3.972.1",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/core": "^3.21.1",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/hash-node": "^4.2.8",
+        "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/middleware-content-length": "^4.2.8",
+        "@smithy/middleware-endpoint": "^4.4.11",
+        "@smithy/middleware-retry": "^4.4.27",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/middleware-stack": "^4.2.8",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.10.12",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-body-length-browser": "^4.2.0",
+        "@smithy/util-body-length-node": "^4.2.1",
+        "@smithy/util-defaults-mode-browser": "^4.3.26",
+        "@smithy/util-defaults-mode-node": "^4.2.29",
+        "@smithy/util-endpoints": "^3.2.8",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-retry": "^4.2.8",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1121,15 +1047,15 @@
       }
     },
     "node_modules/@aws-sdk/region-config-resolver": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.4.tgz",
-      "integrity": "sha512-3GrJYv5eI65oCKveBZP7Q246dVP+tqeys9aKMB0dfX1glUWfppWlxIu52derqdNb9BX9lxYmeiaBcBIqOAYSgQ==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.2.tgz",
+      "integrity": "sha512-/7vRBsfmiOlg2X67EdKrzzQGw5/SbkXb7ALHQmlQLkZh8qNgvS2G2dDC6NtF3hzFlpP3j2k+KIEtql/6VrI6JA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/config-resolver": "^4.4.7",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1137,18 +1063,18 @@
       }
     },
     "node_modules/@aws-sdk/s3-request-presigner": {
-      "version": "3.997.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.997.0.tgz",
-      "integrity": "sha512-C5tV0o3OATA9lBnTYIBgKonj6gTIo1KSbmUu/FFgVN8mZvTMbJqdXqf/c83EDAFHNED+0I5zcjl9GkSGZTz7Sg==",
+      "version": "3.978.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.978.0.tgz",
+      "integrity": "sha512-P+SZrny/BT/x9w4BBM9IUr17jjDL7Rg/FjXKqh9viV81i/68Eu6gHBtS/JzvNF+rpG5gdZcMnBSANZqbnEbDmA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/signature-v4-multi-region": "^3.996.1",
-        "@aws-sdk/types": "^3.973.2",
-        "@aws-sdk/util-format-url": "^3.972.4",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/signature-v4-multi-region": "3.972.0",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-format-url": "^3.972.2",
+        "@smithy/middleware-endpoint": "^4.4.12",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1156,34 +1082,140 @@
       }
     },
     "node_modules/@aws-sdk/signature-v4-multi-region": {
-      "version": "3.996.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.996.1.tgz",
-      "integrity": "sha512-Mj4npuEtVHFjGZHTBwhBvBzmgKHY7UsfroZWWzjpVP5YJaMTPeihsotuQLba5uQthEZyaeWs6dTu3Shr0qKFFw==",
+      "version": "3.972.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.972.0.tgz",
+      "integrity": "sha512-2udiRijmjpN81Pvajje4TsjbXDZNP6K9bYUanBYH8hXa/tZG5qfGCySD+TyX0sgDxCQmEDMg3LaQdfjNHBDEgQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/middleware-sdk-s3": "^3.972.13",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/signature-v4": "^5.3.9",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/middleware-sdk-s3": "3.972.0",
+        "@aws-sdk/types": "3.972.0",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/signature-v4": "^5.3.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/token-providers": {
-      "version": "3.997.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.997.0.tgz",
-      "integrity": "sha512-UdG36F7lU9aTqGFRieEyuRUJlgEJBqKeKKekC0esH21DbUSKhPR1kZBah214kYasIaWe1hLJLaqUigoTa5hZAQ==",
+    "node_modules/@aws-sdk/signature-v4-multi-region/node_modules/@aws-sdk/core": {
+      "version": "3.972.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.972.0.tgz",
+      "integrity": "sha512-nEeUW2M9F+xdIaD98F5MBcQ4ITtykj3yKbgFZ6J0JtL3bq+Z90szQ6Yy8H/BLPYXTs3V4n9ifnBo8cprRDiE6A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.13",
-        "@aws-sdk/nested-clients": "^3.996.1",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/shared-ini-file-loader": "^4.4.4",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/types": "3.972.0",
+        "@aws-sdk/xml-builder": "3.972.0",
+        "@smithy/core": "^3.20.6",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/signature-v4": "^5.3.8",
+        "@smithy/smithy-client": "^4.10.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-utf8": "^4.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/signature-v4-multi-region/node_modules/@aws-sdk/middleware-sdk-s3": {
+      "version": "3.972.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.0.tgz",
+      "integrity": "sha512-0bcKFXWx+NZ7tIlOo7KjQ+O2rydiHdIQahrq+fN6k9Osky29v17guy68urUKfhTobR6iY6KvxkroFWaFtTgS5w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/core": "3.972.0",
+        "@aws-sdk/types": "3.972.0",
+        "@aws-sdk/util-arn-parser": "3.972.0",
+        "@smithy/core": "^3.20.6",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/signature-v4": "^5.3.8",
+        "@smithy/smithy-client": "^4.10.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-config-provider": "^4.2.0",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-stream": "^4.5.10",
+        "@smithy/util-utf8": "^4.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/signature-v4-multi-region/node_modules/@aws-sdk/types": {
+      "version": "3.972.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.972.0.tgz",
+      "integrity": "sha512-U7xBIbLSetONxb2bNzHyDgND3oKGoIfmknrEVnoEU4GUSs+0augUOIn9DIWGUO2ETcRFdsRUnmx9KhPT9Ojbug==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/types": "^4.12.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/signature-v4-multi-region/node_modules/@aws-sdk/util-arn-parser": {
+      "version": "3.972.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.972.0.tgz",
+      "integrity": "sha512-RM5Mmo/KJ593iMSrALlHEOcc9YOIyOsDmS5x2NLOMdEmzv1o00fcpAkCQ02IGu1eFneBFT7uX0Mpag0HI+Cz2g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/signature-v4-multi-region/node_modules/@aws-sdk/xml-builder": {
+      "version": "3.972.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.0.tgz",
+      "integrity": "sha512-POaGMcXnozzqBUyJM3HLUZ9GR6OKJWPGJEmhtTnxZXt8B6JcJ/6K3xRJ5H/j8oovVLz8Wg6vFxAHv8lvuASxMg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/types": "^4.12.0",
+        "fast-xml-parser": "5.2.5",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/signature-v4-multi-region/node_modules/fast-xml-parser": {
+      "version": "5.2.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",
+      "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "strnum": "^2.1.0"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
+    "node_modules/@aws-sdk/token-providers": {
+      "version": "3.975.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.975.0.tgz",
+      "integrity": "sha512-AWQt64hkVbDQ+CmM09wnvSk2mVyH4iRROkmYkr3/lmUtFNbE2L/fnw26sckZnUcFCsHPqbkQrcsZAnTcBLbH4w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/core": "^3.973.1",
+        "@aws-sdk/nested-clients": "3.975.0",
+        "@aws-sdk/types": "^3.973.0",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/shared-ini-file-loader": "^4.4.3",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1191,12 +1223,12 @@
       }
     },
     "node_modules/@aws-sdk/types": {
-      "version": "3.973.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.2.tgz",
-      "integrity": "sha512-maTZwGsALtnAw4TJr/S6yERAosTwPduu0XhUV+SdbvRZtCOgSgk1ttL2R0XYzvkYSpvbtJocn77tBXq2AKglBw==",
+      "version": "3.973.1",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.1.tgz",
+      "integrity": "sha512-DwHBiMNOB468JiX6+i34c+THsKHErYUdNQ3HexeXZvVn4zouLjgaS4FejiGSi2HyBuzuyHg7SuOPmjSvoU9NRg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.12.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1216,15 +1248,28 @@
       }
     },
     "node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.996.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.996.1.tgz",
-      "integrity": "sha512-7cJyd+M5i0IoqWkJa1KFx8KNCGIx+Ywu+lT53KpqX7ReVwz03DCKUqvZ/y65vdKwo9w9/HptSAeLDluO5MpGIg==",
+      "version": "3.972.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.972.0.tgz",
+      "integrity": "sha512-6JHsl1V/a1ZW8D8AFfd4R52fwZPnZ5H4U6DS8m/bWT8qad72NvbOFAC7U2cDtFs2TShqUO3TEiX/EJibtY3ijg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
-        "@smithy/util-endpoints": "^3.2.9",
+        "@aws-sdk/types": "3.972.0",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-endpoints": "^3.2.8",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/util-endpoints/node_modules/@aws-sdk/types": {
+      "version": "3.972.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.972.0.tgz",
+      "integrity": "sha512-U7xBIbLSetONxb2bNzHyDgND3oKGoIfmknrEVnoEU4GUSs+0augUOIn9DIWGUO2ETcRFdsRUnmx9KhPT9Ojbug==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1232,14 +1277,14 @@
       }
     },
     "node_modules/@aws-sdk/util-format-url": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.972.4.tgz",
-      "integrity": "sha512-rPm9g4WvgTz4ko5kqseIG5Vp5LUAbWBBDalm4ogHLMc0i20ChwQWqwuTUPJSu8zXn43jIM0xO2KZaYQsFJb+ew==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.972.2.tgz",
+      "integrity": "sha512-RCd8eur5wzDLgFBvbBhoFQ1bw1wxHJiN88MQ82IiJBs6OGXTWaf0oFgLbK06qJvnVUqL13t3jEnlYPHPNdgBWw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/querystring-builder": "^4.2.9",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/querystring-builder": "^4.2.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1259,27 +1304,27 @@
       }
     },
     "node_modules/@aws-sdk/util-user-agent-browser": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.4.tgz",
-      "integrity": "sha512-GHb+8XHv6hfLWKQKAKaSOm+vRvogg07s+FWtbR3+eCXXPSFn9XVmiYF4oypAxH7dGIvoxkVG/buHEnzYukyJiA==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.2.tgz",
+      "integrity": "sha512-gz76bUyebPZRxIsBHJUd/v+yiyFzm9adHbr8NykP2nm+z/rFyvQneOHajrUejtmnc5tTBeaDPL4X25TnagRk4A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/types": "^4.12.0",
         "bowser": "^2.11.0",
         "tslib": "^2.6.2"
       }
     },
     "node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.972.12",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.972.12.tgz",
-      "integrity": "sha512-c1n3wBK6te+Vd9qU86nF8AsYuiBsxLn0AADGWyFX7vEADr3btaAg5iPQT6GYj6rvzSOEVVisvaAatOWInlJUbQ==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.972.2.tgz",
+      "integrity": "sha512-vnxOc4C6AR7hVbwyFo1YuH0GB6dgJlWt8nIOOJpnzJAWJPkUMPJ9Zv2lnKsSU7TTZbhP2hEO8OZ4PYH59XFv8Q==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/middleware-user-agent": "^3.972.13",
-        "@aws-sdk/types": "^3.973.2",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/types": "^4.12.1",
+        "@aws-sdk/middleware-user-agent": "^3.972.3",
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1295,13 +1340,13 @@
       }
     },
     "node_modules/@aws-sdk/xml-builder": {
-      "version": "3.972.6",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.6.tgz",
-      "integrity": "sha512-YrXu+UnfC8IdARa4ZkrpcyuRmA/TVgYW6Lcdtvi34NQgRjM1hTirNirN+rGb+s/kNomby8oJiIAu0KNbiZC7PA==",
+      "version": "3.972.2",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.2.tgz",
+      "integrity": "sha512-jGOOV/bV1DhkkUhHiZ3/1GZ67cZyOXaDb7d1rYD6ZiXf5V9tBNOcgqXwRRPvrCbYaFRa1pPMFb3ZjqjWpR3YfA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.12.1",
-        "fast-xml-parser": "5.3.6",
+        "@smithy/types": "^4.12.0",
+        "fast-xml-parser": "5.2.5",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -1309,9 +1354,9 @@
       }
     },
     "node_modules/@aws-sdk/xml-builder/node_modules/fast-xml-parser": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.6.tgz",
-      "integrity": "sha512-QNI3sAvSvaOiaMl8FYU4trnEzCwiRr8XMWgAHzlrWpTSj+QaCSvOf1h82OEP1s4hiAXhnbXSyFWCf4ldZzZRVA==",
+      "version": "5.2.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",
+      "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==",
       "funding": [
         {
           "type": "github",
@@ -1320,7 +1365,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "strnum": "^2.1.2"
+        "strnum": "^2.1.0"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
@@ -2295,6 +2340,27 @@
       "integrity": "sha512-eUgLqrMf8nJkZxT24JvVRrQya1vZkQh8BBeYNwGDqa5I0VUi8ACx7uFvAaLxintokpTenkK6DASvo/bvNbBGow==",
       "license": "MIT"
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -2511,24 +2577,6 @@
         "@noble/hashes": "^1.1.5"
       }
     },
-    "node_modules/@pdf-lib/standard-fonts": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@pdf-lib/standard-fonts/-/standard-fonts-1.0.0.tgz",
-      "integrity": "sha512-hU30BK9IUN/su0Mn9VdlVKsWBS6GyhVfqjwl1FjZN4TxP6cCw0jP2w7V3Hf5uX7M0AZJ16vey9yE0ny7Sa59ZA==",
-      "license": "MIT",
-      "dependencies": {
-        "pako": "^1.0.6"
-      }
-    },
-    "node_modules/@pdf-lib/upng": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@pdf-lib/upng/-/upng-1.0.1.tgz",
-      "integrity": "sha512-dQK2FUMQtowVP00mtIksrlZhdFXQZPC+taih1q4CvPZ5vqdxR/LKBaFg0oAfzd1GlHZXXSPdQfzQnt+ViGvEIQ==",
-      "license": "MIT",
-      "dependencies": {
-        "pako": "^1.0.10"
-      }
-    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -2964,12 +3012,12 @@
       ]
     },
     "node_modules/@smithy/abort-controller": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.2.10.tgz",
-      "integrity": "sha512-qocxM/X4XGATqQtUkbE9SPUB6wekBi+FyJOMbPj0AhvyvFGYEmOlz6VB22iMePCQsFmMIvFSeViDvA7mZJG47g==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.2.8.tgz",
+      "integrity": "sha512-peuVfkYHAmS5ybKxWcfraK7WBBP0J+rkfUcbHJJKQ4ir3UAUNQI+Y4Vt/PqSzGqgloJ5O1dk7+WzNL8wcCSXbw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.0",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2977,9 +3025,9 @@
       }
     },
     "node_modules/@smithy/chunked-blob-reader": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.2.1.tgz",
-      "integrity": "sha512-y5d4xRiD6TzeP5BWlb+Ig/VFqF+t9oANNhGeMqyzU7obw7FYgTgVi50i5JqBTeKp+TABeDIeeXFZdz65RipNtA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.2.0.tgz",
+      "integrity": "sha512-WmU0TnhEAJLWvfSeMxBNe5xtbselEO8+4wG0NtZeL8oR21WgH1xiO37El+/Y+H/Ie4SCwBy3MxYWmOYaGgZueA==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -2989,12 +3037,12 @@
       }
     },
     "node_modules/@smithy/chunked-blob-reader-native": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.2.2.tgz",
-      "integrity": "sha512-QzzYIlf4yg0w5TQaC9VId3B3ugSk1MI/wb7tgcHtd7CBV9gNRKZrhc2EPSxSZuDy10zUZ0lomNMgkc6/VVe8xg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.2.1.tgz",
+      "integrity": "sha512-lX9Ay+6LisTfpLid2zZtIhSEjHMZoAR5hHCR4H7tBz/Zkfr5ea8RcQ7Tk4mi0P76p4cN+Btz16Ffno7YHpKXnQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/util-base64": "^4.3.1",
+        "@smithy/util-base64": "^4.3.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3002,16 +3050,16 @@
       }
     },
     "node_modules/@smithy/config-resolver": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.4.7.tgz",
-      "integrity": "sha512-RISbtc12JKdFRYadt2kW12Cp6XCSU00uFaBZPZqInNVSrRdJFPY/S6nd6/sV7+ySTgGPiKrERtnimEFI6sSweQ==",
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.4.6.tgz",
+      "integrity": "sha512-qJpzYC64kaj3S0fueiu3kXm8xPrR3PcXDPEgnaNMRn0EjNSZFoFjvbUp0YUDsRhN1CB90EnHJtbxWKevnH99UQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-config-provider": "^4.2.1",
-        "@smithy/util-endpoints": "^3.2.9",
-        "@smithy/util-middleware": "^4.2.9",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-config-provider": "^4.2.0",
+        "@smithy/util-endpoints": "^3.2.8",
+        "@smithy/util-middleware": "^4.2.8",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3019,20 +3067,20 @@
       }
     },
     "node_modules/@smithy/core": {
-      "version": "3.23.4",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.23.4.tgz",
-      "integrity": "sha512-IH7G3hWxUhd2Z6HtvjZ1EiyDBCRYRr2sngOB9KUWf96XQ8JP2O5ascUH6TouW5YCIMFaVnKADEscM/vUfI3TvA==",
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.22.0.tgz",
+      "integrity": "sha512-6vjCHD6vaY8KubeNw2Fg3EK0KLGQYdldG4fYgQmA0xSW0dJ8G2xFhSOdrlUakWVoP5JuWHtFODg3PNd/DN3FDA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/middleware-serde": "^4.2.10",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-body-length-browser": "^4.2.1",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-stream": "^4.5.14",
-        "@smithy/util-utf8": "^4.2.1",
-        "@smithy/uuid": "^1.1.1",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-body-length-browser": "^4.2.0",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-stream": "^4.5.10",
+        "@smithy/util-utf8": "^4.2.0",
+        "@smithy/uuid": "^1.1.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3040,15 +3088,15 @@
       }
     },
     "node_modules/@smithy/credential-provider-imds": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.9.tgz",
-      "integrity": "sha512-Jf723a38EGAzWHxJHzb9DtBq7lrvdJlkCAPWQdN/oiznovx5yWXCFCVspzDe8JU6b+k9hJXYB5duFZpb+3mB6Q==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.8.tgz",
+      "integrity": "sha512-FNT0xHS1c/CPN8upqbMFP83+ul5YgdisfCfkZ86Jh2NSmnqw/AJ6x5pEogVCTVvSm7j9MopRU89bmDelxuDMYw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3056,14 +3104,14 @@
       }
     },
     "node_modules/@smithy/eventstream-codec": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-4.2.10.tgz",
-      "integrity": "sha512-A4ynrsFFfSXUHicfTcRehytppFBcY3HQxEGYiyGktPIOye3Ot7fxpiy4VR42WmtGI4Wfo6OXt/c1Ky1nUFxYYQ==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-4.2.8.tgz",
+      "integrity": "sha512-jS/O5Q14UsufqoGhov7dHLOPCzkYJl9QDzusI2Psh4wyYx/izhzvX9P4D69aTxcdfVhEPhjK+wYyn/PzLjKbbw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/crc32": "5.2.0",
-        "@smithy/types": "^4.13.0",
-        "@smithy/util-hex-encoding": "^4.2.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-hex-encoding": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3071,13 +3119,13 @@
       }
     },
     "node_modules/@smithy/eventstream-serde-browser": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.2.10.tgz",
-      "integrity": "sha512-0xupsu9yj9oDVuQ50YCTS9nuSYhGlrwqdaKQel9y2Fz7LU9fNErVlw9N0o4pm4qqvWEGbSTI4HKc6XJfB30MVw==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.2.8.tgz",
+      "integrity": "sha512-MTfQT/CRQz5g24ayXdjg53V0mhucZth4PESoA5IhvaWVDTOQLfo8qI9vzqHcPsdd2v6sqfTYqF5L/l+pea5Uyw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/eventstream-serde-universal": "^4.2.10",
-        "@smithy/types": "^4.13.0",
+        "@smithy/eventstream-serde-universal": "^4.2.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3085,12 +3133,12 @@
       }
     },
     "node_modules/@smithy/eventstream-serde-config-resolver": {
-      "version": "4.3.10",
-      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.3.10.tgz",
-      "integrity": "sha512-8kn6sinrduk0yaYHMJDsNuiFpXwQwibR7n/4CDUqn4UgaG+SeBHu5jHGFdU9BLFAM7Q4/gvr9RYxBHz9/jKrhA==",
+      "version": "4.3.8",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.3.8.tgz",
+      "integrity": "sha512-ah12+luBiDGzBruhu3efNy1IlbwSEdNiw8fOZksoKoWW1ZHvO/04MQsdnws/9Aj+5b0YXSSN2JXKy/ClIsW8MQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.0",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3098,13 +3146,13 @@
       }
     },
     "node_modules/@smithy/eventstream-serde-node": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.2.10.tgz",
-      "integrity": "sha512-uUrxPGgIffnYfvIOUmBM5i+USdEBRTdh7mLPttjphgtooxQ8CtdO1p6K5+Q4BBAZvKlvtJ9jWyrWpBJYzBKsyQ==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.2.8.tgz",
+      "integrity": "sha512-cYpCpp29z6EJHa5T9WL0KAlq3SOKUQkcgSoeRfRVwjGgSFl7Uh32eYGt7IDYCX20skiEdRffyDpvF2efEZPC0A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/eventstream-serde-universal": "^4.2.10",
-        "@smithy/types": "^4.13.0",
+        "@smithy/eventstream-serde-universal": "^4.2.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3112,13 +3160,13 @@
       }
     },
     "node_modules/@smithy/eventstream-serde-universal": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.2.10.tgz",
-      "integrity": "sha512-aArqzOEvcs2dK+xQVCgLbpJQGfZihw8SD4ymhkwNTtwKbnrzdhJsFDKuMQnam2kF69WzgJYOU5eJlCx+CA32bw==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.2.8.tgz",
+      "integrity": "sha512-iJ6YNJd0bntJYnX6s52NC4WFYcZeKrPUr1Kmmr5AwZcwCSzVpS7oavAmxMR7pMq7V+D1G4s9F5NJK0xwOsKAlQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/eventstream-codec": "^4.2.10",
-        "@smithy/types": "^4.13.0",
+        "@smithy/eventstream-codec": "^4.2.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3126,15 +3174,15 @@
       }
     },
     "node_modules/@smithy/fetch-http-handler": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.10.tgz",
-      "integrity": "sha512-qF4EcrEtEf2P6f2kGGuSVe1lan26cn7PsWJBC3vZJ6D16Fm5FSN06udOMVoW6hjzQM3W7VDFwtyUG2szQY50dA==",
+      "version": "5.3.9",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.9.tgz",
+      "integrity": "sha512-I4UhmcTYXBrct03rwzQX1Y/iqQlzVQaPxWjCjula++5EmWq9YGBrx6bbGqluGc1f0XEfhSkiY4jhLgbsJUMKRA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/querystring-builder": "^4.2.9",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-base64": "^4.3.1",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/querystring-builder": "^4.2.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-base64": "^4.3.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3142,14 +3190,14 @@
       }
     },
     "node_modules/@smithy/hash-blob-browser": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-4.2.11.tgz",
-      "integrity": "sha512-DrcAx3PM6AEbWZxsKl6CWAGnVwiz28Wp1ZhNu+Hi4uI/6C1PIZBIaPM2VoqBDAsOWbM6ZVzOEQMxFLLdmb4eBQ==",
+      "version": "4.2.9",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-4.2.9.tgz",
+      "integrity": "sha512-m80d/iicI7DlBDxyQP6Th7BW/ejDGiF0bgI754+tiwK0lgMkcaIBgvwwVc7OFbY4eUzpGtnig52MhPAEJ7iNYg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/chunked-blob-reader": "^5.2.1",
-        "@smithy/chunked-blob-reader-native": "^4.2.2",
-        "@smithy/types": "^4.13.0",
+        "@smithy/chunked-blob-reader": "^5.2.0",
+        "@smithy/chunked-blob-reader-native": "^4.2.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3157,14 +3205,14 @@
       }
     },
     "node_modules/@smithy/hash-node": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.2.10.tgz",
-      "integrity": "sha512-1VzIOI5CcsvMDvP3iv1vG/RfLJVVVc67dCRyLSB2Hn9SWCZrDO3zvcIzj3BfEtqRW5kcMg5KAeVf1K3dR6nD3w==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.2.8.tgz",
+      "integrity": "sha512-7ZIlPbmaDGxVoxErDZnuFG18WekhbA/g2/i97wGj+wUBeS6pcUeAym8u4BXh/75RXWhgIJhyC11hBzig6MljwA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.0",
-        "@smithy/util-buffer-from": "^4.2.1",
-        "@smithy/util-utf8": "^4.2.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-buffer-from": "^4.2.0",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3172,13 +3220,13 @@
       }
     },
     "node_modules/@smithy/hash-stream-node": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-4.2.10.tgz",
-      "integrity": "sha512-w78xsYrOlwXKwN5tv1GnKIRbHb1HygSpeZMP6xDxCPGf1U/xDHjCpJu64c5T35UKyEPwa0bPeIcvU69VY3khUA==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-4.2.8.tgz",
+      "integrity": "sha512-v0FLTXgHrTeheYZFGhR+ehX5qUm4IQsjAiL9qehad2cyjMWcN2QG6/4mSwbSgEQzI7jwfoXj7z4fxZUx/Mhj2w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.0",
-        "@smithy/util-utf8": "^4.2.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3186,12 +3234,12 @@
       }
     },
     "node_modules/@smithy/invalid-dependency": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.2.10.tgz",
-      "integrity": "sha512-vy9KPNSFUU0ajFYk0sDZIYiUlAWGEAhRfehIr5ZkdFrRFTAuXEPUd41USuqHU6vvLX4r6Q9X7MKBco5+Il0Org==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.2.8.tgz",
+      "integrity": "sha512-N9iozRybwAQ2dn9Fot9kI6/w9vos2oTXLhtK7ovGqwZjlOcxu6XhPlpLpC+INsxktqHinn5gS2DXDjDF2kG5sQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.0",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3199,9 +3247,9 @@
       }
     },
     "node_modules/@smithy/is-array-buffer": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.2.1.tgz",
-      "integrity": "sha512-Yfu664Qbf1B4IYIsYgKoABt010daZjkaCRvdU/sPnZG6TtHOB0md0RjNdLGzxe5UIdn9js4ftPICzmkRa9RJ4Q==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.2.0.tgz",
+      "integrity": "sha512-DZZZBvC7sjcYh4MazJSGiWMI2L7E0oCiRHREDzIxi/M2LY79/21iXt6aPLHge82wi5LsuRF5A06Ds3+0mlh6CQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -3211,13 +3259,13 @@
       }
     },
     "node_modules/@smithy/md5-js": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-4.2.10.tgz",
-      "integrity": "sha512-Op+Dh6dPLWTjWITChFayDllIaCXRofOed8ecpggTC5fkh8yXes0vAEX7gRUfjGK+TlyxoCAA05gHbZW/zB9JwQ==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-4.2.8.tgz",
+      "integrity": "sha512-oGMaLj4tVZzLi3itBa9TCswgMBr7k9b+qKYowQ6x1rTyTuO1IU2YHdHUa+891OsOH+wCsH7aTPRsTJO3RMQmjQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.0",
-        "@smithy/util-utf8": "^4.2.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3225,13 +3273,13 @@
       }
     },
     "node_modules/@smithy/middleware-content-length": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.2.10.tgz",
-      "integrity": "sha512-TQZ9kX5c6XbjhaEBpvhSvMEZ0klBs1CFtOdPFwATZSbC9UeQfKHPLPN9Y+I6wZGMOavlYTOlHEPDrt42PMSH9w==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.2.8.tgz",
+      "integrity": "sha512-RO0jeoaYAB1qBRhfVyq0pMgBoUK34YEJxVxyjOWYZiOKOq2yMZ4MnVXMZCUDenpozHue207+9P5ilTV1zeda0A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/protocol-http": "^5.3.10",
-        "@smithy/types": "^4.13.0",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3239,18 +3287,18 @@
       }
     },
     "node_modules/@smithy/middleware-endpoint": {
-      "version": "4.4.18",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.18.tgz",
-      "integrity": "sha512-4OS3TP3IWZysT8KlSG/UwfKdelJmuQ2CqVNfrkjm2Rsm146/DuSTfXiD1ulgWpp9L6lJmPYfWTp7/m4b4dQSdQ==",
+      "version": "4.4.12",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.12.tgz",
+      "integrity": "sha512-9JMKHVJtW9RysTNjcBZQHDwB0p3iTP6B1IfQV4m+uCevkVd/VuLgwfqk5cnI4RHcp4cPwoIvxQqN4B1sxeHo8Q==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/core": "^3.23.4",
-        "@smithy/middleware-serde": "^4.2.10",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/shared-ini-file-loader": "^4.4.4",
-        "@smithy/types": "^4.12.1",
-        "@smithy/url-parser": "^4.2.9",
-        "@smithy/util-middleware": "^4.2.9",
+        "@smithy/core": "^3.22.0",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/shared-ini-file-loader": "^4.4.3",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-middleware": "^4.2.8",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3258,19 +3306,19 @@
       }
     },
     "node_modules/@smithy/middleware-retry": {
-      "version": "4.4.35",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.35.tgz",
-      "integrity": "sha512-sz+Th9ofKypOtaboPTcyZtIfCs2LNb84bzxEhPffCElyMorVYDBdeGzxYqSLC6gWaZUqpPSbj5F6TIxYUlSCfQ==",
+      "version": "4.4.29",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.29.tgz",
+      "integrity": "sha512-bmTn75a4tmKRkC5w61yYQLb3DmxNzB8qSVu9SbTYqW6GAL0WXO2bDZuMAn/GJSbOdHEdjZvWxe+9Kk015bw6Cg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/service-error-classification": "^4.2.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-middleware": "^4.2.9",
-        "@smithy/util-retry": "^4.2.9",
-        "@smithy/uuid": "^1.1.1",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/service-error-classification": "^4.2.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-retry": "^4.2.8",
+        "@smithy/uuid": "^1.1.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3278,13 +3326,13 @@
       }
     },
     "node_modules/@smithy/middleware-serde": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.10.tgz",
-      "integrity": "sha512-BQsdoi7ma4siJAzD0S6MedNPhiMcTdTLUqEUjrHeT1TJppBKWnwqySg34Oh/uGRhJeBd1sAH2t5tghBvcyD6tw==",
+      "version": "4.2.9",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.9.tgz",
+      "integrity": "sha512-eMNiej0u/snzDvlqRGSN3Vl0ESn3838+nKyVfF2FKNXFbi4SERYT6PR392D39iczngbqqGG0Jl1DlCnp7tBbXQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/types": "^4.12.1",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3292,12 +3340,12 @@
       }
     },
     "node_modules/@smithy/middleware-stack": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.2.9.tgz",
-      "integrity": "sha512-pid7ksBr7nm0X/3paIlGo9Fh3UK1pQ5yH0007tBmdkVvv+AsBZAOzC2dmLhlzDWKkSB+ZCiiyDArjAW3klkbMg==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.2.8.tgz",
+      "integrity": "sha512-w6LCfOviTYQjBctOKSwy6A8FIkQy7ICvglrZFl6Bw4FmcQ1Z420fUtIhxaUZZshRe0VCq4kvDiPiXrPZAe8oRA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.12.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3305,14 +3353,14 @@
       }
     },
     "node_modules/@smithy/node-config-provider": {
-      "version": "4.3.9",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.3.9.tgz",
-      "integrity": "sha512-EjdDTVGnnyJ9y8jXIfkF45UUZs21/Pp8xaMTZySLoC0xI3EhY7jq4co3LQnhh/bB6VVamd9ELpYJWLDw2ANhZA==",
+      "version": "4.3.8",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.3.8.tgz",
+      "integrity": "sha512-aFP1ai4lrbVlWjfpAfRSL8KFcnJQYfTl5QxLJXY32vghJrDuFyPZ6LtUL+JEGYiFRG1PfPLHLoxj107ulncLIg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/shared-ini-file-loader": "^4.4.4",
-        "@smithy/types": "^4.12.1",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/shared-ini-file-loader": "^4.4.3",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3320,15 +3368,15 @@
       }
     },
     "node_modules/@smithy/node-http-handler": {
-      "version": "4.4.11",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.4.11.tgz",
-      "integrity": "sha512-kQNJFwzYA9y+Fj3h9t1ToXYOJBobwUVEc6/WX45urJXyErgG0WOsres8Se8BAiFCMe8P06OkzRgakv7bQ5S+6Q==",
+      "version": "4.4.8",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.4.8.tgz",
+      "integrity": "sha512-q9u+MSbJVIJ1QmJ4+1u+cERXkrhuILCBDsJUBAW1MPE6sFonbCNaegFuwW9ll8kh5UdyY3jOkoOGlc7BesoLpg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/abort-controller": "^4.2.9",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/querystring-builder": "^4.2.9",
-        "@smithy/types": "^4.12.1",
+        "@smithy/abort-controller": "^4.2.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/querystring-builder": "^4.2.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3336,12 +3384,12 @@
       }
     },
     "node_modules/@smithy/property-provider": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.2.9.tgz",
-      "integrity": "sha512-ibHwLxq4KlbfueoNxMNrZkG+O7V/5XKrewhDGYn0p9DYKCsdsofuWHKdX3QW4zHlAUfLStqdCUSDi/q/9WSjwA==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.2.8.tgz",
+      "integrity": "sha512-EtCTbyIveCKeOXDSWSdze3k612yCPq1YbXsbqX3UHhkOSW8zKsM9NOJG5gTIya0vbY2DIaieG8pKo1rITHYL0w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.12.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3349,12 +3397,12 @@
       }
     },
     "node_modules/@smithy/protocol-http": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.3.10.tgz",
-      "integrity": "sha512-2NzVWpYY0tRdfeCJLsgrR89KE3NTWT2wGulhNUxYlRmtRmPwLQwKzhrfVaiNlA9ZpJvbW7cjTVChYKgnkqXj1A==",
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.3.8.tgz",
+      "integrity": "sha512-QNINVDhxpZ5QnP3aviNHQFlRogQZDfYlCkQT+7tJnErPQbDhysondEjhikuANxgMsZrkGeiAxXy4jguEGsDrWQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.0",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3362,13 +3410,13 @@
       }
     },
     "node_modules/@smithy/querystring-builder": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.2.9.tgz",
-      "integrity": "sha512-/AIDaq0+ehv+QfeyAjCUFShwHIt+FA1IodsV/2AZE5h4PUZcQYv5sjmy9V67UWfsBoTjOPKUFYSRfGoNW9T2UQ==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.2.8.tgz",
+      "integrity": "sha512-Xr83r31+DrE8CP3MqPgMJl+pQlLLmOfiEUnoyAlGzzJIrEsbKsPy1hqH0qySaQm4oWrCBlUqRt+idEgunKB+iw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-uri-escape": "^4.2.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-uri-escape": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3376,12 +3424,12 @@
       }
     },
     "node_modules/@smithy/querystring-parser": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.2.9.tgz",
-      "integrity": "sha512-kZ9AHhrYTea3UoklXudEnyA4duy9KAWERC28+ft8y8HIhR3yGsjv1PFTgzMpB+5L4tQKXNTwFbVJMeRK20vpHQ==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.2.8.tgz",
+      "integrity": "sha512-vUurovluVy50CUlazOiXkPq40KGvGWSdmusa3130MwrR1UNnNgKAlj58wlOe61XSHRpUfIIh6cE0zZ8mzKaDPA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.12.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3389,24 +3437,24 @@
       }
     },
     "node_modules/@smithy/service-error-classification": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.2.9.tgz",
-      "integrity": "sha512-DYYd4xrm9Ozik+ZT4f5ZqSXdzscVHF/tFCzqieIFcLrjRDxWSgRtvtXOohJGoniLfPcBcy5ltR3tp2Lw4/d9ag==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.2.8.tgz",
+      "integrity": "sha512-mZ5xddodpJhEt3RkCjbmUQuXUOaPNTkbMGR0bcS8FE0bJDLMZlhmpgrvPNCYglVw5rsYTpSnv19womw9WWXKQQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.12.1"
+        "@smithy/types": "^4.12.0"
       },
       "engines": {
         "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/shared-ini-file-loader": {
-      "version": "4.4.4",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.4.tgz",
-      "integrity": "sha512-tA5Cm11BHQCk/67y6VPIWydLh/pMY90jqOEWIr/2VAzTOoDwGpwp0C/AuHBc3/xWSOA5m5PXLN+lIOrsnTm/PQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.3.tgz",
+      "integrity": "sha512-DfQjxXQnzC5UbCUPeC3Ie8u+rIWZTvuDPAGU/BxzrOGhRvgUanaP68kDZA+jaT3ZI+djOf+4dERGlm9mWfFDrg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.12.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3414,18 +3462,18 @@
       }
     },
     "node_modules/@smithy/signature-v4": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.3.10.tgz",
-      "integrity": "sha512-Wab3wW8468WqTKIxI+aZe3JYO52/RYT/8sDOdzkUhjnLakLe9qoQqIcfih/qxcF4qWEFoWBszY0mj5uxffaVXA==",
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.3.8.tgz",
+      "integrity": "sha512-6A4vdGj7qKNRF16UIcO8HhHjKW27thsxYci+5r/uVRkdcBEkOEiY8OMPuydLX4QHSrJqGHPJzPRwwVTqbLZJhg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/is-array-buffer": "^4.2.1",
-        "@smithy/protocol-http": "^5.3.10",
-        "@smithy/types": "^4.13.0",
-        "@smithy/util-hex-encoding": "^4.2.1",
-        "@smithy/util-middleware": "^4.2.10",
-        "@smithy/util-uri-escape": "^4.2.1",
-        "@smithy/util-utf8": "^4.2.1",
+        "@smithy/is-array-buffer": "^4.2.0",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-hex-encoding": "^4.2.0",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-uri-escape": "^4.2.0",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3433,17 +3481,17 @@
       }
     },
     "node_modules/@smithy/smithy-client": {
-      "version": "4.11.7",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.11.7.tgz",
-      "integrity": "sha512-gQP2J3qB/Wmc26gdmB8gA6zq2o2spG5sEU3o7TaTATBJEk29sYGWdEFoGEy91BczSpifTo0DQhVYjZXBEVcrpA==",
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.11.1.tgz",
+      "integrity": "sha512-SERgNg5Z1U+jfR6/2xPYjSEHY1t3pyTHC/Ma3YQl6qWtmiL42bvNId3W/oMUWIwu7ekL2FMPdqAmwbQegM7HeQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/core": "^3.23.4",
-        "@smithy/middleware-endpoint": "^4.4.18",
-        "@smithy/middleware-stack": "^4.2.9",
-        "@smithy/protocol-http": "^5.3.9",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-stream": "^4.5.14",
+        "@smithy/core": "^3.22.0",
+        "@smithy/middleware-endpoint": "^4.4.12",
+        "@smithy/middleware-stack": "^4.2.8",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-stream": "^4.5.10",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3451,9 +3499,9 @@
       }
     },
     "node_modules/@smithy/types": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.13.0.tgz",
-      "integrity": "sha512-COuLsZILbbQsdrwKQpkkpyep7lCsByxwj7m0Mg5v66/ZTyenlfBc40/QFQ5chO0YN/PNEH1Bi3fGtfXPnYNeDw==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.12.0.tgz",
+      "integrity": "sha512-9YcuJVTOBDjg9LWo23Qp0lTQ3D7fQsQtwle0jVfpbUHy9qBwCEgKuVH4FqFB3VYu0nwdHKiEMA+oXz7oV8X1kw==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -3463,13 +3511,13 @@
       }
     },
     "node_modules/@smithy/url-parser": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.2.9.tgz",
-      "integrity": "sha512-gYs8FrnwKoIvL+GyPz6VvweCkrXqHeD+KnOAxB+NFy6mLr4l75lFrn3dZ413DG0K2TvFtN7L43x7r8hyyohYdg==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.2.8.tgz",
+      "integrity": "sha512-NQho9U68TGMEU639YkXnVMV3GEFFULmmaWdlu1E9qzyIePOHsoSnagTGSDv1Zi8DCNN6btxOSdgmy5E/hsZwhA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/querystring-parser": "^4.2.9",
-        "@smithy/types": "^4.12.1",
+        "@smithy/querystring-parser": "^4.2.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3477,13 +3525,13 @@
       }
     },
     "node_modules/@smithy/util-base64": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.3.1.tgz",
-      "integrity": "sha512-BKGuawX4Doq/bI/uEmg+Zyc36rJKWuin3py89PquXBIBqmbnJwBBsmKhdHfNEp0+A4TDgLmT/3MSKZ1SxHcR6w==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.3.0.tgz",
+      "integrity": "sha512-GkXZ59JfyxsIwNTWFnjmFEI8kZpRNIBfxKjv09+nkAWPt/4aGaEWMM04m4sxgNVWkbt2MdSvE3KF/PfX4nFedQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/util-buffer-from": "^4.2.1",
-        "@smithy/util-utf8": "^4.2.1",
+        "@smithy/util-buffer-from": "^4.2.0",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3491,9 +3539,9 @@
       }
     },
     "node_modules/@smithy/util-body-length-browser": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.1.tgz",
-      "integrity": "sha512-SiJeLiozrAoCrgDBUgsVbmqHmMgg/2bA15AzcbcW+zan7SuyAVHN4xTSbq0GlebAIwlcaX32xacnrG488/J/6g==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.0.tgz",
+      "integrity": "sha512-Fkoh/I76szMKJnBXWPdFkQJl2r9SjPt3cMzLdOB6eJ4Pnpas8hVoWPYemX/peO0yrrvldgCUVJqOAjUrOLjbxg==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -3503,9 +3551,9 @@
       }
     },
     "node_modules/@smithy/util-body-length-node": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.2.2.tgz",
-      "integrity": "sha512-4rHqBvxtJEBvsZcFQSPQqXP2b/yy/YlB66KlcEgcH2WNoOKCKB03DSLzXmOsXjbl8dJ4OEYTn31knhdznwk7zw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.2.1.tgz",
+      "integrity": "sha512-h53dz/pISVrVrfxV1iqXlx5pRg3V2YWFcSQyPyXZRrZoZj4R4DeWRDo1a7dd3CPTcFi3kE+98tuNyD2axyZReA==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -3515,12 +3563,12 @@
       }
     },
     "node_modules/@smithy/util-buffer-from": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.2.1.tgz",
-      "integrity": "sha512-/swhmt1qTiVkaejlmMPPDgZhEaWb/HWMGRBheaxwuVkusp/z+ErJyQxO6kaXumOciZSWlmq6Z5mNylCd33X7Ig==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.2.0.tgz",
+      "integrity": "sha512-kAY9hTKulTNevM2nlRtxAG2FQ3B2OR6QIrPY3zE5LqJy1oxzmgBGsHLWTcNhWXKchgA0WHW+mZkQrng/pgcCew==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/is-array-buffer": "^4.2.1",
+        "@smithy/is-array-buffer": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3528,9 +3576,9 @@
       }
     },
     "node_modules/@smithy/util-config-provider": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.2.1.tgz",
-      "integrity": "sha512-462id/00U8JWFw6qBuTSWfN5TxOHvDu4WliI97qOIOnuC/g+NDAknTU8eoGXEPlLkRVgWEr03jJBLV4o2FL8+A==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.2.0.tgz",
+      "integrity": "sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -3540,14 +3588,14 @@
       }
     },
     "node_modules/@smithy/util-defaults-mode-browser": {
-      "version": "4.3.34",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.34.tgz",
-      "integrity": "sha512-m75CH7xaVG8ErlnfXsIBLrgVrApejrvUpohr41CMdeWNcEu/Ouvj9fbNA7oW9Qpr0Awf+BmDRrYx72hEKgY+FQ==",
+      "version": "4.3.28",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.28.tgz",
+      "integrity": "sha512-/9zcatsCao9h6g18p/9vH9NIi5PSqhCkxQ/tb7pMgRFnqYp9XUOyOlGPDMHzr8n5ih6yYgwJEY2MLEobUgi47w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3555,17 +3603,17 @@
       }
     },
     "node_modules/@smithy/util-defaults-mode-node": {
-      "version": "4.2.37",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.37.tgz",
-      "integrity": "sha512-1LcAt0PV1dletxiGwcw2IJ8vLNhfkir02NTi1i/CFCY2ObtM5wDDjn/8V2dbPrbyoh6OTFH+uayI1rSVRBMT3A==",
+      "version": "4.2.31",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.31.tgz",
+      "integrity": "sha512-JTvoApUXA5kbpceI2vuqQzRjeTbLpx1eoa5R/YEZbTgtxvIB7AQZxFJ0SEyfCpgPCyVV9IT7we+ytSeIB3CyWA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/config-resolver": "^4.4.7",
-        "@smithy/credential-provider-imds": "^4.2.9",
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/property-provider": "^4.2.9",
-        "@smithy/smithy-client": "^4.11.7",
-        "@smithy/types": "^4.12.1",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/credential-provider-imds": "^4.2.8",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/property-provider": "^4.2.8",
+        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3573,13 +3621,13 @@
       }
     },
     "node_modules/@smithy/util-endpoints": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.2.9.tgz",
-      "integrity": "sha512-9FTqTzKxCFelCKdtHb22BTbrLgw7tTI+D6r/Ci/njI0tzqWLQctS0uEDTzraCR5K6IJItfFp1QmESlBytSpRhQ==",
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.2.8.tgz",
+      "integrity": "sha512-8JaVTn3pBDkhZgHQ8R0epwWt+BqPSLCjdjXXusK1onwJlRuN69fbvSK66aIKKO7SwVFM6x2J2ox5X8pOaWcUEw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^4.3.9",
-        "@smithy/types": "^4.12.1",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3587,9 +3635,9 @@
       }
     },
     "node_modules/@smithy/util-hex-encoding": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.1.tgz",
-      "integrity": "sha512-c1hHtkgAWmE35/50gmdKajgGAKV3ePJ7t6UtEmpfCWJmQE9BQAQPz0URUVI89eSkcDqCtzqllxzG28IQoZPvwA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.0.tgz",
+      "integrity": "sha512-CCQBwJIvXMLKxVbO88IukazJD9a4kQ9ZN7/UMGBjBcJYvatpWk+9g870El4cB8/EJxfe+k+y0GmR9CAzkF+Nbw==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -3599,12 +3647,12 @@
       }
     },
     "node_modules/@smithy/util-middleware": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.2.10.tgz",
-      "integrity": "sha512-LxaQIWLp4y0r72eA8mwPNQ9va4h5KeLM0I3M/HV9klmFaY2kN766wf5vsTzmaOpNNb7GgXAd9a25P3h8T49PSA==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.2.8.tgz",
+      "integrity": "sha512-PMqfeJxLcNPMDgvPbbLl/2Vpin+luxqTGPpW3NAQVLbRrFRzTa4rNAASYeIGjRV9Ytuhzny39SpyU04EQreF+A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.0",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3612,13 +3660,13 @@
       }
     },
     "node_modules/@smithy/util-retry": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.2.9.tgz",
-      "integrity": "sha512-79hfhL/oxP40SCXJGfjfE9pjbUVfHhXZFpCWXTHqXSluzaVy7jwWs9Ui7lLbfDBSp+7i+BIwgeVIRerbIRWN6g==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.2.8.tgz",
+      "integrity": "sha512-CfJqwvoRY0kTGe5AkQokpURNCT1u/MkRzMTASWMPPo2hNSnKtF1D45dQl3DE2LKLr4m+PW9mCeBMJr5mCAVThg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/service-error-classification": "^4.2.9",
-        "@smithy/types": "^4.12.1",
+        "@smithy/service-error-classification": "^4.2.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3626,18 +3674,18 @@
       }
     },
     "node_modules/@smithy/util-stream": {
-      "version": "4.5.14",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.14.tgz",
-      "integrity": "sha512-IOBEiJTOltSx6MAfwkx/GSVM8/UCJxdtw13haP5OEL543lb1DN6TAypsxv+qcj4l/rKcpapbS6zK9MQGBOhoaA==",
+      "version": "4.5.10",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.10.tgz",
+      "integrity": "sha512-jbqemy51UFSZSp2y0ZmRfckmrzuKww95zT9BYMmuJ8v3altGcqjwoV1tzpOwuHaKrwQrCjIzOib499ymr2f98g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/fetch-http-handler": "^5.3.10",
-        "@smithy/node-http-handler": "^4.4.11",
-        "@smithy/types": "^4.12.1",
-        "@smithy/util-base64": "^4.3.1",
-        "@smithy/util-buffer-from": "^4.2.1",
-        "@smithy/util-hex-encoding": "^4.2.1",
-        "@smithy/util-utf8": "^4.2.1",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-buffer-from": "^4.2.0",
+        "@smithy/util-hex-encoding": "^4.2.0",
+        "@smithy/util-utf8": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3645,9 +3693,9 @@
       }
     },
     "node_modules/@smithy/util-uri-escape": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.2.1.tgz",
-      "integrity": "sha512-YmiUDn2eo2IOiWYYvGQkgX5ZkBSiTQu4FlDo5jNPpAxng2t6Sjb6WutnZV9l6VR4eJul1ABmCrnWBC9hKHQa6Q==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.2.0.tgz",
+      "integrity": "sha512-igZpCKV9+E/Mzrpq6YacdTQ0qTiLm85gD6N/IrmyDvQFA4UnU3d5g3m8tMT/6zG/vVkWSU+VxeUyGonL62DuxA==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -3657,12 +3705,12 @@
       }
     },
     "node_modules/@smithy/util-utf8": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.2.1.tgz",
-      "integrity": "sha512-DSIwNaWtmzrNQHv8g7DBGR9mulSit65KSj5ymGEIAknmIN8IpbZefEep10LaMG/P/xquwbmJ1h9ectz8z6mV6g==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.2.0.tgz",
+      "integrity": "sha512-zBPfuzoI8xyBtR2P6WQj63Rz8i3AmfAaJLuNG8dWsfvPe8lO4aCPYLn879mEgHndZH1zQ2oXmG8O1GGzzaoZiw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/util-buffer-from": "^4.2.1",
+        "@smithy/util-buffer-from": "^4.2.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3670,13 +3718,13 @@
       }
     },
     "node_modules/@smithy/util-waiter": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-4.2.10.tgz",
-      "integrity": "sha512-4eTWph/Lkg1wZEDAyObwme0kmhEb7J/JjibY2znJdrYRgKbKqB7YoEhhJVJ4R1g/SYih4zuwX7LpJaM8RsnTVg==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-4.2.8.tgz",
+      "integrity": "sha512-n+lahlMWk+aejGuax7DPWtqav8HYnWxQwR+LCG2BgCUmaGcTe9qZCFsmw8TMg9iG75HOwhrJCX9TCJRLH+Yzqg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/abort-controller": "^4.2.10",
-        "@smithy/types": "^4.13.0",
+        "@smithy/abort-controller": "^4.2.8",
+        "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3684,9 +3732,9 @@
       }
     },
     "node_modules/@smithy/uuid": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@smithy/uuid/-/uuid-1.1.1.tgz",
-      "integrity": "sha512-dSfDCeihDmZlV2oyr0yWPTUfh07suS+R5OB+FZGiv/hHyK3hrFBW5rR1UYjfa57vBsrP9lciFkRPzebaV1Qujw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@smithy/uuid/-/uuid-1.1.0.tgz",
+      "integrity": "sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -4550,13 +4598,13 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.13.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
-      "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.4.tgz",
+      "integrity": "sha512-1wVkUaAO6WyaYtCkcYCOx12ZgpGf9Zif+qXa4n+oYzK558YryKqiL6UWwd5DqiH3VRW0GYhTZQ/vlgJrCoNQlg==",
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.11",
-        "form-data": "^4.0.5",
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.4",
         "proxy-from-env": "^1.1.0"
       }
     },
@@ -4687,9 +4735,9 @@
       "license": "ISC"
     },
     "node_modules/bowser": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.14.1.tgz",
-      "integrity": "sha512-tzPjzCxygAKWFOJP011oxFHs57HzIhOEracIgAePE4pqB3LikALKnSzUyU4MGs9/iCEUuHlAJTjTc5M+u7YEGg==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.13.1.tgz",
+      "integrity": "sha512-OHawaAbjwx6rqICCKgSG0SAnT05bzd7ppyKLVUITZpANBaaMFBAsaNkto3LoQ31tyFP5kNujE8Cdx85G9VzOkw==",
       "license": "MIT"
     },
     "node_modules/brace-expansion": {
@@ -4744,16 +4792,16 @@
       }
     },
     "node_modules/bullmq": {
-      "version": "5.70.1",
-      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.70.1.tgz",
-      "integrity": "sha512-HjfGHfICkAClrFL0Y07qNbWcmiOCv1l+nusupXUjrvTPuDEyPEJ23MP0lUwUs/QEy1a3pWt/P/sCsSZ1RjRK+w==",
+      "version": "5.67.2",
+      "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.67.2.tgz",
+      "integrity": "sha512-3KYqNqQptKcgksACO1li4YW9/jxEh6XWa1lUg4OFrHa80Pf0C7H9zeb6ssbQQDfQab/K3QCXopbZ40vrvcyrLw==",
       "license": "MIT",
       "dependencies": {
         "cron-parser": "4.9.0",
-        "ioredis": "5.9.3",
+        "ioredis": "5.9.2",
         "msgpackr": "1.11.5",
         "node-abort-controller": "3.1.1",
-        "semver": "7.7.4",
+        "semver": "7.7.3",
         "tslib": "2.8.1",
         "uuid": "11.1.0"
       }
@@ -5717,9 +5765,9 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "17.3.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.3.1.tgz",
-      "integrity": "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==",
+      "version": "17.2.3",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
+      "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -6571,22 +6619,10 @@
       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
       "license": "MIT"
     },
-    "node_modules/fast-xml-builder": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.0.0.tgz",
-      "integrity": "sha512-fpZuDogrAgnyt9oDDz+5DBz0zgPdPZz6D4IR7iESxRXElrlGTRkHJ9eEt+SACRJwT0FNFrt71DFQIUFBJfX/uQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT"
-    },
     "node_modules/fast-xml-parser": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.4.1.tgz",
-      "integrity": "sha512-BQ30U1mKkvXQXXkAGcuyUA/GA26oEB7NzOtsxCDtyu62sjGw5QraKFhx2Em3WQNjPw9PG6MQ9yuIIgkSDfGu5A==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.4.tgz",
+      "integrity": "sha512-EFd6afGmXlCx8H8WTZHhAoDaWaGyuIBoZJ2mknrNxug+aZKjkp0a0dlars9Izl+jF+7Gu1/5f/2h68cQpe0IiA==",
       "funding": [
         {
           "type": "github",
@@ -6595,8 +6631,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "fast-xml-builder": "^1.0.0",
-        "strnum": "^2.1.2"
+        "strnum": "^2.1.0"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
@@ -6711,9 +6746,9 @@
       }
     },
     "node_modules/firebase-admin": {
-      "version": "13.6.1",
-      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-13.6.1.tgz",
-      "integrity": "sha512-Zgc6yPtmPxAZo+FoK6LMG6zpSEsoSK8ifIR+IqF4oWuC3uWZU40OjxgfLTSFcsRlj/k/wD66zNv2UiTRreCNSw==",
+      "version": "13.6.0",
+      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-13.6.0.tgz",
+      "integrity": "sha512-GdPA/t0+Cq8p1JnjFRBmxRxAGvF/kl2yfdhALl38PrRp325YxyQ5aNaHui0XmaKcKiGRFIJ/EgBNWFoDP0onjw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@fastify/busboy": "^3.0.0",
@@ -6928,15 +6963,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fuse.js": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.1.0.tgz",
-      "integrity": "sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/gaxios": {
       "version": "6.7.1",
       "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
@@ -7024,6 +7050,18 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-symbol-description": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
@@ -7100,9 +7138,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "17.3.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-17.3.0.tgz",
-      "integrity": "sha512-yMqGUQVVCkD4tqjOJf3TnrvaaHDMYp4VlUSObbkIiuCPe/ofdMBFIAcBbCSRFWOnos6qRiTVStDwqPLUclaxIw==",
+      "version": "17.2.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.2.0.tgz",
+      "integrity": "sha512-tovnCz/fEq+Ripoq+p/gN1u7l6A7wwkoBT9pRCzTHzsD/LvADIzXZdjmRymh5Ztf0DYC3Rwg5cZRYjxzBmzbWg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7212,9 +7250,9 @@
       "license": "ISC"
     },
     "node_modules/graphql": {
-      "version": "16.13.0",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.13.0.tgz",
-      "integrity": "sha512-uSisMYERbaB9bkA9M4/4dnqyktaEkf1kMHNKq/7DHyxVeWqHQ2mBmVqm5u6/FVHwF3iCNalKcg82Zfl+tffWoA==",
+      "version": "16.12.0",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.12.0.tgz",
+      "integrity": "sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ==",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
@@ -7571,9 +7609,9 @@
       }
     },
     "node_modules/ioredis": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.9.3.tgz",
-      "integrity": "sha512-VI5tMCdeoxZWU5vjHWsiE/Su76JGhBvWF1MJnV9ZtGltHk9BmD48oDq8Tj8haZ85aceXZMxLNDQZRVo5QKNgXA==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.9.2.tgz",
+      "integrity": "sha512-tAAg/72/VxOUW7RQSX1pIxJVucYKcjFjfvj60L57jrZpYCHC3XN0WCQ3sNYL4Gmvv+7GPvTAjc+KSdeNuE8oWQ==",
       "license": "MIT",
       "dependencies": {
         "@ioredis/commands": "1.5.0",
@@ -8163,9 +8201,9 @@
       }
     },
     "node_modules/juice": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/juice/-/juice-11.1.1.tgz",
-      "integrity": "sha512-4SBfZqKcc6DrIS+5b/WiGoWaZsdUPBH+e6SbRlNjJpaIRtfoBhYReAtobIEW6mcLeFFDXLBJMuZwkJLkBJjs2w==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/juice/-/juice-11.1.0.tgz",
+      "integrity": "sha512-jZj/pUGFddSU7HS6ThAdiQ21IILIM23JNdFNgTacwxFUMTw/6qvMv3suv/I66Bz2xZ6yC3Vl8fWl0At/wVcH3A==",
       "license": "MIT",
       "dependencies": {
         "cheerio": "1.0.0",
@@ -8473,9 +8511,9 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "11.2.6",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
-      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
       "license": "BlueOak-1.0.0",
       "engines": {
         "node": "20 || >=22"
@@ -9153,12 +9191,6 @@
       "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "license": "BlueOak-1.0.0"
     },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "license": "(MIT AND Zlib)"
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -9297,28 +9329,10 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/pdf-lib": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/pdf-lib/-/pdf-lib-1.17.1.tgz",
-      "integrity": "sha512-V/mpyJAoTsN4cnP31vc0wfNA1+p20evqqnap0KLoRUN0Yk/p3wN52DOEsL4oBFcLdb76hlpKPtzJIgo67j/XLw==",
-      "license": "MIT",
-      "dependencies": {
-        "@pdf-lib/standard-fonts": "^1.0.0",
-        "@pdf-lib/upng": "^1.0.1",
-        "pako": "^1.0.11",
-        "tslib": "^1.11.1"
-      }
-    },
-    "node_modules/pdf-lib/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "license": "0BSD"
-    },
     "node_modules/phone": {
-      "version": "3.1.71",
-      "resolved": "https://registry.npmjs.org/phone/-/phone-3.1.71.tgz",
-      "integrity": "sha512-hY+mk9CyQovdaG8QpcsbtNP3hI7oPW7gv2yghQkkWBMsPRxeJYwnggqLYdZAAz7nGxli5SJ7Zvkf/HoxPaHjpQ==",
+      "version": "3.1.70",
+      "resolved": "https://registry.npmjs.org/phone/-/phone-3.1.70.tgz",
+      "integrity": "sha512-MFRQaIe8UJmkosaU/OlLRDhSoLw9wJRwqtacNHy8cZjDomTQ9ic8+8nKdGFLpRsaqnLHAXSuiIYTzWggMkSG5Q==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -9795,12 +9809,12 @@
       }
     },
     "node_modules/rimraf": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.3.tgz",
-      "integrity": "sha512-LKg+Cr2ZF61fkcaK1UdkH2yEBBKnYjTyWzTJT6KNPcSPaiT7HSdhtMXQuN5wkTX0Xu72KQ1l8S42rlmexS2hSA==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz",
+      "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "glob": "^13.0.3",
+        "glob": "^13.0.0",
         "package-json-from-dist": "^1.0.1"
       },
       "bin": {
@@ -9813,34 +9827,13 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/rimraf/node_modules/balanced-match": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.3.tgz",
-      "integrity": "sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==",
-      "license": "MIT",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/rimraf/node_modules/brace-expansion": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.2.tgz",
-      "integrity": "sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==",
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^4.0.2"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
     "node_modules/rimraf/node_modules/glob": {
-      "version": "13.0.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.5.tgz",
-      "integrity": "sha512-BzXxZg24Ibra1pbQ/zE7Kys4Ua1ks7Bn6pKLkVPZ9FZe4JQS6/Q7ef3LG1H+k7lUf5l4T3PLSyYyYJVYUvfgTw==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
+      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "minimatch": "^10.2.1",
+        "minimatch": "^10.1.1",
         "minipass": "^7.1.2",
         "path-scurry": "^2.0.0"
       },
@@ -9852,12 +9845,12 @@
       }
     },
     "node_modules/rimraf/node_modules/minimatch": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.1.tgz",
-      "integrity": "sha512-MClCe8IL5nRRmawL6ib/eT4oLyeKMGCghibcDWK+J0hh0Q8kqSdia6BvbRMVk6mPa6WqUa5uR2oxt6C5jd533A==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
+      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^5.0.2"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
         "node": "20 || >=22"
@@ -10048,9 +10041,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/semver": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -10324,22 +10317,24 @@
       }
     },
     "node_modules/soap": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/soap/-/soap-1.7.1.tgz",
-      "integrity": "sha512-PYDzr2F0eb0cpyTB+hg21rzj5/wfo1AeKy3HnOVx65+eFDUUY1FOtqC/ev0pwW5Y9UcvHWJ5egr8HQsCzE92Ig==",
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/soap/-/soap-1.6.4.tgz",
+      "integrity": "sha512-cVsVgMpN8kAEjzdBm8o1aSPawLIxmQsDlo0EHiFyii4IAcvndAwxG6cWVyR+6FKDrSNnPg7oi9my0LQz6r+B3w==",
       "license": "MIT",
       "dependencies": {
-        "axios": "^1.13.5",
+        "axios": "^1.13.1",
         "axios-ntlm": "^1.4.6",
         "debug": "^4.4.3",
-        "follow-redirects": "^1.15.11",
         "formidable": "^3.5.4",
+        "get-stream": "^6.0.1",
+        "lodash": "^4.17.21",
         "sax": "^1.4.1",
+        "strip-bom": "^3.0.0",
         "whatwg-mimetype": "4.0.0",
         "xml-crypto": "^6.1.2"
       },
       "engines": {
-        "node": ">=20.19.0"
+        "node": ">=20.9.0"
       }
     },
     "node_modules/socket.io": {
@@ -10796,6 +10791,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -10810,9 +10814,9 @@
       }
     },
     "node_modules/strnum": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz",
-      "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz",
+      "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==",
       "funding": [
         {
           "type": "github",
@@ -11102,9 +11106,9 @@
       "license": "Unlicense"
     },
     "node_modules/twilio": {
-      "version": "5.12.2",
-      "resolved": "https://registry.npmjs.org/twilio/-/twilio-5.12.2.tgz",
-      "integrity": "sha512-yjTH04Ig0Z3PAxIXhwrto0IJC4Gv7lBDQQ9f4/P9zJhnxVdd+3tENqBMJOtdmmRags3X0jl2IGKEQefCEpJE9g==",
+      "version": "5.12.0",
+      "resolved": "https://registry.npmjs.org/twilio/-/twilio-5.12.0.tgz",
+      "integrity": "sha512-ZAKnDKcWvJSb90xQS13QB5KQOeMJPzsRPHxZqju8i5ALg3D4hNwAF9bpytVTxTJV99BL4Rn6Un+ZtXjGeMpjvQ==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.12.0",
diff --git a/package.json b/package.json
index 1ee1f3196..8f7c36816 100644
--- a/package.json
+++ b/package.json
@@ -18,25 +18,23 @@
     "job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.997.0",
-    "@aws-sdk/client-elasticache": "^3.997.0",
-    "@aws-sdk/client-s3": "^3.997.0",
-    "@aws-sdk/client-secrets-manager": "^3.997.0",
-    "@aws-sdk/client-ses": "^3.997.0",
-    "@aws-sdk/client-sqs": "^3.997.0",
-    "@aws-sdk/client-textract": "^3.997.0",
-    "@aws-sdk/credential-provider-node": "^3.972.12",
-    "@aws-sdk/lib-storage": "^3.997.0",
-    "@aws-sdk/s3-request-presigner": "^3.997.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.978.0",
+    "@aws-sdk/client-elasticache": "^3.978.0",
+    "@aws-sdk/client-s3": "^3.978.0",
+    "@aws-sdk/client-secrets-manager": "^3.978.0",
+    "@aws-sdk/client-ses": "^3.978.0",
+    "@aws-sdk/credential-provider-node": "^3.972.3",
+    "@aws-sdk/lib-storage": "^3.978.0",
+    "@aws-sdk/s3-request-presigner": "^3.978.0",
     "@opensearch-project/opensearch": "^2.13.0",
     "@socket.io/admin-ui": "^0.5.1",
     "@socket.io/redis-adapter": "^8.3.0",
     "archiver": "^7.0.1",
     "aws4": "^1.13.2",
-    "axios": "^1.13.5",
+    "axios": "^1.13.4",
     "axios-curlirize": "^2.0.0",
     "better-queue": "^3.8.12",
-    "bullmq": "^5.70.1",
+    "bullmq": "^5.67.2",
     "chart.js": "^4.5.1",
     "cloudinary": "^2.9.0",
     "compression": "^1.8.1",
@@ -44,18 +42,17 @@
     "cors": "^2.8.6",
     "crisp-status-reporter": "^1.2.2",
     "dinero.js": "^1.9.1",
-    "dotenv": "^17.3.1",
+    "dotenv": "^17.2.3",
     "express": "^4.21.1",
-    "fast-xml-parser": "^5.4.1",
-    "firebase-admin": "^13.6.1",
-    "fuse.js": "^7.1.0",
-    "graphql": "^16.13.0",
+    "fast-xml-parser": "^5.3.4",
+    "firebase-admin": "^13.6.0",
+    "graphql": "^16.12.0",
     "graphql-request": "^6.1.0",
     "intuit-oauth": "^4.2.2",
-    "ioredis": "^5.9.3",
+    "ioredis": "^5.9.2",
     "json-2-csv": "^5.5.10",
     "jsonwebtoken": "^9.0.3",
-    "juice": "^11.1.1",
+    "juice": "^11.1.0",
     "lodash": "^4.17.23",
     "moment": "^2.30.1",
     "moment-timezone": "^0.6.0",
@@ -63,17 +60,16 @@
     "mustache": "^4.2.0",
     "node-persist": "^4.0.4",
     "nodemailer": "^6.10.0",
-    "pdf-lib": "^1.17.1",
-    "phone": "^3.1.71",
+    "phone": "^3.1.70",
     "query-string": "7.1.3",
     "recursive-diff": "^1.0.9",
-    "rimraf": "^6.1.3",
+    "rimraf": "^6.1.2",
     "skia-canvas": "^3.0.8",
-    "soap": "^1.7.1",
+    "soap": "^1.6.4",
     "socket.io": "^4.8.3",
     "socket.io-adapter": "^2.5.6",
     "ssh2-sftp-client": "^11.0.0",
-    "twilio": "^5.12.2",
+    "twilio": "^5.12.0",
     "uuid": "^11.1.0",
     "winston": "^3.19.0",
     "winston-cloudwatch": "^6.3.0",
@@ -86,7 +82,7 @@
     "@eslint/js": "^9.39.2",
     "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.37.5",
-    "globals": "^17.3.0",
+    "globals": "^17.2.0",
     "mock-require": "^3.0.3",
     "p-limit": "^3.1.0",
     "prettier": "^3.8.1",
diff --git a/server.js b/server.js
index 90f16f33d..33cbe014c 100644
--- a/server.js
+++ b/server.js
@@ -127,8 +127,6 @@ const applyRoutes = ({ app }) => {
   app.use("/payroll", require("./server/routes/payrollRoutes"));
   app.use("/sso", require("./server/routes/ssoRoutes"));
   app.use("/integrations", require("./server/routes/intergrationRoutes"));
-  app.use("/ai", require("./server/routes/aiRoutes"));
-
   app.use("/chatter", require("./server/routes/chatterRoutes"));
 
   // Default route for forbidden access
@@ -427,12 +425,6 @@ const loadQueues = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
   chatterApiQueue.on("error", (error) => {
     logger.log(`Error in chatterApiQueue: ${error}`, "ERROR", "queue", "api", null, { error: error?.message });
   });
-
-  // Initialize bill-ocr with Redis client
-  const { initializeBillOcr, startSQSPolling } = require("./server/ai/bill-ocr/bill-ocr");
-  initializeBillOcr(pubClient);
-  // Start SQS polling for Textract notifications
-  startSQSPolling();
 };
 
 /**
@@ -462,7 +454,6 @@ const main = async () => {
   try {
     await server.listen(port);
     logger.log(`Server started on port ${port}`, "INFO", "api");
-
   } catch (error) {
     logger.log(`Server failed to start on port ${port}`, "ERROR", "api", null, { error: error.message });
   }
diff --git a/server/ai/bill-ocr/bill-ocr-generator.js b/server/ai/bill-ocr/bill-ocr-generator.js
deleted file mode 100644
index 2d6205a56..000000000
--- a/server/ai/bill-ocr/bill-ocr-generator.js
+++ /dev/null
@@ -1,792 +0,0 @@
-
-
-const Fuse = require('fuse.js');
-
-const { standardizedFieldsnames } = require('./bill-ocr-normalize');
-const InstanceManager = require("../../utils/instanceMgr").default;
-
-const PRICE_PERCENT_MARGIN_TOLERANCE = 0.5; //Used to make sure prices and costs are likely. 
-const PRICE_QUANTITY_MARGIN_TOLERANCE = 0.03; //Used to make sure that if there is a quantity, the price is likely a unit price.
-// Helper function to normalize fields
-const normalizePartNumber = (str) => {
-    return str.replace(/[^a-zA-Z0-9]/g, '').toUpperCase();
-};
-
-const normalizeText = (str) => {
-    return str.replace(/[^a-zA-Z0-9\s]/g, '').replace(/\s+/g, ' ').trim().toUpperCase();
-};
-const normalizePrice = (str) => {
-    if (typeof str !== 'string') return str;
-
-    let value = str.trim();
-
-    // Handle European-style decimal comma like "292,37".
-    // Only treat the *last* comma as a decimal separator when:
-    // - there's no '.' anywhere (so we don't fight normal US formatting like "1,234.56")
-    // - and the suffix after the last comma is 1-2 digits (so "1,234" stays 1234)
-    if (!value.includes('.') && value.includes(',')) {
-        const lastCommaIndex = value.lastIndexOf(',');
-        const decimalSuffix = value.slice(lastCommaIndex + 1).trim();
-
-        if (/^\d{1,2}$/.test(decimalSuffix)) {
-            const before = value.slice(0, lastCommaIndex).replace(/,/g, '');
-            value = `${before}.${decimalSuffix}`;
-        } else {
-            // Treat commas as thousands separators (or noise) and drop them.
-            value = value.replace(/,/g, '');
-        }
-    }
-
-    return value.replace(/[^0-9.-]+/g, "");
-};
-
-const roundToIncrement = (value, increment) => {
-    if (typeof value !== 'number' || !isFinite(value) || typeof increment !== 'number' || !isFinite(increment) || increment <= 0) {
-        return value;
-    }
-
-    const rounded = Math.round((value + Number.EPSILON) / increment) * increment;
-    // Prevent float artifacts (e.g. 0.20500000000000002)
-    const decimals = Math.max(0, Math.ceil(-Math.log10(increment)));
-    return parseFloat(rounded.toFixed(decimals));
-};
-
-//More complex function. Not necessary at the moment, keeping for reference. 
-// const normalizePriceFinal = (str) => {
-//     if (typeof str !== 'string') {
-//         // If it's already a number, format to 2 decimals
-//         const num = parseFloat(str);
-//         return isNaN(num) ? 0 : num;
-//     }
-
-//     // First, try to extract valid decimal number patterns (e.g., "123.45")
-//     const decimalPattern = /\d+\.\d{1,2}/g;
-//     const decimalMatches = str.match(decimalPattern);
-
-//     if (decimalMatches && decimalMatches.length > 0) {
-//         // Found valid decimal number(s)
-//         const numbers = decimalMatches.map(m => parseFloat(m)).filter(n => !isNaN(n) && n > 0);
-
-//         if (numbers.length === 1) {
-//             return numbers[0];
-//         }
-
-//         if (numbers.length > 1) {
-//             // Check if all numbers are the same (e.g., "47.57.47.57" -> [47.57, 47.57])
-//             const uniqueNumbers = [...new Set(numbers)];
-//             if (uniqueNumbers.length === 1) {
-//                 return uniqueNumbers[0];
-//             }
-
-//             // Check if numbers are very close (within 1% tolerance)
-//             const avg = numbers.reduce((a, b) => a + b, 0) / numbers.length;
-//             const allClose = numbers.every(num => Math.abs(num - avg) / avg < 0.01);
-
-//             if (allClose) {
-//                 return avg;
-//             }
-
-//             // Return the first number (most likely correct)
-//             return numbers[0];
-//         }
-//     }
-
-//     // Fallback: Split on common delimiters and extract all potential numbers
-//     const parts = str.split(/[\/|\\,;]/).map(part => part.trim()).filter(part => part.length > 0);
-
-//     if (parts.length > 1) {
-//         // Multiple values detected - extract and parse all valid numbers
-//         const numbers = parts
-//             .map(part => {
-//                 const cleaned = part.replace(/[^0-9.-]+/g, "");
-//                 const parsed = parseFloat(cleaned);
-//                 return isNaN(parsed) ? null : parsed;
-//             })
-//             .filter(num => num !== null && num > 0);
-
-//         if (numbers.length === 0) {
-//             // No valid numbers found, try fallback to basic cleaning
-//             const cleaned = str.replace(/[^0-9.-]+/g, "");
-//             const parsed = parseFloat(cleaned);
-//             return isNaN(parsed) ? 0 : parsed;
-//         }
-
-//         if (numbers.length === 1) {
-//             return numbers[0];
-//         }
-
-//         // Multiple valid numbers
-//         const uniqueNumbers = [...new Set(numbers)];
-
-//         if (uniqueNumbers.length === 1) {
-//             return uniqueNumbers[0];
-//         }
-
-//         // Check if numbers are very close (within 1% tolerance)
-//         const avg = numbers.reduce((a, b) => a + b, 0) / numbers.length;
-//         const allClose = numbers.every(num => Math.abs(num - avg) / avg < 0.01);
-
-//         if (allClose) {
-//             return avg;
-//         }
-
-//         // Return the first valid number
-//         return numbers[0];
-//     }
-
-//     // Single value or no delimiters, clean normally
-//     const cleaned = str.replace(/[^0-9.-]+/g, "");
-//     const parsed = parseFloat(cleaned);
-//     return isNaN(parsed) ? 0 : parsed;
-// };
-
-
-
-// Helper function to calculate Textract OCR confidence (0-100%)
-const calculateTextractConfidence = (textractLineItem) => {
-    if (!textractLineItem || Object.keys(textractLineItem).length === 0) {
-        return 0;
-    }
-
-    const confidenceValues = [];
-
-    // Collect confidence from all fields in the line item
-    Object.values(textractLineItem).forEach(field => {
-        if (field.confidence && typeof field.confidence === 'number') {
-            confidenceValues.push(field.confidence);
-        }
-    });
-
-    if (confidenceValues.length === 0) {
-        return 0;
-    }
-
-    // Check if critical normalized labels are present
-    const hasActualCost = Object.values(textractLineItem).some(field => field.normalizedLabel === standardizedFieldsnames.actual_cost);
-    const hasActualPrice = Object.values(textractLineItem).some(field => field.normalizedLabel === standardizedFieldsnames.actual_price);
-    const hasLineDesc = Object.values(textractLineItem).some(field => field.normalizedLabel === standardizedFieldsnames.line_desc);
-    const hasQuantity = textractLineItem?.QUANTITY?.value; //We don't normalize quantity, we just use what textract gives us.
-
-    // Calculate weighted average, giving more weight to important fields
-    // If we can identify key fields (ITEM, PRODUCT_CODE, PRICE), weight them higher
-    let totalWeight = 0;
-    let weightedSum = 0;
-
-    Object.entries(textractLineItem).forEach(([key, field]) => {
-        if (field.confidence && typeof field.confidence === 'number') {
-            // Weight important fields higher
-            let weight = 1;
-            if (field.normalizedLabel === standardizedFieldsnames.actual_cost || field.normalizedLabel === standardizedFieldsnames.actual_price) {
-                weight = 4;
-            }
-            else if (field.normalizedLabel === standardizedFieldsnames.part_no || field.normalizedLabel === standardizedFieldsnames.line_desc) {
-                weight = 3.5;
-            }
-            else if (field.normalizedLabel === standardizedFieldsnames.quantity) {
-                weight = 3.5;
-            }
-            // We generally ignore the key from textract. Keeping for future reference. 
-            // else if (key === 'ITEM' || key === 'PRODUCT_CODE') {
-            //     weight = 3; // Description and part number are most important
-            // } else if (key === 'PRICE' || key === 'UNIT_PRICE' || key === 'QUANTITY') {
-            //     weight = 2; // Price and quantity moderately important
-            // }
-
-            weightedSum += field.confidence * weight;
-            totalWeight += weight;
-        }
-    });
-
-    let avgConfidence = totalWeight > 0 ? weightedSum / totalWeight : 0;
-
-    // Apply penalty if critical normalized labels are missing
-    let missingFieldsPenalty = 1.0;
-    let missingCount = 0;
-    if (!hasActualCost) missingCount++;
-    if (!hasActualPrice) missingCount++;
-    if (!hasLineDesc) missingCount++;
-    if (!hasQuantity) missingCount++;
-
-    // Each missing field reduces confidence by 20%
-    if (missingCount > 0) {
-        missingFieldsPenalty = 1.0 - (missingCount * 0.20);
-    }
-
-    avgConfidence = avgConfidence * missingFieldsPenalty;
-
-    return Math.round(avgConfidence * 100) / 100; // Round to 2 decimal places
-};
-
-const calculateMatchConfidence = (matches, bestMatch) => {
-    if (!matches || matches.length === 0 || !bestMatch) {
-        return 0; // No match = 0% confidence
-    }
-
-    // Base confidence from the match score
-    // finalScore is already weighted and higher is better
-    // Normalize it to a 0-100 scale
-    const baseScore = Math.min(bestMatch.finalScore * 10, 100); // Scale factor of 10, cap at 100
-
-    // Bonus for multiple field matches (up to +15%)
-    const fieldMatchBonus = Math.min(bestMatch.fieldMatches.length * 5, 15);
-
-    // Bonus for having price data (+10%)
-    const priceDataBonus = bestMatch.hasPriceData ? 10 : 0;
-
-    // Bonus for clear winner (gap between 1st and 2nd match)
-    let confidenceMarginBonus = 0;
-    if (matches.length > 1) {
-        const scoreDiff = bestMatch.finalScore - matches[1].finalScore;
-        // If the best match is significantly better than the second best, add bonus
-        confidenceMarginBonus = Math.min(scoreDiff * 5, 10); // Up to +10%
-    } else {
-        // Only one match found, add small bonus
-        confidenceMarginBonus = 5;
-    }
-
-    // Calculate total match confidence
-    let matchConfidence = baseScore + fieldMatchBonus + priceDataBonus + confidenceMarginBonus;
-
-    // Cap at 100% and round to 2 decimal places
-    matchConfidence = Math.min(Math.round(matchConfidence * 100) / 100, 100);
-
-    // Ensure minimum of 1% if there's any match at all
-    return Math.max(matchConfidence, 1);
-};
-
-const calculateOverallConfidence = (ocrConfidence, matchConfidence) => {
-    // If there's no match, OCR confidence doesn't matter much
-    if (matchConfidence === 0) {
-        return 0;
-    }
-
-    // Overall confidence is affected by both how well Textract read the data
-    // and how well we matched it to existing joblines
-    // Use a weighted average: 60% OCR confidence, 40% match confidence
-    // OCR confidence is more important because even perfect match is useless without good OCR
-    const overall = (ocrConfidence * 0.6) + (matchConfidence * 0.4);
-
-    return Math.round(overall * 100) / 100;
-};
-
-// Helper function to merge and deduplicate results with weighted scoring
-const mergeResults = (resultsArray, weights = []) => {
-    const scoreMap = new Map();
-
-    resultsArray.forEach((results, index) => {
-        const weight = weights[index] || 1;
-        results.forEach(result => {
-            const id = result.item.id;
-            const weightedScore = result.score * weight;
-
-            if (!scoreMap.has(id)) {
-                scoreMap.set(id, { item: result.item, score: weightedScore, count: 1 });
-            } else {
-                const existing = scoreMap.get(id);
-                // Lower score is better in Fuse.js, so take the minimum
-                existing.score = Math.min(existing.score, weightedScore);
-                existing.count++;
-            }
-        });
-    });
-
-    // Convert back to array and sort by score (lower is better)
-    return Array.from(scoreMap.values())
-        .sort((a, b) => {
-            // Prioritize items found in multiple searches
-            if (a.count !== b.count) return b.count - a.count;
-            return a.score - b.score;
-        })
-        .slice(0, 5); // Return top 5 results
-};
-
-async function generateBillFormData({ processedData, jobid: jobidFromProps, bodyshopid, partsorderid, req }) {
-    const client = req.userGraphQLClient;
-
-    let jobid = jobidFromProps;
-    //If no jobid, fetch it, and funnel it back. 
-    if (!jobid || jobid === null || jobid === undefined || jobid === "" || jobid === "null" || jobid === "undefined") {
-        const ro_number = processedData.summary?.PO_NUMBER?.value || Object.values(processedData.summary).find(value => value.normalizedLabel === 'ro_number')?.value;
-        if (!ro_number) {
-            throw new Error("Could not find RO number in the extracted data to associate with the bill. Select an RO and try again.");
-        }
-
-        const { jobs } = await client.request(`
-            query QUERY_BILL_OCR_JOB_BY_RO($ro_number: String!) {
-                    jobs(where: {ro_number: {_eq: $ro_number}}) {
-                        id
-                    }
-                }`, { ro_number });
-
-        if (jobs.length === 0) {
-            throw new Error("No job found for the detected RO/PO number.");
-        }
-        jobid = jobs[0].id;
-    }
-
-    const jobData = await client.request(`
-   query QUERY_BILL_OCR_DATA($jobid: uuid!) {
-  vendors {
-    id
-    name
-  }
-  jobs_by_pk(id: $jobid) {
-    id
-    bodyshop {
-      id
-      md_responsibility_centers
-      cdk_dealerid
-      pbs_serialnumber
-      rr_dealerid
-    }
-    joblines {
-      id
-      line_desc
-      removed
-      act_price
-      db_price
-      oem_partno
-      alt_partno
-      part_type
-    }
-  }
-
-}
-   `, {
-        jobid,  // TODO: Parts order IDs are currently ignore. If receving a parts order, it could be used to more precisely match to joblines.
-    });
-
-    //Create fuses of line descriptions for matching.
-    const jobLineDescFuse = new Fuse(
-        jobData.jobs_by_pk.joblines.map(jl => ({ ...jl, line_desc_normalized: normalizeText(jl.line_desc || ""), oem_partno_normalized: normalizePartNumber(jl.oem_partno || ""), alt_partno_normalized: normalizePartNumber(jl.alt_partno || "") })),
-        {
-            keys: [{
-                name: 'line_desc',
-                weight: 6
-            }, {
-                name: 'oem_partno',
-                weight: 8
-            }, {
-                name: 'alt_partno',
-                weight: 5
-            },
-            {
-                name: 'act_price',
-                weight: 1
-            },
-            {
-                name: 'line_desc_normalized',
-                weight: 4
-            },
-            {
-                name: 'oem_partno_normalized',
-                weight: 6
-            },
-            {
-                name: 'alt_partno_normalized',
-                weight: 3
-            }],
-            threshold: 0.4, //Adjust as needed for matching sensitivity,
-            includeScore: true,
-
-        }
-    );
-    const joblineMatches = joblineFuzzySearch({ fuseToSearch: jobLineDescFuse, processedData });
-
-    const vendorFuse = new Fuse(
-        jobData.vendors.map(v => ({ ...v, name_normalized: normalizeText(v.name) })),
-        {
-            keys: [{ name: "name", weight: 3 }, { name: 'name_normalized', weight: 2 }],
-            threshold: 0.4,
-            includeScore: true,
-        },
-
-    );
-
-    const vendorMatches = vendorFuse.search(normalizeText(processedData.summary?.VENDOR_NAME?.value || processedData.summary?.NAME?.value));
-
-    let vendorid;
-    if (vendorMatches.length > 0) {
-        vendorid = vendorMatches[0].item.id;
-    }
-    const { jobs_by_pk: job } = jobData;
-    if (!job) {
-        throw new Error('Job not found for bill form data generation.');
-    }
-
-
-    //Is there a subtotal level discount? If there is, we need to figure out what the percentage is, and apply that to the actual cost as a reduction
-    const subtotalDiscountValueRaw = processedData.summary?.DISCOUNT?.value || processedData.summary?.SUBTOTAL_DISCOUNT?.value || 0;
-    let discountPercentageDecimal = 0;
-    if (subtotalDiscountValueRaw) {
-        const subtotal = parseFloat(normalizePrice(processedData.summary?.SUBTOTAL?.value || 0)) || 0;
-        const subtotalDiscountValue = parseFloat(normalizePrice(subtotalDiscountValueRaw)) || 0;
-        if (subtotal > 0 && subtotalDiscountValue) {
-            // Store discount percentage as a decimal (e.g. 20.5% => 0.205),
-            // but only allow half-percent increments (0.005 steps).
-            discountPercentageDecimal = Math.abs(subtotalDiscountValue / subtotal);
-            discountPercentageDecimal = roundToIncrement(discountPercentageDecimal, 0.005);
-        }
-    }
-
-    //TODO: How do we handle freight lines and core charges? 
-    //Create the form data structure for the bill posting screen. 
-    const billFormData = {
-        "jobid": jobid,
-        "vendorid": vendorid,
-        "invoice_number": processedData.summary?.INVOICE_RECEIPT_ID?.value,
-        "date": processedData.summary?.INVOICE_RECEIPT_DATE?.value,
-        "is_credit_memo": false,
-        "total": normalizePrice(processedData.summary?.INVOICE_TOTAL?.value || processedData.summary?.TOTAL?.value),
-        "billlines": joblineMatches.map(jlMatchLine => {
-            const { matches, textractLineItem, } = jlMatchLine
-            //Matches should be pre-sorted, take the first one.
-            const matchToUse = matches.length > 0 ? matches[0] : null;
-
-            // Calculate confidence scores
-            const ocrConfidence = calculateTextractConfidence(textractLineItem);
-            const matchConfidence = calculateMatchConfidence(matches, matchToUse);
-            const overallConfidence = calculateOverallConfidence(ocrConfidence, matchConfidence);
-            //TODO: Should be using the textract if there is an exact match on the normalized label.
-            //if there isn't then we can do the below. 
-
-            let actualPrice, actualCost;
-            //TODO: What is several match on the normalized name? We need to pick the most likely one. 
-            const hasNormalizedActualPrice = Object.keys(textractLineItem).find(key => textractLineItem[key].normalizedLabel === 'actual_price');
-            const hasNormalizedActualCost = Object.keys(textractLineItem).find(key => textractLineItem[key].normalizedLabel === 'actual_cost');
-
-            if (hasNormalizedActualPrice) {
-                actualPrice = textractLineItem[hasNormalizedActualPrice].value;
-            }
-            if (hasNormalizedActualCost) {
-                actualCost = textractLineItem[hasNormalizedActualCost].value;
-            }
-
-            if (!hasNormalizedActualPrice || !hasNormalizedActualCost) {
-                //This is if there was no match found for normalized labels. 
-                //Check all prices, and generally the higher one will be the actual price and the lower one will be the cost. 
-                //Need to make sure that other random items are excluded. This should be within a reasonable range of the matched jobline at matchToUse.item.act_price
-                //Iterate over all of the text values, and check out which of them are currencies. 
-                //They'll be in the format starting with a $ sign usually.
-                const currencyTextractLineItems = [] // {key, value}
-                Object.keys(textractLineItem).forEach(key => {
-                    const currencyValue = textractLineItem[key].value?.startsWith('$') ? textractLineItem[key].value : null;
-                    if (currencyValue) {
-                        //Clean it and parse it
-                        const cleanValue = parseFloat(currencyValue.replace(/[^0-9.-]/g, '')) || 0;
-                        currencyTextractLineItems.push({ key, value: cleanValue })
-                    }
-                })
-
-                //Sort them descending
-                currencyTextractLineItems.sort((a, b) => b.value - a.value);
-                //Most expensive should be the actual price, second most expensive should be the cost.
-                if (!actualPrice) actualPrice = currencyTextractLineItems.length > 0 ? currencyTextractLineItems[0].value : 0;
-                if (!actualCost) actualCost = currencyTextractLineItems.length > 1 ? currencyTextractLineItems[1].value : 0;
-
-                if (matchToUse) {
-                    //Double check that they're within 50% of the matched jobline price if there is one.
-                    const joblinePrice = parseFloat(matchToUse.item.act_price) || 0;
-                    if (!hasNormalizedActualPrice && actualPrice > 0 && (actualPrice < joblinePrice * (1 - PRICE_PERCENT_MARGIN_TOLERANCE) || actualPrice > joblinePrice * (1 + PRICE_PERCENT_MARGIN_TOLERANCE))) {
-                        actualPrice = joblinePrice; //Set to the jobline as a fallback.
-                    }
-                    if (!hasNormalizedActualCost && actualCost > 0 && (actualCost < joblinePrice * (1 - PRICE_PERCENT_MARGIN_TOLERANCE) || actualCost > joblinePrice * (1 + PRICE_PERCENT_MARGIN_TOLERANCE))) {
-                        actualCost = null //Blank it out if it's not likely.
-                    }
-                }
-            }
-
-            //If there's nothing, just fall back to seeing if there's a price object from textract. 
-
-            if (!actualPrice && textractLineItem.PRICE) {
-                actualPrice = textractLineItem.PRICE.value;
-            }
-            if (!actualCost && textractLineItem.PRICE) {
-                actualCost = textractLineItem.PRICE.value;
-            }
-
-            //If quantity greater than 1, check if the actual cost is a multiple of the actual price, if so, divide it out to get the unit price.
-            const quantity = parseInt(textractLineItem?.QUANTITY?.value);
-            if (quantity && quantity > 1) {
-                if (actualPrice && quantity && Math.abs((actualPrice / quantity) - (parseFloat(matchToUse?.item?.act_price) || 0)) / ((parseFloat(matchToUse?.item?.act_price) || 1)) < PRICE_QUANTITY_MARGIN_TOLERANCE) {
-                    actualPrice = actualPrice / quantity;
-                }
-                if (actualCost && quantity && Math.abs((actualCost / quantity) - (parseFloat(matchToUse?.item?.act_price) || 0)) / ((parseFloat(matchToUse?.item?.act_price) || 1)) < PRICE_QUANTITY_MARGIN_TOLERANCE) {
-                    actualCost = actualCost / quantity;
-                }
-            }
-
-
-            if (discountPercentageDecimal > 0) {
-                actualCost = actualCost * (1 - discountPercentageDecimal);
-            }
-
-            const responsibilityCenters = job.bodyshop.md_responsibility_centers
-            //TODO: Do we need to verify the lines to see if it is a unit price or total price (i.e. quantity * price)
-            const lineObject = {
-                "line_desc": matchToUse?.item?.line_desc || textractLineItem.ITEM?.value || "NO DESCRIPTION",
-                "quantity": textractLineItem.QUANTITY?.value,
-                "actual_price": normalizePrice(actualPrice),
-                "actual_cost": normalizePrice(actualCost),
-                "cost_center": matchToUse?.item?.part_type
-                    ? bodyshopHasDmsKey(job.bodyshop)
-                        ? matchToUse?.item?.part_type !== "PAE"
-                            ? matchToUse?.item?.part_type
-                            : null
-                        : responsibilityCenters.defaults &&
-                        (responsibilityCenters.defaults.costs[matchToUse?.item?.part_type] || null)
-                    : null,
-                "applicable_taxes": {
-                    "federal": InstanceManager({ imex: true, rome: false }),
-                    "state": false,
-                    "local": false
-                },
-                "joblineid": matchToUse?.item?.id || "noline",
-                "confidence": `T${overallConfidence} - O${ocrConfidence} - J${matchConfidence}`
-            }
-            return lineObject
-        })
-    }
-
-    return billFormData
-
-}
-
-function joblineFuzzySearch({ fuseToSearch, processedData }) {
-    const matches = []
-    const searchStats = []; // Track search statistics
-
-    processedData.lineItems.forEach((lineItem, lineIndex) => {
-        const lineStats = {
-            lineNumber: lineIndex + 1,
-            searches: []
-        };
-
-        // Refined ITEM search (multi-word description)
-        const refinedItemResults = (() => {
-            if (!lineItem.ITEM?.value) return [];
-
-            const itemValue = lineItem.ITEM.value;
-            const normalized = normalizeText(itemValue);
-
-            //  1: Full string search
-            const fullSearch = fuseToSearch.search(normalized);
-            lineStats.searches.push({ type: 'ITEM - Full String', term: normalized, results: fullSearch.length });
-
-            //  2: Search individual significant words (3+ chars)
-            const words = normalized.split(' ').filter(w => w.length >= 3);
-            const wordSearches = words.map(word => {
-                const results = fuseToSearch.search(word);
-                lineStats.searches.push({ type: 'ITEM - Individual Word', term: word, results: results.length });
-                return results;
-            });
-
-            //  3: Search without spaces entirely
-            const noSpaceSearch = fuseToSearch.search(normalized.replace(/\s+/g, ''));
-            lineStats.searches.push({ type: 'ITEM - No Spaces', term: normalized.replace(/\s+/g, ''), results: noSpaceSearch.length });
-
-            // Merge results with weights (full search weighted higher)
-            return mergeResults(
-                [fullSearch, ...wordSearches, noSpaceSearch],
-                [1.0, ...words.map(() => 1.5), 1.2] // Full search best, individual words penalized slightly
-            );
-        })();
-
-        // Refined PRODUCT_CODE search (part numbers)
-        const refinedProductCodeResults = (() => {
-            if (!lineItem.PRODUCT_CODE?.value) return [];
-
-            const productCode = lineItem.PRODUCT_CODE.value;
-            const normalized = normalizePartNumber(productCode);
-
-            //  1: Normalized search (no spaces/special chars)
-            const normalizedSearch = fuseToSearch.search(normalized);
-            lineStats.searches.push({ type: 'PRODUCT_CODE - Normalized', term: normalized, results: normalizedSearch.length });
-
-            //  2: Original with minimal cleaning
-            const minimalClean = productCode.replace(/\s+/g, '').toUpperCase();
-            const minimalSearch = fuseToSearch.search(minimalClean);
-            lineStats.searches.push({ type: 'PRODUCT_CODE - Minimal Clean', term: minimalClean, results: minimalSearch.length });
-
-            //  3: Search with dashes (common in part numbers)
-            const withDashes = productCode.replace(/[^a-zA-Z0-9-]/g, '').toUpperCase();
-            const dashSearch = fuseToSearch.search(withDashes);
-            lineStats.searches.push({ type: 'PRODUCT_CODE - With Dashes', term: withDashes, results: dashSearch.length });
-
-            //  4: Special chars to spaces (preserve word boundaries)
-            const specialCharsToSpaces = productCode.replace(/[^a-zA-Z0-9\s]/g, ' ').replace(/\s+/g, ' ').trim().toUpperCase();
-            const specialCharsSearch = fuseToSearch.search(specialCharsToSpaces);
-            lineStats.searches.push({ type: 'PRODUCT_CODE - Special Chars to Spaces', term: specialCharsToSpaces, results: specialCharsSearch.length });
-
-            return mergeResults(
-                [normalizedSearch, minimalSearch, dashSearch, specialCharsSearch],
-                [1.0, 1.1, 1.2, 1.15] // Prefer fully normalized, special chars to spaces slightly weighted
-            );
-        })();
-
-        // Refined PRICE search
-        const refinedPriceResults = (() => {
-            if (!lineItem.PRICE?.value) return [];
-
-            const price = normalizePrice(lineItem.PRICE.value);
-
-            //  1: Exact price match
-            const exactSearch = fuseToSearch.search(price);
-            lineStats.searches.push({ type: 'PRICE - Exact', term: price, results: exactSearch.length });
-
-            //  2: Price with 2 decimal places
-            const priceFloat = parseFloat(price);
-            if (!isNaN(priceFloat)) {
-                const formattedPrice = priceFloat.toFixed(2);
-                const formattedSearch = fuseToSearch.search(formattedPrice);
-                lineStats.searches.push({ type: 'PRICE - Formatted (2 decimals)', term: formattedPrice, results: formattedSearch.length });
-
-                return mergeResults([exactSearch, formattedSearch], [1.0, 1.1]);
-            }
-
-            return exactSearch;
-        })();
-
-        // Refined UNIT_PRICE search
-        const refinedUnitPriceResults = (() => {
-            if (!lineItem.UNIT_PRICE?.value) return [];
-
-            const unitPrice = normalizePrice(lineItem.UNIT_PRICE.value);
-
-            //  1: Exact price match
-            const exactSearch = fuseToSearch.search(unitPrice);
-            lineStats.searches.push({ type: 'UNIT_PRICE - Exact', term: unitPrice, results: exactSearch.length });
-
-            //  2: Price with 2 decimal places
-            const priceFloat = parseFloat(unitPrice);
-            if (!isNaN(priceFloat)) {
-                const formattedPrice = priceFloat.toFixed(2);
-                const formattedSearch = fuseToSearch.search(formattedPrice);
-                lineStats.searches.push({ type: 'UNIT_PRICE - Formatted (2 decimals)', term: formattedPrice, results: formattedSearch.length });
-
-                return mergeResults([exactSearch, formattedSearch], [1.0, 1.1]);
-            }
-
-            return exactSearch;
-        })();
-
-        //Merge them all together and sort by the highest scores.
-        const combinedScoreMap = new Map();
-
-        // Weight different field types differently
-        const fieldWeights = {
-            productCode: 5.0,  // Most important - part numbers should match
-            item: 3.0,         // Second most important - description
-            price: 1.0,        // Less important - prices can vary
-            unitPrice: 0.8     // Least important - similar to price
-        };
-
-        [
-            { results: refinedProductCodeResults, weight: fieldWeights.productCode, field: 'productCode' },
-            { results: refinedItemResults, weight: fieldWeights.item, field: 'item' },
-            { results: refinedPriceResults, weight: fieldWeights.price, field: 'price' },
-            { results: refinedUnitPriceResults, weight: fieldWeights.unitPrice, field: 'unitPrice' }
-        ].forEach(({ results, weight, field }) => {
-            results.forEach((result, index) => {
-                const id = result.item.id;
-
-                // Position bonus (first result is better than fifth)
-                const positionBonus = (5 - index) / 5;
-
-                // Lower score is better in Fuse.js, so invert it and apply weights
-                const normalizedScore = (1 - result.score) * weight * positionBonus;
-
-                if (!combinedScoreMap.has(id)) {
-                    combinedScoreMap.set(id, {
-                        item: result.item,
-                        score: normalizedScore,
-                        fieldMatches: [field],
-                        matchCount: result.count || 1
-                    });
-                } else {
-                    const existing = combinedScoreMap.get(id);
-                    existing.score += normalizedScore;
-                    existing.fieldMatches.push(field);
-                    existing.matchCount += (result.count || 1);
-                }
-            });
-        });
-
-        // Convert to array and sort by best combined score
-        const finalMatches = Array.from(combinedScoreMap.values())
-            .map(entry => {
-                // Apply penalty if item has no act_price or it's 0
-                const hasPriceData = entry.item.act_price && parseFloat(entry.item.act_price) > 0;
-                const priceDataPenalty = hasPriceData ? 1.0 : 0.5; // 50% penalty if no price
-
-                return {
-                    ...entry,
-                    // Boost score for items that matched in multiple fields, penalize for missing price
-                    finalScore: entry.score * (1 + (entry.fieldMatches.length * 0.2)) * priceDataPenalty,
-                    hasPriceData
-                };
-            })
-            .sort((a, b) => b.finalScore - a.finalScore)
-            .slice(0, 5);
-
-        // Always push the textract line item, even if no matches found
-        // This ensures all invoice lines are processed
-        matches.push({
-            matches: finalMatches,
-            textractLineItem: lineItem,
-            hasMatch: finalMatches.length > 0
-        });
-
-        searchStats.push(lineStats);
-
-    })
-
-    // // Output search statistics table
-    // console.log('\n═══════════════════════════════════════════════════════════════════════');
-    // console.log('                    FUSE.JS SEARCH STATISTICS');
-    // console.log('═══════════════════════════════════════════════════════════════════════\n');
-
-    // searchStats.forEach(lineStat => {
-    //     console.log(`📄 Line Item #${lineStat.lineNumber}:`);
-    //     console.log('─'.repeat(75));
-
-    //     if (lineStat.searches.length > 0) {
-    //         const tableData = lineStat.searches.map(search => ({
-    //             'Search Type': search.type,
-    //             'Search Term': search.term.substring(0, 40) + (search.term.length > 40 ? '...' : ''),
-    //             'Results': search.results
-    //         }));
-    //         console.table(tableData);
-    //     } else {
-    //         console.log('  No searches performed for this line item.\n');
-    //     }
-    // });
-
-    // // Summary statistics
-    // const totalSearches = searchStats.reduce((sum, stat) => sum + stat.searches.length, 0);
-    // const totalResults = searchStats.reduce((sum, stat) =>
-    //     sum + stat.searches.reduce((s, search) => s + search.results, 0), 0);
-    // const avgResultsPerSearch = totalSearches > 0 ? (totalResults / totalSearches).toFixed(2) : 0;
-
-    // console.log('═══════════════════════════════════════════════════════════════════════');
-    // console.log('                         SUMMARY');
-    // console.log('═══════════════════════════════════════════════════════════════════════');
-    // console.table({
-    //     'Total Line Items': processedData.lineItems.length,
-    //     'Total Searches Performed': totalSearches,
-    //     'Total Results Found': totalResults,
-    //     'Average Results per Search': avgResultsPerSearch
-    // });
-    // console.log('═══════════════════════════════════════════════════════════════════════\n');
-
-    return matches
-}
-
-const bodyshopHasDmsKey = (bodyshop) =>
-    bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || bodyshop.rr_dealerid;
-
-
-module.exports = {
-    generateBillFormData,
-    normalizePrice
-}
diff --git a/server/ai/bill-ocr/bill-ocr-helpers.js b/server/ai/bill-ocr/bill-ocr-helpers.js
deleted file mode 100644
index 8f8cf58d9..000000000
--- a/server/ai/bill-ocr/bill-ocr-helpers.js
+++ /dev/null
@@ -1,159 +0,0 @@
-const PDFDocument = require('pdf-lib').PDFDocument;
-const logger = require("../../utils/logger");
-const TEXTRACT_REDIS_PREFIX = `textract:${process.env?.NODE_ENV}`
-const TEXTRACT_JOB_TTL = 10 * 60;
-
-
-/**
- * Generate Redis key for Textract job using textract job ID
- * @param {string} textractJobId 
- * @returns {string}
- */
-function getTextractJobKey(textractJobId) {
-    return `${TEXTRACT_REDIS_PREFIX}:${textractJobId}`;
-}
-
-
-/**
- * Store Textract job data in Redis
- * @param {string} textractJobId 
- * @param {Object} redisPubClient
- * @param {Object} jobData 
- */
-async function setTextractJob({ redisPubClient, textractJobId, jobData }) {
-    if (!redisPubClient) {
-        throw new Error('Redis client not initialized. Call initializeBillOcr first.');
-    }
-    const key = getTextractJobKey(textractJobId);
-    await redisPubClient.set(key, JSON.stringify(jobData));
-    await redisPubClient.expire(key, TEXTRACT_JOB_TTL);
-}
-
-/**
- * Retrieve Textract job data from Redis
- * @param {string} textractJobId 
- * @param {Object} redisPubClient
- * @returns {Promise<Object|null>}
- */
-async function getTextractJob({ redisPubClient, textractJobId }) {
-    if (!redisPubClient) {
-        throw new Error('Redis client not initialized. Call initializeBillOcr first.');
-    }
-    const key = getTextractJobKey(textractJobId);
-    const data = await redisPubClient.get(key);
-    return data ? JSON.parse(data) : null;
-}
-
-/**
- * Detect file type based on MIME type and file signature
- * @param {Object} file - Multer file object
- * @returns {string} 'pdf', 'image', or 'unknown'
- */
-function getFileType(file) {
-    // Check MIME type first
-    const mimeType = file.mimetype?.toLowerCase();
-
-    if (mimeType === 'application/pdf') {
-        return 'pdf';
-    }
-
-    if (mimeType && mimeType.startsWith('image/')) {
-        return 'image';
-    }
-
-    // Fallback: Check file signature (magic bytes)
-    const buffer = file.buffer;
-    if (buffer && buffer.length > 4) {
-        // PDF signature: %PDF
-        if (buffer[0] === 0x25 && buffer[1] === 0x50 && buffer[2] === 0x44 && buffer[3] === 0x46) {
-            return 'pdf';
-        }
-
-        // JPEG signature: FF D8 FF
-        if (buffer[0] === 0xFF && buffer[1] === 0xD8 && buffer[2] === 0xFF) {
-            return 'image';
-        }
-
-        // PNG signature: 89 50 4E 47
-        if (buffer[0] === 0x89 && buffer[1] === 0x50 && buffer[2] === 0x4E && buffer[3] === 0x47) {
-            return 'image';
-        }
-
-        // HEIC/HEIF: Check for ftyp followed by heic/heix/hevc/hevx
-        if (buffer.length > 12) {
-            const ftypIndex = buffer.indexOf(Buffer.from('ftyp'));
-            if (ftypIndex > 0 && ftypIndex < 12) {
-                const brand = buffer.slice(ftypIndex + 4, ftypIndex + 8).toString('ascii');
-                if (brand.startsWith('heic') || brand.startsWith('heix') ||
-                    brand.startsWith('hevc') || brand.startsWith('hevx') ||
-                    brand.startsWith('mif1')) {
-                    return 'image';
-                }
-            }
-        }
-    }
-
-    return 'unknown';
-}
-
-/**
- * Get the number of pages in a PDF buffer
- * @param {Buffer} pdfBuffer 
- * @returns {Promise<number>}
- */
-async function getPdfPageCount(pdfBuffer) {
-    try {
-        const pdfDoc = await PDFDocument.load(pdfBuffer);
-        return pdfDoc.getPageCount();
-    } catch (error) {
-        console.error('Error reading PDF page count:', error);
-        throw new Error('Failed to read PDF: ' + error.message);
-    }
-}
-
-/**
- * Check if there are any jobs in IN_PROGRESS status
- * @returns {Promise<boolean>}
- */
-async function hasActiveJobs({ redisPubClient }) {
-    if (!redisPubClient) {
-        throw new Error('Redis client not initialized.');
-    }
-
-    try {
-        // Get all textract job keys
-        const pattern = `${TEXTRACT_REDIS_PREFIX}:*`;
-        const keys = await redisPubClient.keys(pattern);
-
-        if (!keys || keys.length === 0) {
-            return false;
-        }
-        //TODO: Is there a better way to do this that supports clusters? 
-        // Check if any job has IN_PROGRESS status
-        for (const key of keys) {
-            const data = await redisPubClient.get(key);
-            if (data) {
-                const jobData = JSON.parse(data);
-                if (jobData.status === 'IN_PROGRESS') {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    } catch (error) {
-        logger.log("bill-ocr-job-check-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
-        return false;
-    }
-}
-
-module.exports = {
-    getTextractJobKey,
-    setTextractJob,
-    getTextractJob,
-    getFileType,
-    getPdfPageCount,
-    hasActiveJobs,
-    TEXTRACT_REDIS_PREFIX
-}
-
diff --git a/server/ai/bill-ocr/bill-ocr-normalize.js b/server/ai/bill-ocr/bill-ocr-normalize.js
deleted file mode 100644
index ed773070e..000000000
--- a/server/ai/bill-ocr/bill-ocr-normalize.js
+++ /dev/null
@@ -1,202 +0,0 @@
-
-const MIN_CONFIDENCE_VALUE = 50
-
-function normalizeFieldName(fieldType) {
-    //Placeholder normalization for now. 
-    return fieldType;
-}
-
-const standardizedFieldsnames = {
-    actual_cost: "actual_cost",
-    actual_price: "actual_price",
-    line_desc: "line_desc",
-    quantity: "quantity",
-    part_no: "part_no",
-    ro_number: "ro_number",
-}
-
-function normalizeLabelName(labelText) {
-    if (!labelText) return '';
-
-    // Convert to lowercase and trim whitespace
-    let normalized = labelText.toLowerCase().trim();
-
-    // Remove special characters and replace spaces with underscores
-    normalized = normalized.replace(/[^a-z0-9\s]/g, '').replace(/\s+/g, '_');
-
-
-    // Common label normalizations
-    const labelMap = {
-        'qty': standardizedFieldsnames.quantity,
-        'qnty': standardizedFieldsnames.quantity,
-        'sale_qty': standardizedFieldsnames.quantity,
-        'invoiced_qty': standardizedFieldsnames.quantity,
-        'qty_shipped': standardizedFieldsnames.quantity,
-        'quantity': standardizedFieldsnames.quantity,
-        'filled': standardizedFieldsnames.quantity,
-        'count': standardizedFieldsnames.quantity,
-        'quant': standardizedFieldsnames.quantity,
-        'desc': standardizedFieldsnames.line_desc,
-        'description': standardizedFieldsnames.line_desc,
-        'item': standardizedFieldsnames.line_desc,
-        'part': standardizedFieldsnames.part_no,
-        'part_no': standardizedFieldsnames.part_no,
-        'part_num': standardizedFieldsnames.part_no,
-        'part_number': standardizedFieldsnames.part_no,
-        'item_no': standardizedFieldsnames.part_no,
-        'price': standardizedFieldsnames.actual_price,
-        //'amount': standardizedFieldsnames.actual_price,
-        'list_price': standardizedFieldsnames.actual_price,
-        'unit_price': standardizedFieldsnames.actual_price,
-        'list': standardizedFieldsnames.actual_price,
-        'retail_price': standardizedFieldsnames.actual_price,
-        'retail': standardizedFieldsnames.actual_price,
-        'net': standardizedFieldsnames.actual_cost,
-        'selling_price': standardizedFieldsnames.actual_cost,
-        'net_price': standardizedFieldsnames.actual_cost,
-        'net_cost': standardizedFieldsnames.actual_cost,
-        'total': standardizedFieldsnames.actual_cost,
-        'po_no': standardizedFieldsnames.ro_number,
-        'customer_po_no': standardizedFieldsnames.ro_number,
-        'customer_po_no_': standardizedFieldsnames.ro_number
-
-    };
-
-    return labelMap[normalized] || `NOT_MAPPED => ${normalized}`; // TODO: Should we monitor unmapped labels?
-}
-
-function processScanData(invoiceData) {
-    // Process and clean the extracted data
-    const processed = {
-        summary: {},
-        lineItems: []
-    };
-
-    // Clean summary fields
-    for (const [key, value] of Object.entries(invoiceData.summary)) {
-        if (value.confidence > MIN_CONFIDENCE_VALUE) { // Only include fields with > 50% confidence
-            processed.summary[key] = {
-                value: value.value,
-                label: value.label,
-                normalizedLabel: value.normalizedLabel,
-                confidence: value.confidence
-            };
-        }
-    }
-
-    // Process line items
-    processed.lineItems = invoiceData.lineItems
-        .map(item => {
-            const processedItem = {};
-
-            for (const [key, value] of Object.entries(item)) {
-                if (value.confidence > MIN_CONFIDENCE_VALUE) { // Only include fields with > 50% confidence
-                    let cleanValue = value.value;
-
-                    // Parse numbers for quantity and price fields
-                    if (key === 'quantity') {
-                        cleanValue = parseFloat(cleanValue) || 0;
-                    } else if (key === 'retail_price' || key === 'actual_price') {
-                        // Remove currency symbols and parse
-                        cleanValue = parseFloat(cleanValue.replace(/[^0-9.-]/g, '')) || 0;
-                    }
-
-                    processedItem[key] = {
-                        value: cleanValue,
-                        label: value.label,
-                        normalizedLabel: value.normalizedLabel,
-                        confidence: value.confidence
-                    };
-                }
-            }
-
-            return processedItem;
-        })
-
-    return processed;
-}
-
-function extractInvoiceData(textractResponse) {
-    const invoiceData = {
-        summary: {},
-        lineItems: []
-    };
-
-    if (!textractResponse.ExpenseDocuments || textractResponse.ExpenseDocuments.length === 0) {
-        return invoiceData;
-    }
-
-    // Process each page of the invoice
-    textractResponse.ExpenseDocuments.forEach(expenseDoc => {
-        // Extract summary fields (vendor, invoice number, date, total, etc.)
-        if (expenseDoc.SummaryFields) {
-            expenseDoc.SummaryFields.forEach(field => {
-                const fieldType = field.Type?.Text || '';
-                const fieldValue = field.ValueDetection?.Text || '';
-                const fieldLabel = field.LabelDetection?.Text || '';
-                const confidence = field.ValueDetection?.Confidence || 0;
-
-                // Map common invoice fields
-                if (fieldType && fieldValue) {
-                    invoiceData.summary[fieldType] = {
-                        value: fieldValue,
-                        label: fieldLabel,
-                        normalizedLabel: normalizeLabelName(fieldLabel),
-                        confidence: confidence
-                    };
-                }
-            });
-        }
-
-        // Extract line items
-        if (expenseDoc.LineItemGroups) {
-            expenseDoc.LineItemGroups.forEach(lineItemGroup => {
-                if (lineItemGroup.LineItems) {
-                    lineItemGroup.LineItems.forEach(lineItem => {
-                        const item = {};
-                        const fieldNameCounts = {}; // Track field name occurrences
-
-                        if (lineItem.LineItemExpenseFields) {
-                            lineItem.LineItemExpenseFields.forEach(field => {
-                                const fieldType = field.Type?.Text || '';
-                                const fieldValue = field.ValueDetection?.Text || '';
-                                const fieldLabel = field.LabelDetection?.Text || '';
-                                const confidence = field.ValueDetection?.Confidence || 0;
-
-                                if (fieldType && fieldValue) {
-                                    // Normalize field names
-                                    let normalizedField = normalizeFieldName(fieldType);
-
-                                    // Ensure uniqueness by appending a counter if the field already exists
-                                    if (Object.prototype.hasOwnProperty.call(item, normalizedField)) {
-                                        fieldNameCounts[normalizedField] = (fieldNameCounts[normalizedField] || 1) + 1;
-                                        normalizedField = `${normalizedField}_${fieldNameCounts[normalizedField]}`;
-                                    }
-
-                                    item[normalizedField] = {
-                                        value: fieldValue,
-                                        label: fieldLabel,
-                                        normalizedLabel: normalizeLabelName(fieldLabel),
-                                        confidence: confidence
-                                    };
-                                }
-                            });
-                        }
-
-                        if (Object.keys(item).length > 0) {
-                            invoiceData.lineItems.push(item);
-                        }
-                    });
-                }
-            });
-        }
-    });
-
-    return invoiceData;
-}
-
-module.exports = {
-    extractInvoiceData,
-    processScanData,
-    standardizedFieldsnames
-}
\ No newline at end of file
diff --git a/server/ai/bill-ocr/bill-ocr-readme.md b/server/ai/bill-ocr/bill-ocr-readme.md
deleted file mode 100644
index c9709483a..000000000
--- a/server/ai/bill-ocr/bill-ocr-readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Required Infrastructure setup
-1. Create an AI user that has access to the required S3 buckets and textract permissions.
-2. Had to create a queue and SNS topic. had to also create the role that had `sns:Publish`. Had to add `sqs:ReceiveMessage` and `sqs:DeleteMessage` to the profile.
-3. Created 2 roles for SNS. The textract role is the right one, the other was created manually based on incorrect instructions. 
-
-TODO:
-* Create a rome bucket for uploads, or move to the regular spot.
-* Add environment variables.
\ No newline at end of file
diff --git a/server/ai/bill-ocr/bill-ocr.js b/server/ai/bill-ocr/bill-ocr.js
deleted file mode 100644
index 26e77033a..000000000
--- a/server/ai/bill-ocr/bill-ocr.js
+++ /dev/null
@@ -1,465 +0,0 @@
-const { TextractClient, StartExpenseAnalysisCommand, GetExpenseAnalysisCommand, AnalyzeExpenseCommand } = require("@aws-sdk/client-textract");
-const { S3Client, PutObjectCommand } = require("@aws-sdk/client-s3");
-const { SQSClient, ReceiveMessageCommand, DeleteMessageCommand } = require("@aws-sdk/client-sqs");
-const { v4: uuidv4 } = require('uuid');
-const { getTextractJobKey, setTextractJob, getTextractJob, getFileType, getPdfPageCount, hasActiveJobs } = require("./bill-ocr-helpers");
-const { extractInvoiceData, processScanData } = require("./bill-ocr-normalize");
-const { generateBillFormData } = require("./bill-ocr-generator");
-const logger = require("../../utils/logger");
-const _ = require("lodash");
-
-// Initialize AWS clients
-const awsConfig = {
-    region: process.env.AWS_AI_REGION || "ca-central-1",
-    credentials: {
-        accessKeyId: process.env.AWS_AI_ACCESS_KEY_ID,
-        secretAccessKey: process.env.AWS_AI_SECRET_ACCESS_KEY,
-    }
-};
-
-const textractClient = new TextractClient(awsConfig);
-const s3Client = new S3Client(awsConfig);
-const sqsClient = new SQSClient(awsConfig);
-
-let redisPubClient = null;
-
-
-/**
- * Initialize the bill-ocr module with Redis client
- * @param {Object} pubClient - Redis cluster client
- */
-function initializeBillOcr(pubClient) {
-    redisPubClient = pubClient;
-}
-
-/**
- * Check if job exists by Textract job ID
- * @param {string} textractJobId 
- * @returns {Promise<boolean>}
- */
-async function jobExists(textractJobId) {
-    if (!redisPubClient) {
-        throw new Error('Redis client not initialized. Call initializeBillOcr first.');
-    }
-    const key = getTextractJobKey(textractJobId);
-    const exists = await redisPubClient.exists(key);
-
-    if (exists) {
-        return true;
-    }
-    return false;
-}
-
-async function handleBillOcr(req, res) {
-    // Check if file was uploaded
-    if (!req.file) {
-        return res.status(400).send({ error: 'No file uploaded.' });
-    }
-
-    // The uploaded file is available in request file
-    const uploadedFile = req.file;
-    const { jobid, bodyshopid, partsorderid } = req.body;
-    logger.log("bill-ocr-start", "DEBUG", req.user.email, jobid, null);
-
-    try {
-        const fileType = getFileType(uploadedFile);
-        // Images are always processed synchronously (single page)
-        if (fileType === 'image') {
-            const processedData = await processSinglePageDocument(uploadedFile.buffer);
-            const billForm = await generateBillFormData({ processedData: processedData, jobid, bodyshopid, partsorderid, req: req });
-            logger.log("bill-ocr-single-complete", "DEBUG", req.user.email, jobid, { ..._.omit(processedData, "originalTextractResponse"), billForm });
-
-            return res.status(200).json({
-                success: true,
-                status: 'COMPLETED',
-                data: { ...processedData, billForm },
-                message: 'Invoice processing completed'
-            });
-        } else if (fileType === 'pdf') {
-            // Check the number of pages in the PDF
-            const pageCount = await getPdfPageCount(uploadedFile.buffer);
-
-            if (pageCount === 1) {
-                // Process synchronously for single-page documents
-                const processedData = await processSinglePageDocument(uploadedFile.buffer);
-                const billForm = await generateBillFormData({ processedData: processedData, jobid, bodyshopid, partsorderid, req: req });
-                logger.log("bill-ocr-single-complete", "DEBUG", req.user.email, jobid, { ..._.omit(processedData, "originalTextractResponse"), billForm });
-                return res.status(200).json({
-                    success: true,
-                    status: 'COMPLETED',
-                    data: { ...processedData, billForm },
-                    message: 'Invoice processing completed'
-                });
-            }
-            // Start the Textract job (non-blocking) for multi-page documents
-            const jobInfo = await startTextractJob(uploadedFile.buffer, { jobid, bodyshopid, partsorderid });
-            logger.log("bill-ocr-multipage-start", "DEBUG", req.user.email, jobid, jobInfo);
-
-            return res.status(202).json({
-                success: true,
-                textractJobId: jobInfo.jobId,
-                message: 'Invoice processing started',
-                statusUrl: `/ai/bill-ocr/status/${jobInfo.jobId}`
-            });
-
-        } else {
-            logger.log("bill-ocr-unsupported-filetype", "WARN", req.user.email, jobid, { fileType });
-
-            return res.status(400).json({
-                error: 'Unsupported file type',
-                message: 'Please upload a PDF or supported image file (JPEG, PNG, TIFF)'
-            });
-        }
-    } catch (error) {
-        logger.log("bill-ocr-error", "ERROR", req.user.email, jobid, { error: error.message, stack: error.stack });
-        return res.status(500).json({
-            error: 'Failed to start invoice processing',
-            message: error.message
-        });
-    }
-}
-
-async function handleBillOcrStatus(req, res) {
-    const { textractJobId } = req.params;
-
-    if (!textractJobId) {
-        logger.log("bill-ocr-status-error", "WARN", req.user.email, null, { error: 'No textractJobId found in params' });
-        return res.status(400).json({ error: 'Job ID is required' });
-
-    }
-    const jobStatus = await getTextractJob({ redisPubClient, textractJobId });
-
-    if (!jobStatus) {
-        return res.status(404).json({ error: 'Job not found' });
-    }
-
-    if (jobStatus.status === 'COMPLETED') {
-        // Generate billForm on-demand if not already generated
-        let billForm = jobStatus.data?.billForm;
-
-        if (!billForm && jobStatus.context) {
-            try {
-                billForm = await generateBillFormData({
-                    processedData: jobStatus.data,
-                    jobid: jobStatus.context.jobid,
-                    bodyshopid: jobStatus.context.bodyshopid,
-                    partsorderid: jobStatus.context.partsorderid,
-                    req: req // Now we have request context!
-                });
-                logger.log("bill-ocr-multipage-complete", "DEBUG", req.user.email, jobStatus.context.jobid, { ...jobStatus.data, billForm });
-
-                // Cache the billForm back to Redis for future requests
-                await setTextractJob({
-                    redisPubClient,
-                    textractJobId,
-                    jobData: {
-                        ...jobStatus,
-                        data: {
-                            ...jobStatus.data,
-                            billForm
-                        }
-                    }
-                });
-            } catch (error) {
-                logger.log("bill-ocr-multipage-error", "ERROR", req.user.email, jobStatus.context.jobid, { ...jobStatus.data, error: error.message, stack: error.stack });
-
-                return res.status(500).send({
-                    status: 'COMPLETED',
-                    error: 'Data processed but failed to generate bill form',
-                    message: error.message,
-                    data: jobStatus.data // Still return the raw processed data
-                });
-
-            }
-        }
-
-        return res.status(200).send({
-            status: 'COMPLETED',
-            data: {
-                ...jobStatus.data,
-                billForm
-            }
-        });
-    } else if (jobStatus.status === 'FAILED') {
-        logger.log("bill-ocr-multipage-failed", "ERROR", req.user.email, jobStatus.context.jobid, { ...jobStatus.data, error: jobStatus.error, });
-
-        return res.status(500).json({
-            status: 'FAILED',
-            error: jobStatus.error
-        });
-    } else {
-        return res.status(200).json({
-            status: jobStatus.status
-        });
-    }
-}
-
-/**
- * Process a single-page document synchronously using AnalyzeExpenseCommand
- * @param {Buffer} pdfBuffer 
- * @returns {Promise<Object>}
- */
-async function processSinglePageDocument(pdfBuffer) {
-    const analyzeCommand = new AnalyzeExpenseCommand({
-        Document: {
-            Bytes: pdfBuffer
-        }
-    });
-
-    const result = await textractClient.send(analyzeCommand);
-    const invoiceData = extractInvoiceData(result);
-    const processedData = processScanData(invoiceData);
-
-    return {
-        ...processedData,
-        originalTextractResponse: result
-    };
-}
-
-async function startTextractJob(pdfBuffer, context = {}) {
-    // Upload PDF to S3 temporarily for Textract async processing
-    const { bodyshopid, jobid } = context;
-    const s3Bucket = process.env.AWS_AI_BUCKET;
-    const snsTopicArn = process.env.AWS_TEXTRACT_SNS_TOPIC_ARN;
-    const snsRoleArn = process.env.AWS_TEXTRACT_SNS_ROLE_ARN;
-
-    if (!s3Bucket) {
-        throw new Error('AWS_AI_BUCKET environment variable is required');
-    }
-    if (!snsTopicArn) {
-        throw new Error('AWS_TEXTRACT_SNS_TOPIC_ARN environment variable is required');
-    }
-    if (!snsRoleArn) {
-        throw new Error('AWS_TEXTRACT_SNS_ROLE_ARN environment variable is required');
-    }
-
-    const uploadId = uuidv4();
-    const s3Key = `textract-temp/${bodyshopid}/${jobid}/${uploadId}.pdf`; //TODO Update Keys structure to something better. 
-
-    // Upload to S3
-    const uploadCommand = new PutObjectCommand({
-        Bucket: s3Bucket,
-        Key: s3Key,
-        Body: pdfBuffer,
-        ContentType: 'application/pdf' //Hard coded - we only support PDFs for multi-page
-    });
-    await s3Client.send(uploadCommand);
-
-    // Start async Textract expense analysis with SNS notification
-    const startCommand = new StartExpenseAnalysisCommand({
-        DocumentLocation: {
-            S3Object: {
-                Bucket: s3Bucket,
-                Name: s3Key
-            }
-        },
-        NotificationChannel: {
-            SNSTopicArn: snsTopicArn,
-            RoleArn: snsRoleArn
-        },
-        ClientRequestToken: uploadId
-    });
-
-    const startResult = await textractClient.send(startCommand);
-    const textractJobId = startResult.JobId;
-
-    // Store job info in Redis using textractJobId as the key
-    await setTextractJob(
-        {
-            redisPubClient,
-            textractJobId,
-            jobData: {
-                status: 'IN_PROGRESS',
-                s3Key: s3Key,
-                uploadId: uploadId,
-                startedAt: new Date().toISOString(),
-                context: context // Store the context for later use
-            }
-        }
-    );
-
-    return {
-        jobId: textractJobId
-    };
-}
-
-// Process SQS messages from Textract completion notifications
-async function processSQSMessages() {
-    const queueUrl = process.env.AWS_TEXTRACT_SQS_QUEUE_URL;
-
-    if (!queueUrl) {
-        logger.log("bill-ocr-error", "ERROR", "api", null, { message: "AWS_TEXTRACT_SQS_QUEUE_URL not configured" });
-        return;
-    }
-
-    // Only poll if there are active mutli page jobs in progress
-    const hasActive = await hasActiveJobs({ redisPubClient });
-    if (!hasActive) {
-        return;
-    }
-
-    try {
-        const receiveCommand = new ReceiveMessageCommand({
-            QueueUrl: queueUrl,
-            MaxNumberOfMessages: 10,
-            WaitTimeSeconds: 20,
-            MessageAttributeNames: ['All']
-        });
-
-        const result = await sqsClient.send(receiveCommand);
-
-        if (result.Messages && result.Messages.length > 0) {
-            logger.log("bill-ocr-sqs-processing", "DEBUG", "api", null, { message: `Processing ${result.Messages.length} messages from SQS` });
-            for (const message of result.Messages) {
-                try {
-                    // Environment-level filtering: check if this message belongs to this environment
-                    const shouldProcess = await shouldProcessMessage(message);
-
-                    if (shouldProcess) {
-                        await handleTextractNotification(message);
-                        // Delete message after successful processing
-                        const deleteCommand = new DeleteMessageCommand({
-                            QueueUrl: queueUrl,
-                            ReceiptHandle: message.ReceiptHandle
-                        });
-                        await sqsClient.send(deleteCommand);
-                    }
-                } catch (error) {
-
-                    logger.log("bill-ocr-sqs-processing-error", "ERROR", "api", null, { message, error: error.message, stack: error.stack });
-
-                }
-            }
-        }
-    } catch (error) {
-        logger.log("bill-ocr-sqs-receiving-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
-    }
-}
-
-/**
- * Check if a message should be processed by this environment
- * @param {Object} message - SQS message
- * @returns {Promise<boolean>}
- */
-async function shouldProcessMessage(message) {
-    try {
-        const body = JSON.parse(message.Body);
-        const snsMessage = JSON.parse(body.Message);
-        const textractJobId = snsMessage.JobId;
-
-        // Check if job exists in Redis for this environment (using environment-specific prefix)
-        const exists = await jobExists(textractJobId);
-        return exists;
-    } catch (error) {
-        logger.log("bill-ocr-message-check-error", "DEBUG", "api", null, { message: "Error checking if message should be processed", error: error.message, stack: error.stack });
-        // If we can't parse the message, don't process it
-        return false;
-    }
-}
-
-async function handleTextractNotification(message) {
-    const body = JSON.parse(message.Body);
-    let snsMessage
-    try {
-        snsMessage = JSON.parse(body.Message);
-    } catch (error) {
-        logger.log("bill-ocr-handle-textract-error", "DEBUG", "api", null, { message: "Error parsing SNS message - invalid message format.", error: error.message, stack: error.stack, body });
-        return;
-    }
-
-    const textractJobId = snsMessage.JobId;
-    const status = snsMessage.Status;
-
-    // Get job info from Redis
-    const jobInfo = await getTextractJob({ redisPubClient, textractJobId });
-
-    if (!jobInfo) {
-        logger.log("bill-ocr-job-not-found", "DEBUG", "api", null, { message: `Job info not found in Redis for Textract job ID: ${textractJobId}`, textractJobId, snsMessage });
-        return;
-    }
-
-    if (status === 'SUCCEEDED') {
-        // Retrieve the results
-        const { processedData, originalResponse } = await retrieveTextractResults(textractJobId);
-
-        // Store the processed data - billForm will be generated on-demand in the status endpoint
-        await setTextractJob(
-            {
-                redisPubClient,
-                textractJobId,
-                jobData: {
-                    ...jobInfo,
-                    status: 'COMPLETED',
-                    data: {
-                        ...processedData,
-                        originalTextractResponse: originalResponse
-                    },
-                    completedAt: new Date().toISOString()
-                }
-            }
-        );
-    } else if (status === 'FAILED') {
-        await setTextractJob(
-            {
-                redisPubClient,
-                textractJobId,
-                jobData: {
-                    ...jobInfo,
-                    status: 'FAILED',
-                    error: snsMessage.StatusMessage || 'Textract job failed',
-                    completedAt: new Date().toISOString()
-                }
-            }
-        );
-    }
-}
-
-async function retrieveTextractResults(textractJobId) {
-    // Handle pagination if there are multiple pages of results
-    let allExpenseDocuments = [];
-    let nextToken = null;
-
-    do {
-        const getCommand = new GetExpenseAnalysisCommand({
-            JobId: textractJobId,
-            NextToken: nextToken
-        });
-
-        const result = await textractClient.send(getCommand);
-
-        if (result.ExpenseDocuments) {
-            allExpenseDocuments = allExpenseDocuments.concat(result.ExpenseDocuments);
-        }
-
-        nextToken = result.NextToken;
-    } while (nextToken);
-
-    // Store the complete original response
-    const fullTextractResponse = { ExpenseDocuments: allExpenseDocuments };
-
-    // Extract invoice data from Textract response
-    const invoiceData = extractInvoiceData(fullTextractResponse);
-
-    return {
-        processedData: processScanData(invoiceData),
-        originalResponse: fullTextractResponse
-    };
-}
-
-// Start SQS polling (call this when server starts)
-function startSQSPolling() {
-    const pollInterval = setInterval(() => {
-        processSQSMessages().catch(error => {
-            logger.log("bill-ocr-sqs-poll-error", "ERROR", "api", null, { message: error.message, stack: error.stack });
-        });
-    }, 10000); // Poll every 10 seconds
-    return pollInterval;
-}
-
-
-module.exports = {
-    initializeBillOcr,
-    handleBillOcr,
-    handleBillOcrStatus,
-    startSQSPolling
-};  
diff --git a/server/data/data.js b/server/data/data.js
index d1b0b35e0..82accebbb 100644
--- a/server/data/data.js
+++ b/server/data/data.js
@@ -8,5 +8,6 @@ exports.podium = require("./podium").default;
 exports.emsUpload = require("./emsUpload").default;
 exports.carfax = require("./carfax").default;
 exports.carfaxRps = require("./carfax-rps").default;
+exports.vehicletype = require("./vehicletype/vehicletype").default;
 exports.documentAnalytics = require("./analytics/documents").default;
 exports.chatterApi = require("./chatter-api").default;
diff --git a/server/data/kaizen.js b/server/data/kaizen.js
index 89b39bb47..ffe87de80 100644
--- a/server/data/kaizen.js
+++ b/server/data/kaizen.js
@@ -250,8 +250,6 @@ const CreateRepairOrderTag = (job, errorCallback) => {
       },
       InsuranceCompany: job.ins_co_nm || "",
       Claim: job.clm_no || "",
-      Deductible: job.ded_amt || 0,
-      PolicyNo: job.policy_no || "",
       DMSAllocation: job.dms_allocation || "",
       Contacts: {
         CSR: job.employee_csr_rel
diff --git a/server/data/vehicletype/cargovans.json b/server/data/vehicletype/cargovans.json
new file mode 100644
index 000000000..aba654d86
--- /dev/null
+++ b/server/data/vehicletype/cargovans.json
@@ -0,0 +1,126 @@
+[
+  "PROMASTER 1500",
+  "PROMASTER 2500",
+  "PROMASTER CITY",
+  "NV 1500",
+  "NV 200",
+  "NV 2500",
+  "NV 3500",
+  "NV1500",
+  "NV200",
+  "NV2500",
+  "NV3500",
+  "SPRINTER",
+  "E150 ECONOLINE CARGO VAN",
+  "E150 ECONOLINE XL",
+  "E250 ECONOLINE CARGO",
+  "E250 ECONOLINE CARGO (AMALGAM)",
+  "E250 ECONOLINE CARGO (INSPECT)",
+  "E250 ECONOLINE CARGO VAN EXT",
+  "E250 ECONOLINE SUPER CARGO VAN",
+  "E350 CUTAWAY VAN",
+  "E350 ECONO SD CARGO VAN EXT",
+  "E350 ECONOLINE CARGO VAN",
+  "E350 ECONOLINE CUTAWAY",
+  "E350 ECONOLINE SD CARGO VAN",
+  "E350 ECONOLINE SD XL",
+  "E350 ECONOLINE SD XL EXT",
+  "E350 ECONOLINE SD XLT",
+  "E350 ECONOLINE SD XLT EXT",
+  "E350 SD CUTAWAY",
+  "E450",
+  "E450 ECONOLINE",
+  "E450 ECONOLINE SD",
+  "E450 ECONOLINE SD CUTAWAY",
+  "TRANSIT 150 WB 130 CARGO VAN",
+  "TRANSIT 150 WB 130 XLT",
+  "TRANSIT 150 WB 148 CARGO VAN",
+  "TRANSIT 250 WB 130 CARGO VAN",
+  "TRANSIT 250 WB 148 CARGO VAN",
+  "TRANSIT 250 WB 148 EL CARGO",
+  "TRANSIT 350 WB 148 CARGO VAN",
+  "TRANSIT 350 WB 148 EL CARGO",
+  "TRANSIT CONNECT XL CARGO VAN",
+  "TRANSIT CONNECT XLT CARGO VAN",
+  "250 TRANSIT",
+  "CITY EXPRESS LS CARGO VAN",
+  "CITY EXPRESS LT CARGO VAN",
+  "EXPRESS 1500",
+  "EXPRESS 1500 CARGO VAN",
+  "EXPRESS 1500 LS",
+  "EXPRESS 1500 LT",
+  "EXPRESS 2500 CARGO VAN",
+  "EXPRESS 2500 CARGO VAN EXT",
+  "EXPRESS 2500 LS",
+  "EXPRESS 2500 LT",
+  "EXPRESS 3500",
+  "EXPRESS 3500 CARGO VAN",
+  "EXPRESS 3500 CARGO VAN EXT",
+  "EXPRESS 3500 EXT",
+  "EXPRESS 3500 LS",
+  "EXPRESS 3500 LS EXT",
+  "EXPRESS 3500 LT",
+  "EXPRESS 3500 LT EXT",
+  "G3500 EXPRESS CUTAWAY",
+  "SAVANA 1500 CARGO VAN",
+  "SAVANA 1500 SL",
+  "SAVANA 1500 SLE",
+  "SAVANA 2500",
+  "2500 SAVANA",
+  "SAVANA 2500 CARGO VAN",
+  "SAVANA 2500 CARGO VAN EXT",
+  "SAVANA 2500 LT",
+  "SAVANA 2500 SLE",
+  "SAVANA 3500",
+  "SAVANA 3500 CARGO VAN",
+  "SAVANA 3500 CARGO VAN EXT",
+  "SAVANA 3500 EXT",
+  "SAVANA 3500 LT EXT",
+  "SAVANA 3500 SLE EXT",
+  "SAVANA G3500 CUTAWAY",
+  "SAVANA G4500 CUTAWAY",
+  "EXPRESS 1500 LS CARGO VAN",
+  "G20 SPORTVAN",
+  "NV 3500 S V8 CARGO VAN",
+  "E-150",
+  "E-250",
+  "E-350",
+  "E-450",
+  "E150",
+  "E250",
+  "E350",
+  "TRANSIT",
+  "CITY",
+  "CITY EXPRESS",
+  "EXPRESS",
+  "EXPRESS 2500",
+  "G3500",
+  "SAVANA",
+  "SAVANA 1500",
+  "CHEVY EXPRESS G2500",
+  "CLUBWAGON E350",
+  "TRANSIT CONNECT",
+  "SPRINTER 2500",
+  "TRANSIT 150",
+  "ECONOLINE E250",
+  "TRANSIT 250",
+  "ECONOLINE E350",
+  "NV3500 HD",
+  "TRANSIT 350HD",
+  "ECONOLINE E150",
+  "E250 ECONOLINE",
+  "C/V",
+  "E350 CHSCAB",
+  "G1500 CHEVY EXPRESS",
+  "2500 SPRINTER",
+  "E150 ECONOLINE",
+  "350 TRANSIT",
+  "E450 CUTAWAY",
+  "PROMASTER 3500",
+  "CHEVY EXPRESS G3500",
+  "SAVANA G3500",
+  "1500 PROMASTER",
+  "2500 EXPRESS",
+  "3500 EXPRESS",
+  "3500 SPRINTER"
+]
diff --git a/server/data/vehicletype/passengervans.json b/server/data/vehicletype/passengervans.json
new file mode 100644
index 000000000..7f488fd55
--- /dev/null
+++ b/server/data/vehicletype/passengervans.json
@@ -0,0 +1,33 @@
+[
+  "GRAND CARAVAN",
+  "GRANDCARAVAN",
+  "GRAND CARAVAN CREW",
+  "GRAND CARAVAN CV",
+  "GRAND CARAVAN CVP",
+  "GRAND CARAVAN SE",
+  "GRAND CARAVAN SXT",
+  "CARAVAN CV",
+  "SIENNA CE V6",
+  "SIENNA LE V6",
+  "SIENNA XLE V6",
+  "SIENNA",
+  "ODYSSEY",
+  "SEDONA",
+  "PACIFICA (NEW)",
+  "QUEST",
+  "CARAVAN",
+  "MONTANA SV6",
+  "FREESTAR",
+  "UPLANDER",
+  "MONTANA",
+  "VOYAGER",
+  "ENTOURAGE",
+  "PACIFICA",
+  "CARNIVAL",
+  "VENTURE",
+  "SAFARI",
+  "VANAGON",
+  "WINDSTAR",
+  "TOWN&COUNTRY",
+  "ROUTAN"
+]
diff --git a/server/data/vehicletype/suvs.json b/server/data/vehicletype/suvs.json
new file mode 100644
index 000000000..a8976a305
--- /dev/null
+++ b/server/data/vehicletype/suvs.json
@@ -0,0 +1,485 @@
+[
+  "EDGE SEL",
+  "ESCAPE",
+  "ESCAPE SE",
+  "ESCAPE SEL",
+  "ESCAPE XLT V6",
+  "EXPEDITION",
+  "EXPEDITION LIMITED",
+  "EXPEDITION MAX",
+  "EXPEDITION MAX LIMITED",
+  "EXPLORER",
+  "EXCURSION",
+  "EXPLORER LIMITED",
+  "EXPLORER PLATINUM ECOBOOST",
+  "EXPLORER XLT",
+  "FLEX",
+  "FLEX SE",
+  "ECOSPORT",
+  "ESCAPE HYBRID",
+  "MUSTANG MACH-E",
+  "BRONCO",
+  "BRONCO SPORT",
+  "TRAILBLAZER",
+  "BLAZER LT",
+  "CHEROKEE",
+  "CHEROKEE CLASSIC",
+  "CHEROKEE COUNTRY",
+  "CHEROKEE LIMITED",
+  "CHEROKEE NORTH",
+  "CHEROKEE OVERLAND",
+  "CHEROKEE SPORT",
+  "CHEROKEE TRAILHAWK",
+  "CJ",
+  "CJ7",
+  "CJ7 RENEGADE",
+  "COMMANDER",
+  "COMMANDER LIMITED",
+  "COMMANDER SPORT",
+  "COMPASS",
+  "COMPASS HIGH ALTITUDE",
+  "COMPASS LATITUDE",
+  "COMPASS LIMITED",
+  "COMPASS NORTH",
+  "COMPASS SPORT",
+  "COMPASS TRAILHAWK",
+  "GLADIATOR OVERLAND",
+  "GLADIATOR RUBICON",
+  "GRAND CHEROKEE LAREDO",
+  "GRAND CHEROKEE LIMITED",
+  "GRAND CHEROKEE OVERLAND",
+  "GRAND CHEROKEE SE",
+  "GRAND CHEROKEE SRT",
+  "GRAND CHEROKEE SRT8",
+  "GRAND CHEROKEE SUMMIT",
+  "GRAND CHEROKEE TRACKHAWK",
+  "GRAND CHEROKEE TRAILHAWK",
+  "GRAND CHEROKEE",
+  "GRANDCHEROKEE",
+  "LIBERTY LIMITED",
+  "LIBERTY RENEGADE",
+  "LIBERTY SPORT",
+  "LIBERTY",
+  "PATRIOT",
+  "PATRIOT HIGH ALTITUDE",
+  "PATRIOT LATITUDE",
+  "PATRIOT LIMITED",
+  "PATRIOT NORTH",
+  "PATRIOT SPORT",
+  "RENEGADE LIMITED",
+  "RENEGADE NORTH",
+  "RENEGADE SPORT",
+  "RENEGADE TRAILHAWK",
+  "TJ",
+  "TJ RUBICON",
+  "TJ SAHARA",
+  "TJ SPORT",
+  "TJ UNLIMITED",
+  "WRANGLER",
+  "WRANGLER RUBICON",
+  "WRANGLER SAHARA",
+  "WRANGLER SPORT",
+  "WRANGLER UNLIMITED",
+  "WRANGLER UNLIMITED 70TH ANNIV",
+  "WRANGLER UNLIMITED RUBICON",
+  "WRANGLER UNLIMITED SAHARA",
+  "WRANGLER UNLIMITED SPORT",
+  "WRANGLER UNLIMITED X",
+  "WRANGLER X",
+  "YJ WRANGLER",
+  "AVIATOR",
+  "AVIATOR RESERVE",
+  "MKC",
+  "MKC RESERVE",
+  "MKC SELECT",
+  "MKT",
+  "MKT ECOBOOST",
+  "MKX",
+  "MKX RESERVE",
+  "NAUTILUS RESERVE",
+  "NAUTILUS RESERVE V6",
+  "NAVIGATOR",
+  "NAVIGATOR L",
+  "NAVIGATOR L RESERVE",
+  "NAVIGATOR L SELECT",
+  "NAVIGATOR RESERVE",
+  "PILOT",
+  "PILOT BLACK EDITION",
+  "PILOT ELITE",
+  "PILOT EX",
+  "PILOT EX-L",
+  "PILOT GRANITE",
+  "PILOT LX",
+  "PILOT SE",
+  "PILOT SE-L",
+  "PILOT TOURING",
+  "DURANGO R/T",
+  "DURANGO SLT PLUS",
+  "DURANGO SRT",
+  "DURANGO",
+  "JOURNEY",
+  "JOURNEY CROSSROAD",
+  "JOURNEY CVP",
+  "JOURNEY LIMITED",
+  "JOURNEY R/T",
+  "JOURNEY SXT",
+  "NITRO SE",
+  "NITRO",
+  "K1500 SUBURBAN",
+  "SUBURBAN 1500 LT",
+  "SUBURBAN 1500 LTZ",
+  "SUBURBAN 1500 PREMIER",
+  "SUBURBAN 2500 LS",
+  "TAHOE LT",
+  "TRAVERSE LS",
+  "TRAVERSE LT",
+  "TRAVERSE PREMIER",
+  "TRAX LT",
+  "TRAX PREMIER",
+  "UPLANDER LT EXT",
+  "SUBURBAN",
+  "TAHOE",
+  "TRAVERSE",
+  "TRAX",
+  "UPLANDER",
+  "YUKON",
+  "YUKON DENALI",
+  "YUKON XL",
+  "YUKON XL DENALI",
+  "EQUINOX LS",
+  "EQUINOX LT",
+  "EQUINOX PREMIER",
+  "EQUINOX",
+  "RAV4 LE",
+  "RAV4 XLE",
+  "HIGHLANDER SPORT V6",
+  "4RUNNER SR5 V6",
+  "RAV4",
+  "RAV4 HYBRID",
+  "RAV4 XLE HYBRID",
+  "HIGHLANDER",
+  "4RUNNER",
+  "SEQUOIA",
+  "PATHFINDER SE",
+  "PATHFINDER SL",
+  "PATHFINDER",
+  "MURANO PLATINUM",
+  "MURANO SV",
+  "MURANO",
+  "TUCSON",
+  "TERRAIN",
+  "SORENTO",
+  "EDGE",
+  "KICKS",
+  "QASHQAI",
+  "SANTA FE",
+  "ARMADA",
+  "TELLURIDE",
+  "PALISADE",
+  "SELTOS",
+  "TORRENT",
+  "C-HR",
+  "SPORTAGE",
+  "VENZA",
+  "ACADIA",
+  "CR-V",
+  "HR-V",
+  "CX-5",
+  "CX-50",
+  "CX-7",
+  "CX-9",
+  "CX-3",
+  "Q3",
+  "Q5",
+  "Q7",
+  "Q8",
+  "JUKE SV",
+  "JUKE",
+  "ROGUE",
+  "ROGUE SV",
+  "XTERRA",
+  "COROLLA CROSS",
+  "ACADIA DENALI",
+  "TAURUS X",
+  "MACAN",
+  "FJ CRUISER",
+  "BRONCO SPORT BADLANDS",
+  "ESCALADE",
+  "RX 350",
+  "KONA",
+  "MDX",
+  "RDX",
+  "COOPER COUNTRYMAN",
+  "V70",
+  "OUTLANDER",
+  "RIO5",
+  "GLC300 COUPE",
+  "ENCORE",
+  "SRX",
+  "SANTA FE SPORT",
+  "NX 300",
+  "WRANGLER UNLIMITE",
+  "WRANGLER JK UNLIM",
+  "RANGEROVER EVOQUE",
+  "CROSSTREK",
+  "FORESTER",
+  "TIGUAN",
+  "XV CROSSTREK",
+  "ENDEAVOR",
+  "RX 330",
+  "ATLAS",
+  "XC90",
+  "TOUAREG",
+  "STELVIO",
+  "RANGE ROVER SPORT",
+  "GLE350D",
+  "EX35",
+  "RVR",
+  "MONTERO",
+  "X-TRAIL",
+  "GRAND VITARA",
+  "TRIBUTE",
+  "X3",
+  "XC60",
+  "GLK250 BLUETEC",
+  "ENVOY",
+  "ML350 BLUETEC",
+  "ENVISION",
+  "FX35",
+  "X1",
+  "VENUE",
+  "TAOS",
+  "KONA ELECTRIC",
+  "OUTLANDER PHEV",
+  "PASSPORT",
+  "H3",
+  "EXPLORERSPORTTRAC",
+  "F-PACE",
+  "ML320 BLUETEC",
+  "REGAL SPORTBACK",
+  "DISCOVERY SPORT",
+  "RENDEZVOUS",
+  "XC70",
+  "COMPASS (NEW)",
+  "CUBE",
+  "V60 CROSS COUNTRY",
+  "QX70",
+  "X6",
+  "ELEMENT",
+  "RX 400H",
+  "VUE",
+  "RANGE ROVER VELAR",
+  "E-PACE",
+  "RAV4 PRIME",
+  "LX 570",
+  "GX 470",
+  "EX37",
+  "GLE43",
+  "NAUTILUS",
+  "XT6",
+  "RX 450H",
+  "ESCALADE ESV",
+  "OUTLOOK",
+  "CAYENNE",
+  "XC90 PLUG-IN",
+  "MODEL X",
+  "MODEL Y",
+  "GLC300",
+  "SANTA FE HYBRID",
+  "G63",
+  "XV CROSSTREK HYBR",
+  "JX35",
+  "JIMMY",
+  "TUCSON HYBRID",
+  "XC40 ELECTRIC",
+  "RX 300",
+  "ML320",
+  "WRANGLER JK UNLIMITED",
+  "POLICE INTERCEPTOR UTILITY",
+  "WRANGLER JK",
+  "TRIBECA",
+  "E-TRON SPORTBACK",
+  "500X",
+  "RX 350H",
+  "GL350 BLUETEC",
+  "WRANGLER UNLIMITED 4XE",
+  "GV80",
+  "GL550",
+  "Q5 E",
+  "H2 SUV",
+  "Q5 HYBRID",
+  "IONIQ 5",
+  "SQ5 SPORTBACK",
+  "LEVANTE",
+  "TONALE",
+  "GLE43 COUPE",
+  "GRAND CHEROKEE WK",
+  "DEFENDER",
+  "NX 450H+",
+  "ML400",
+  "LX 600",
+  "RX 450HL",
+  "SORENTO HYBRID",
+  "NX 350",
+  "TRACKER",
+  "GLE450",
+  "Q5 SPORTBACK",
+  "CR-V HYBRID",
+  "LX 470",
+  "EQS580 SUV",
+  "H2",
+  "EV9",
+  "SORENTO PLUG-IN",
+  "LYRIQ",
+  "GLE550",
+  "RX 500H",
+  "X1 SAV",
+  "E-TRON S SPORTBACK",
+  "ML500",
+  "GRAND HIGHLANDER HYBRID",
+  "RS Q8",
+  "GLS550",
+  "GLS580",
+  "IX",
+  "CAYENNE COUPE",
+  "SOLTERRA",
+  "PATHFINDER HYBRID",
+  "Q8 E-TRON",
+  "TX 350",
+  "TX 500H",
+  "EQUINOX EV",
+  "NAUTILUS HYBRID",
+  "TRAVERSE LIMITED",
+  "CX-70",
+  "SANTA FE XL",
+  "RENEGADE",
+  "QX50",
+  "ECLIPSE CROSS",
+  "QX80",
+  "X5",
+  "X3",
+  "X1",
+  "X4",
+  "ENCLAVE",
+  "ENCORE GX",
+  "CAYENNE HYBRID",
+  "SOUL",
+  "GX 460",
+  "UX 250H",
+  "XT5",
+  "GLE53",
+  "XT4",
+  "SQ7",
+  "NX 350H",
+  "GLK350",
+  "GLE350",
+  "NX 300H",
+  "NX 200T",
+  "RANGE ROVER EVOQUE",
+  "GLS450",
+  "TERRAIN DENALI",
+  "GRAND CHEROKEE L",
+  "GLE400",
+  "TUCSON PLUG-IN",
+  "BLAZER",
+  "ASCENT",
+  "HIGHLANDER HYBRID",
+  "ATLAS CROSS SPORT",
+  "XC40",
+  "VENZA HYBRID",
+  "GLA45",
+  "GLB250",
+  "GRAND HIGHLANDER",
+  "GV70",
+  "NIRO",
+  "NIRO EV",
+  "GLA250",
+  "ESCAPE PLUG-IN",
+  "WAGONEER",
+  "CX-30",
+  "QX60",
+  "GRAND CHEROKEE 4XE",
+  "SPORTAGE HYBRID",
+  "EV6",
+  "TONALE PLUG-IN",
+  "GLC43 COUPE",
+  "X2",
+  "RX 350L",
+  "HORNET",
+  "ENVISTA",
+  "LEVANTE S",
+  "SPORTAGE PLUG-IN",
+  "ORLANDO",
+  "X5 M",
+  "EXPLORER HYBRID",
+  "FREESTYLE",
+  "CORSAIR",
+  "K1500 YUKON XL",
+  "RANGE ROVER",
+  "SUV W/O LABOR",
+  "ID.4",
+  "CX-90",
+  "X7",
+  "CORSAIR PLUG-IN",
+  "ESCALADE EXT",
+  "QX55",
+  "DISCOVERY",
+  "BOLT EUV",
+  "C40 ELECTRIC",
+  "LR4",
+  "GRAND WAGONEER",
+  "XC60 PLUG-IN",
+  "LR2",
+  "EQE350 SUV",
+  "COROLLA CROSS HYBRID",
+  "SOUL EV",
+  "GRECALE",
+  "SUV W/O LABOR",
+  "QX30",
+  "SQ5",
+  "NIRO PLUG-IN",
+  "BORREGO",
+  "CX-90 PLUG-IN",
+  "XL-7",
+  "SUV W/O LABOR",
+  "SUV W/O LABOR",
+  "I-PACE",
+  "HORNET PLUG-IN",
+  "UX 300H",
+  "ML320 CDI",
+  "VERACRUZ",
+  "SQ8",
+  "GLE53 COUPE",
+  "ZDX",
+  "9-7X",
+  "ARIYA",
+  "ASPEN",
+  "AVIATOR PLUG-IN",
+  "B9 TRIBECA",
+  "BRAVADA",
+  "ENVOY XL",
+  "EQB350",
+  "EQB350 SUV",
+  "ESCALADE-V",
+  "E-TRON",
+  "FX37",
+  "GL320 CDI",
+  "GLADIATOR",
+  "GLC43",
+  "GLE450 COUPE",
+  "GLE63",
+  "GV60",
+  "MKT TOWN CAR",
+  "ML350",
+  "ML550",
+  "ML63",
+  "NX 250",
+  "Q4 E-TRON",
+  "Q8 E-TRON SPORTBACK",
+  "QX4",
+  "QX56",
+  "SANTA FE PLUG-IN",
+  "UX 200",
+  "WAGONEER L",
+  "XB"
+]
diff --git a/server/data/vehicletype/trucks.json b/server/data/vehicletype/trucks.json
new file mode 100644
index 000000000..f8e235e81
--- /dev/null
+++ b/server/data/vehicletype/trucks.json
@@ -0,0 +1,567 @@
+[
+  "MARK LT",
+  
+  "F-150",
+  "F-250",
+  "F-350",
+  "F-450",
+  "F-550",
+  "F-650",
+  "F100 PICKUP",
+  "F150 FX2 SUPERCAB",
+  "F150 FX4 PICKUP",
+  "F150 FX4 SUPERCAB",
+  "F150 FX4 SUPERCREW",
+  "F150 HARLEY DAVIDSON SUPERCAB",
+  "F150 HARLEY DAVIDSON SUPERCREW",
+  "F150 KING RANCH SUPERCREW",
+  "F150 LARIAT FX4 SUPERCREW",
+  "F150 LARIAT HARLEY DAVIDSON SC",
+  "F150 LARIAT KING RANCH SUPCREW",
+  "F150 LARIAT LIMITED SUPERCREW",
+  "F150 LARIAT PICKUP",
+  "F150 LARIAT SUPERCAB",
+  "F150 LARIAT SUPERCAB (AMALGAM)",
+  "F150 LARIAT SUPERCREW",
+  "F150 LARIAT SUPERCREW (AMALGA)",
+  "F150 LIMITED SUPERCREW",
+  "F150 PICKUP",
+  "F150 PLATINUM SUPERCREW",
+  "F150 RAPTOR SUPERCAB",
+  "F150 RAPTOR SUPERCREW",
+  "F150 STX PICKUP",
+  "F150 STX SUPERCAB",
+  "F150 SUPERCAB",
+  "F150 SUPERCREW",
+  "F150 SUPERCREW (AMALGAMATED)",
+  "F150 SVT RAPTOR SUPERCAB",
+  "F150 XL PICKUP",
+  "F150 XL SUPERCAB",
+  "F150 XL SUPERCREW",
+  "F150 XLT LARIAT SUPERCAB",
+  "F150 XLT PICKUP",
+  "F150 XLT SUPERCAB",
+  "F150 XLT SUPERCREW",
+  "F150 XLT SUPERCREW (AMALGAMAT)",
+  "F150 XTR SUPERCAB",
+  "F250 PICKUP",
+  "F250 SD CREW CAB",
+  "F250 SD FX4 CREW CAB",
+  "F250 SD FX4 SUPERCAB",
+  "F250 SD KING RANCH CREW CAB",
+  "F250 SD LARIAT CREW CAB",
+  "F250 SD LARIAT CREW CAB (AMAL)",
+  "F250 SD LARIAT PICKUP",
+  "F250 SD LARIAT SUPERCAB",
+  "F250 SD LIMITED CREW CAB",
+  "F250 SD PLATINUM CREW CAB",
+  "F250 SD SUPERCAB",
+  "F250 SD XL CREW CAB",
+  "F250 SD XL PICKUP",
+  "F250 SD XL SUPERCAB",
+  "F250 SD XLT CREW CAB",
+  "F250 SD XLT PICKUP",
+  "F250 SD XLT SUPERCAB",
+  "F250 SUPERCAB",
+  "F250 XL CREW CAB",
+  "F350 CREW CAB",
+  "F350 PICKUP",
+  "F350 PICKUP 2WD",
+  "F350 SD CABELAS CREW CAB",
+  "F350 SD CREW CAB",
+  "F350 SD FX4 CREW CAB",
+  "F350 SD FX4 SUPERCAB",
+  "F350 SD HARLEY DAVIDSON",
+  "F350 SD KING RANCH CREW CAB",
+  "F350 SD LARIAT CREW CAB",
+  "F350 SD LARIAT CREW CAB (AMAL)",
+  "F350 SD LARIAT KING RANCH",
+  "F350 SD LARIAT SUPERCAB",
+  "F350 SD LIMITED CREW CAB",
+  "F350 SD PICKUP",
+  "F350 SD PLATINUM CREW CAB",
+  "F350 SD SUPERCAB",
+  "F350 SD XL CREW CAB",
+  "F350 SD XL PICKUP",
+  "F350 SD XL SUPERCAB",
+  "F350 SD XLT CREW CAB",
+  "F350 SD XLT SUPERCAB",
+  "F350 SUPER DUTY",
+  "F350 SUPER DUTY XL",
+  "F350 XL PICKUP",
+  "F450",
+  "F450 Pickup",
+  "F450 SD KING RANCH CREW CAB",
+  "F450 SD LARIAT CREW CAB",
+  "F450 SD PICKUP",
+  "F450 SD PLATINUM CREW CAB",
+  "F450 SD XL",
+  "F450 SD XL CREW CAB",
+  "F450 SD XL PICKUP",
+  "F450 SD XLT CREW CAB",
+  "F450 SUPER DUTY XLT",
+  "F550",
+  "F550 SD",
+  "F550 SD XL",
+  "F550 SD XL PICKUP",
+  "F550 SD XLT CREW CAB",
+  "F550 SD XLT SUPERCAB",
+  "F550 SUPER DUTY",
+  "F550 SUPER DUTY XL",
+  "F550 SUPER DUTY XLT",
+  "F550 SUPER DUTY XLT CREW CAB",
+  "F550 XL",
+  "F650 SD XLT SUPERCAB",
+  "F68",
+  "F750 XL",
+
+  "RANGER",
+  "RANGER EDGE SUPERCAB",
+  "RANGER FX4 SUPERCAB",
+  "RANGER LARIAT SUPERCREW",
+  "RANGER SPORT SUPERCAB",
+  "RANGER STX SUPERCAB",
+  "RANGER SUPERCAB",
+  "RANGER XL",
+  "RANGER XL SUPERCAB",
+  "RANGER XLT",
+  "RANGER XLT SUPERCAB",
+  "RANGER XLT SUPERCREW",
+
+  "FRONTIER LE CREW CAB V6",
+  "FRONTIER NISMO CREW CAB V6",
+  "FRONTIER NISMO KING CAB V6",
+  "FRONTIER PRO-4X CREW CAB V6",
+  "FRONTIER PRO-4X KING CAB V6",
+  "FRONTIER S KING CAB",
+  "FRONTIER SC CREW CAB V6",
+  "FRONTIER SC V6",
+  "FRONTIER SE CREW CAB V6",
+  "FRONTIER SE KING CAB V6",
+  "FRONTIER SL CREW CAB V6",
+  "FRONTIER SV CREW CAB V6",
+  "FRONTIER SV KING CAB V6",
+  "FRONTIER XE KING CAB",
+  "FRONTIER XE KING CAB V6",
+  "KING CAB",
+
+  "TITAN 5.6 LE CREW CAB",
+  "TITAN 5.6 LE KING CAB",
+  "TITAN 5.6 MIDNIGHT CREW CAB",
+  "TITAN 5.6 PLATINUM RESERVE CC",
+  "TITAN 5.6 PRO-4X CREW CAB",
+  "TITAN 5.6 PRO-4X KING CAB",
+  "TITAN 5.6 S CREW CAB",
+  "TITAN 5.6 SE CREW CAB",
+  "TITAN 5.6 SE KING CAB",
+  "TITAN 5.6 SL CREW CAB",
+  "TITAN 5.6 SV CREW CAB",
+  "TITAN 5.6 SV KING CAB",
+  "TITAN 5.6 XE CREW CAB",
+  "TITAN 5.6 XE KING CAB",
+  "TITAN XD PLATINUM CREW CAB",
+  "TITAN XD PRO-4X CREW CAB",
+  "TITAN XD S CREW CAB",
+  "TITAN XD SL CREW CAB",
+  "TITAN XD SV CREW CAB",
+
+  "PICKUP SR5",
+
+  "TACOMA",
+  "TACOMA ACCESS CAB",
+  "TACOMA DOUBLE CAB V6",
+  "TACOMA LIMITED DOUBLE CAB V6",
+  "TACOMA PRERUNNER DOUBLE CAB V6",
+  "TACOMA PRERUNNER V6 ACCESS CAB",
+  "TACOMA PRERUNNER XTRACAB",
+  "TACOMA PRERUNNER XTRACAB V6",
+  "TACOMA SR5 DOUBLE CAB V6",
+  "TACOMA SR5 V6 ACCESS CAB",
+  "TACOMA SR5 V6 XTRACAB",
+  "TACOMA V6 ACCESS CAB",
+  "TACOMA XTRACAB",
+  "TACOMA XTRACAB V6",
+  "TUNDRA ACCESS CAB V8",
+  "TUNDRA DOUBLE CAB V8",
+  "TUNDRA LIMITED ACCESS CAB V8",
+  "TUNDRA LIMITED SR5 DBLCAB V8",
+  "TUNDRA LIMITED V8",
+  "TUNDRA LIMITED V8 CREWMAX",
+  "TUNDRA LIMITED V8 DOUBLE CAB",
+  "TUNDRA PLATINUM V8 CREWMAX",
+  "TUNDRA SR DOUBLE CAB V8",
+  "TUNDRA SR V8",
+  "TUNDRA SR5 DOUBLE CAB V8",
+  "TUNDRA SR5 TRD DOUBLE CAB V8",
+  "TUNDRA SR5 V8 CREWMAX",
+  "TUNDRA V8",
+  "TUNDRA V8 CREWMAX",
+  "XTRACAB LONG BOX",
+
+  "AVALANCHE 1500",
+  "AVALANCHE 1500 LS",
+  "AVALANCHE 1500 LS Z71",
+  "AVALANCHE 1500 LT",
+  "AVALANCHE 1500 LT Z71",
+  "AVALANCHE 1500 LTZ",
+  "C/R 10/1500 4+CAB",
+  "C/R 10/1500 PICKUP",
+  "C/R 20/2500 4+CAB",
+  "C/R 20/2500 PICKUP",
+  "C3500",
+
+  "COLORADO",
+  "COLORADO EXT CAB",
+  "COLORADO LS",
+  "COLORADO LS CREW CAB",
+  "COLORADO LS EXT CAB",
+  "COLORADO LT",
+  "COLORADO LT CREW CAB",
+  "COLORADO LT EXT CAB",
+  "COLORADO WT CREW CAB",
+  "COLORADO WT EXT CAB",
+  "COLORADO Z71 CREW CAB",
+  "COLORADO Z71 EXT CAB",
+  "COLORADO ZR2 CREW CAB",
+  "COLORADO ZR2 EXT CAB",
+
+  "HHR LS PANEL",
+  "K/V 10/1500 4+CAB",
+  "K/V 10/1500 PICKUP",
+  "K/V 20/2500 4+CAB",
+  "K/V 20/2500 PICKUP",
+  "K/V 30/3500 4+CAB",
+  "Pickup K3500",
+  "Pickup Silverado C2500 HD",
+  "S10 4+CAB",
+  "S10 LS 4+CAB",
+  "SILVERADO 1500",
+  "SILVERADO 1500 CHEYENNE CREW",
+  "SILVERADO 1500 CREW CAB",
+  "SILVERADO 1500 CREW CAB (AMAL)",
+  "SILVERADO 1500 CUST TRAIL DC",
+  "SILVERADO 1500 CUSTOM CREW CAB",
+  "SILVERADO 1500 CUSTOM DC",
+  "SILVERADO 1500 CUSTOM TRAIL CC",
+  "SILVERADO 1500 DOUBLE (AMALGA)",
+  "SILVERADO 1500 EXT CAB",
+  "SILVERADO 1500 HD LS CREW CAB",
+  "SILVERADO 1500 HD LT CREW CAB",
+  "SILVERADO 1500 HIGH COUNTRY CC",
+  "SILVERADO 1500 HYBRID CREW CAB",
+  "SILVERADO 1500 LS",
+  "SILVERADO 1500 LS CREW CAB",
+  "SILVERADO 1500 LS DOUBLE CAB",
+  "SILVERADO 1500 LS EXT CAB",
+  "SILVERADO 1500 LT",
+  "SILVERADO 1500 LT CC (AMALGAM)",
+  "SILVERADO 1500 LT CREW CAB",
+  "SILVERADO 1500 LT DOUBLE CAB",
+  "SILVERADO 1500 LT EXT CAB",
+  "SILVERADO 1500 LT TRAIL CC",
+  "SILVERADO 1500 LT TRAIL DC",
+  "SILVERADO 1500 LTZ CREW CAB",
+  "SILVERADO 1500 LTZ DOUBLE CAB",
+  "SILVERADO 1500 LTZ EXT CAB",
+  "SILVERADO 1500 RST CREW CAB",
+  "SILVERADO 1500 RST DOUBLE CAB",
+  "SILVERADO 1500 SS EXT CAB",
+  "SILVERADO 1500 WT",
+  "SILVERADO 1500 WT CREW CAB",
+  "SILVERADO 1500 WT DOUBLE CAB",
+  "SILVERADO 1500 WT EXT CAB",
+  "SILVERADO 2500 EXT CAB",
+  "SILVERADO 2500 HD",
+  "SILVERADO 2500 HD CREW CAB",
+  "SILVERADO 2500 HD EXT CAB",
+  "SILVERADO 2500 HD HC CREW CAB",
+  "SILVERADO 2500 HD LS CREW CAB",
+  "SILVERADO 2500 HD LS EXT CAB",
+  "SILVERADO 2500 HD LT",
+  "SILVERADO 2500 HD LT CREW CAB",
+  "SILVERADO 2500 HD LT DBL CAB",
+  "SILVERADO 2500 HD LT EXT CAB",
+  "SILVERADO 2500 HD LTZ CREW CAB",
+  "SILVERADO 2500 HD LTZ DBL CAB",
+  "SILVERADO 2500 HD LTZ EXT CAB",
+  "SILVERADO 2500 HD WT",
+  "SILVERADO 2500 HD WT CREW CAB",
+  "SILVERADO 2500 HD WT DBL CAB",
+  "SILVERADO 2500 HD WT EXT CAB",
+  "SILVERADO 3500",
+  "SILVERADO 3500 CREW CAB",
+  "SILVERADO 3500 CREW CAB (AMAL)",
+  "SILVERADO 3500 EXT CAB",
+  "SILVERADO 3500 HC CREW CAB",
+  "SILVERADO 3500 HD (AMALGAMATE)",
+  "SILVERADO 3500 LS",
+  "SILVERADO 3500 LS CREW CAB",
+  "SILVERADO 3500 LS EXT CAB",
+  "SILVERADO 3500 LT CREW CAB",
+  "SILVERADO 3500 LT DOUBLE CAB",
+  "SILVERADO 3500 LT EXT CAB",
+  "SILVERADO 3500 LTZ CREW CAB",
+  "SILVERADO 3500 LTZ EXT CAB",
+  "SILVERADO 3500 WT CREW CAB",
+  "Silverado 3500HD",
+
+  "B250 SPORTSMAN",
+
+  "DAKOTA CLUB CAB",
+  "DAKOTA LARAMIE V8 CLUB CAB",
+  "DAKOTA LARAMIE V8 QUAD CAB",
+  "DAKOTA QUAD CAB",
+  "DAKOTA SLT CREW CAB",
+  "DAKOTA SLT EXT CAB",
+  "DAKOTA SLT PLUS QUAD CAB",
+  "DAKOTA SLT PLUS V8 CLUB CAB",
+  "DAKOTA SLT PLUS V8 QUAD CAB",
+  "DAKOTA SLT QUAD CAB",
+  "DAKOTA SLT V8 CLUB CAB",
+  "DAKOTA SLT V8 CREW CAB",
+  "DAKOTA SLT V8 EXT CAB",
+  "DAKOTA SLT V8 QUAD CAB",
+  "DAKOTA SPORT V8",
+  "DAKOTA SPORT V8 CLUB CAB",
+  "DAKOTA SPORT V8 QUAD CAB",
+  "DAKOTA ST CLUB CAB",
+  "DAKOTA ST QUAD CAB",
+  "DAKOTA ST V8 QUAD CAB",
+  "DAKOTA SXT CREW CAB",
+  "DAKOTA SXT EXT CAB",
+  "DAKOTA SXT V8 CREW CAB",
+  "DAKOTA SXT V8 EXT CAB",
+  "DAKOTA V8 CLUB CAB",
+  "DAKOTA V8 QUAD CAB",
+
+  "RAM 1500",
+  "RAM 1500 BIG HORN CREW CAB",
+  "RAM 1500 BIG HORN QUAD CAB",
+  "RAM 1500 CLUB CAB",
+  "RAM 1500 CREW CAB (AMALGAMATE)",
+  "RAM 1500 EXPRESS",
+  "RAM 1500 LARAMIE CREW (AMALGA)",
+  "RAM 1500 LARAMIE CREW CAB",
+  "RAM 1500 LARAMIE LONGHORN CREW",
+  "RAM 1500 LARAMIE MEGA CAB",
+  "RAM 1500 LARAMIE QUAD CAB",
+  "RAM 1500 LARAMIE SLT QUAD CAB",
+  "RAM 1500 LIMITED CREW CAB",
+  "RAM 1500 LONGHORN CREW CAB",
+  "RAM 1500 OUTDOORSMAN CREW CAB",
+  "RAM 1500 OUTDOORSMAN QC (AMAL)",
+  "RAM 1500 OUTDOORSMAN QUAD CAB",
+  "RAM 1500 QUAD CAB",
+  "RAM 1500 R/T",
+  "RAM 1500 REBEL CREW CAB",
+  "RAM 1500 REBEL QUAD CAB",
+  "RAM 1500 SLT",
+  "RAM 1500 SLT CREW (AMALGAMATE)",
+  "RAM 1500 SLT CREW CAB",
+  "RAM 1500 SLT MEGA CAB",
+  "RAM 1500 SLT QUAD (AMALGAMATE)",
+  "RAM 1500 SLT QUAD CAB",
+  "RAM 1500 SPORT",
+  "RAM 1500 SPORT CLUB CAB",
+  "RAM 1500 SPORT CREW CAB",
+  "RAM 1500 SPORT CREW CAB (AMAL)",
+  "RAM 1500 SPORT QUAD CAB",
+  "RAM 1500 ST",
+  "RAM 1500 ST CREW CAB",
+  "RAM 1500 ST QUAD CAB",
+  "RAM 1500 SXT CREW CAB",
+  "RAM 1500 SXT QUAD CAB",
+  "RAM 1500 TRADESMAN CREW CAB",
+  "RAM 1500 TRADESMAN QUAD CAB",
+  "RAM 1500 TRX QUAD CAB",
+  "RAM 2500",
+  "RAM 2500 BIG HORN CREW CAB",
+  "RAM 2500 BIG HORN MEGA CAB",
+  "RAM 2500 CLUB CAB",
+  "RAM 2500 LARAMIE CREW CAB",
+  "RAM 2500 LARAMIE LONGHORN CREW",
+  "RAM 2500 LARAMIE LONGHORN MEGA",
+  "RAM 2500 LARAMIE MEGA CAB",
+  "RAM 2500 LARAMIE QUAD CAB",
+  "RAM 2500 LARAMIE SLT",
+  "RAM 2500 LARAMIE SLT QUAD CAB",
+  "RAM 2500 LIMITED CREW CAB",
+  "RAM 2500 OUTDOORSMAN CREW CAB",
+  "RAM 2500 POWER WAGON CREW CAB",
+  "RAM 2500 QUAD CAB",
+  "RAM 2500 SLT",
+  "RAM 2500 SLT CREW CAB",
+  "RAM 2500 SLT MEGA CAB",
+  "RAM 2500 SLT QUAD CAB",
+  "RAM 2500 SLT QUAD CAB (AMALGA)",
+  "RAM 2500 SPORT QUAD CAB",
+  "RAM 2500 ST",
+  "RAM 2500 ST CREW CAB",
+  "RAM 2500 ST QUAD CAB",
+  "RAM 2500 SXT QUAD CAB",
+  "RAM 2500 TRADESMAN",
+  "RAM 2500 TRADESMAN CREW CAB",
+  "RAM 2500 TRX CREW CAB",
+  "RAM 2500 TRX QUAD CAB",
+  "RAM 3500",
+  "RAM 3500 4WD",
+  "RAM 3500 BIG HORN CREW CAB",
+  "RAM 3500 CREW CAB",
+  "RAM 3500 CREW CAB (AMALGAMATE)",
+  "RAM 3500 LARAMIE CREW CAB",
+  "RAM 3500 LARAMIE LONGHORN CREW",
+  "RAM 3500 LARAMIE LONGHORN MEGA",
+  "RAM 3500 LARAMIE MEGA CAB",
+  "RAM 3500 LARAMIE QUAD CAB",
+  "RAM 3500 LARAMIE SLT",
+  "RAM 3500 LARAMIE SLT QUAD CAB",
+  "RAM 3500 LIMITED MEGA CAB",
+  "RAM 3500 LONGHORN CREW CAB",
+  "RAM 3500 QUAD CAB",
+  "RAM 3500 SLT",
+  "RAM 3500 SLT CREW CAB",
+  "RAM 3500 SLT MEGA CAB",
+  "RAM 3500 SLT QUAD CAB",
+  "RAM 3500 SPORT QUAD CAB",
+  "RAM 3500 ST",
+  "RAM 3500 ST CREW CAB",
+  "RAM 3500 ST QUAD CAB",
+  "RAM 3500 TRX QUAD CAB",
+  "RAM 4500",
+  "RAM 4500 CREW CAB",
+  "RAM 5500",
+  "RAM 5500 CREW CAB",
+  "W250 TURBO DIESEL",
+
+  "C Series 5500",
+  "C/R 1500 4+CAB",
+  "C/R 1500 PICKUP",
+  "C/R 1500 SIERRA SL EXT CAB",
+  "C/R 3500",
+  "C/R 3500 PICKUP",
+  "CANYON ALL TERRAIN CREW CAB",
+  "CANYON CREW CAB",
+  "CANYON DENALI CREW CAB",
+  "CANYON EXT CAB",
+  "CANYON SL",
+  "CANYON SL EXT CAB",
+  "CANYON SLE",
+  "CANYON SLE CREW CAB",
+  "CANYON SLE EXT CAB",
+  "CANYON SLT CREW CAB",
+  "CANYON SLT CREW CAB (AMALGAMA)",
+  "K/V 1500 4+CAB",
+  "K/V 1500 PICKUP",
+  "K/V 2500 4+CAB",
+  "K/V 2500 PICKUP",
+  "K/V 3500 SIERRA SL CREW CAB",
+  "K/V 3500 SIERRA SLE CREW CAB",
+  "SIERRA 1500 AT4 CREW CAB",
+  "SIERRA 1500 AT4 DOUBLE CAB",
+  "SIERRA 1500 CREW CAB",
+  "SIERRA 1500 CREW CAB (AMALGAM)",
+  "SIERRA 1500 DENALI CREW CAB",
+  "SIERRA 1500 DENALI EXT CAB",
+  "SIERRA 1500 DOUBLE CAB",
+  "SIERRA 1500 ELEVATION CREW CAB",
+  "SIERRA 1500 ELEVATION DC",
+  "SIERRA 1500 EXT CAB",
+  "SIERRA 1500 HD CREW CAB",
+  "SIERRA 1500 HD SLE CREW CAB",
+  "SIERRA 1500 HD SLT CREW CAB",
+  "SIERRA 1500 NEVADA EDITION",
+  "SIERRA 1500 PICKUP",
+  "SIERRA 1500 SL CREW CAB",
+  "SIERRA 1500 SL EXT CAB",
+  "SIERRA 1500 SL PICKUP",
+  "SIERRA 1500 SLE CREW CAB",
+  "SIERRA 1500 SLE DC (AMALGAMAT)",
+  "SIERRA 1500 SLE DOUBLE CAB",
+  "SIERRA 1500 SLE EXT CAB",
+  "SIERRA 1500 SLE EXT CAB (AMAL)",
+  "SIERRA 1500 SLE PICKUP",
+  "SIERRA 1500 SLT CREW (AMALGAM)",
+  "SIERRA 1500 SLT CREW CAB",
+  "SIERRA 1500 SLT DOUBLE CAB",
+  "SIERRA 1500 SLT EXT CAB",
+  "SIERRA 1500 WT CREW CAB",
+  "SIERRA 1500 WT EXT CAB",
+  "SIERRA 1500 WT PICKUP",
+  "SIERRA 2500 EXT CAB",
+  "SIERRA 2500 HD AT4 CREW CAB",
+  "SIERRA 2500 HD CREW CAB",
+  "SIERRA 2500 HD DENALI CREW CAB",
+  "SIERRA 2500 HD DOUBLE CAB",
+  "SIERRA 2500 HD EXT CAB",
+  "SIERRA 2500 HD PICKUP",
+  "SIERRA 2500 HD SL EXT CAB",
+  "SIERRA 2500 HD SL PICKUP",
+  "SIERRA 2500 HD SLE CREW CAB",
+  "SIERRA 2500 HD SLE DOUBLE CAB",
+  "SIERRA 2500 HD SLE EXT CAB",
+  "SIERRA 2500 HD SLE PICKUP",
+  "SIERRA 2500 HD SLT CREW CAB",
+  "SIERRA 2500 HD SLT DOUBLE CAB",
+  "SIERRA 2500 HD SLT EXT CAB",
+  "SIERRA 2500 HD WT CREW CAB",
+  "SIERRA 2500 HD WT DOUBLE CAB",
+  "SIERRA 2500 HD WT EXT CAB",
+  "SIERRA 2500 HD WT PICKUP",
+  "SIERRA 2500 SLE EXT CAB",
+  "SIERRA 3500 AT4 CREW CAB",
+  "SIERRA 3500 CREW CAB",
+  "SIERRA 3500 DENALI CREW CAB",
+  "SIERRA 3500 EXT CAB",
+  "SIERRA 3500 PICKUP",
+  "SIERRA 3500 SL CREW CAB",
+  "SIERRA 3500 SLE",
+  "SIERRA 3500 SLE CREW CAB",
+  "SIERRA 3500 SLE EXT CAB",
+  "SIERRA 3500 SLT CREW CAB",
+  "SIERRA 3500 WT CREW CAB",
+  "SONOMA",
+  "SONOMA CREW CAB",
+  "SONOMA EXT CAB",
+
+  "1500",
+  "1500 Classic",
+  "Pickup 1500",
+  "Pickup 3500",
+  "ProMaster 1500",
+
+  "RIDGELINE",
+  "RIDGELINE BLACK EDITION",
+  "RIDGELINE DX",
+  "RIDGELINE EX-L",
+  "RIDGELINE LX",
+  "RIDGELINE RT",
+  "RIDGELINE RTL",
+  "RIDGELINE RTS",
+  "RIDGELINE RTX",
+  "RIDGELINE SE",
+  "RIDGELINE SPORT",
+  "RIDGELINE TOURING",
+  "RIDGELINE VP",
+
+  "TITAN",
+  "TACOMA",
+  "TUNDRA",
+  "AVALANCE",
+  "COLORADO",
+  "SILVERADO",
+  "SILVERADO 1500",
+  "SILVERADO 2500",
+  "SILVERADO 3500",
+  "DAKOTA",
+  "RAM 1500",
+  "RAM 2500",
+  "RAM 3500",
+  "RAM 4500",
+  "RAM 5500",
+  "CANYON",
+  "SIERRA 1500",
+  "SIERRA 2500",
+  "SIERRA 3500",
+  "SONOMA",
+  "1500"
+]
diff --git a/server/data/vehicletype/vehicletype.js b/server/data/vehicletype/vehicletype.js
new file mode 100644
index 000000000..7e17e995a
--- /dev/null
+++ b/server/data/vehicletype/vehicletype.js
@@ -0,0 +1,39 @@
+const logger = require("../../utils/logger");
+const TrucksList = require("./trucks.json");
+const CargoVanList = require("./cargovans.json");
+const PassengerVanList = require("./passengervans.json");
+const SuvList = require("./suvs.json");
+
+
+const vehicletype = async (req, res) => {
+    try {
+        const { model } = req.body;
+        if (!model || model.trim() === "") {
+            res.status(400).json({ success: false, error: "Please provide a model" });
+        } else {
+            vehicle
+            const type = getVehicleType(model.trim())
+            res.status(200).json({ success: true, ...type });
+        }
+    } catch (error) {
+        logger.log("vehicletype-error", "ERROR", req?.user?.email, null, {
+            error: error.message,
+            stack: error.stack
+        });
+        res.status(500).json({ error: error.message, stack: error.stack });
+    }
+};
+
+function getVehicleType(model) {
+    const inTrucks = TrucksList.includes(model.toUpperCase());
+    const inPV = PassengerVanList.includes(model.toUpperCase());
+    const inSuv = SuvList.includes(model.toUpperCase());
+    const inCv = CargoVanList.includes(model.toUpperCase());
+
+    if (inTrucks) return { type: "TK", match: true };
+    else if (inPV) return { type: "PC", match: true };
+    else if (inSuv) return { type: "SUV", match: true };
+    else if (inCv) return { type: "VN", match: true };
+    else return { type: "PC", match: false };
+}
+exports.default = vehicletype;
diff --git a/server/fortellis/fortellis-helpers.js b/server/fortellis/fortellis-helpers.js
index affd2431e..087dc3d16 100644
--- a/server/fortellis/fortellis-helpers.js
+++ b/server/fortellis/fortellis-helpers.js
@@ -86,9 +86,6 @@ async function FetchSubscriptions({ redisHelpers, socket, jobid, SubscriptionObj
         logRequest: false
       });
       const SubscriptionMeta = subscriptions.data.subscriptions.find((s) => s.subscriptionId === SubscriptionID);
-      if (!SubscriptionMeta) {
-        throw new Error(`Subscription metadata not found for SubscriptionID: ${SubscriptionID}`);
-      }
       if (setSessionTransactionData) {
         await setSessionTransactionData(
           socket.id,
@@ -105,15 +102,11 @@ async function FetchSubscriptions({ redisHelpers, socket, jobid, SubscriptionObj
       error: error.message,
       stack: error.stack
     });
-    throw error;
   }
 }
 
 async function GetDepartmentId({ apiName, debug = false, SubscriptionMeta, overrideDepartmentId }) {
   if (!apiName) throw new Error("apiName not provided. Unable to get department without apiName.");
-  if (!SubscriptionMeta || !Array.isArray(SubscriptionMeta.apiDmsInfo)) {
-    throw new Error("Subscription metadata missing apiDmsInfo.");
-  }
   if (debug) {
     console.log("API Names & Departments ");
     console.log("===========");
@@ -125,8 +118,9 @@ async function GetDepartmentId({ apiName, debug = false, SubscriptionMeta, overr
     .find((info) => info.name === apiName)?.departments; //Departments are categorized by API name and have an array of departments.
 
   if (overrideDepartmentId) {
-    return departmentIds && departmentIds.find((d) => d.id === overrideDepartmentId)?.id;
+    return departmentIds && departmentIds.find(d => d.id === overrideDepartmentId)?.id
   } else {
+
     return departmentIds && departmentIds[0] && departmentIds[0].id; //TODO: This makes the assumption that there is only 1 department.
   }
 }
diff --git a/server/fortellis/fortellis.js b/server/fortellis/fortellis.js
index a591403b8..968dac09d 100644
--- a/server/fortellis/fortellis.js
+++ b/server/fortellis/fortellis.js
@@ -180,52 +180,22 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
     getTransactionType(jobid),
     FortellisCacheEnums.txEnvelope
   );
-  if (!JobData || !txEnvelope) {
-    const friendlyMessage =
-      "Fortellis export context was lost after reconnect. Click Post again to restart the Fortellis flow.";
-    CreateFortellisLogEvent(socket, "WARN", friendlyMessage, {
-      jobid,
-      hasJobData: !!JobData,
-      hasTxEnvelope: !!txEnvelope
-    });
-    socket.emit("export-failed", {
-      title: "Fortellis",
-      severity: "warning",
-      errorCode: "FORTELLIS_CONTEXT_MISSING",
-      friendlyMessage
-    });
-    return;
-  }
-
+  const DMSVid = await redisHelpers.getSessionTransactionData(
+    socket.id,
+    getTransactionType(JobData.id),
+    FortellisCacheEnums.DMSVid
+  );
   try {
-    const DMSVid = await redisHelpers.getSessionTransactionData(
-      socket.id,
-      getTransactionType(JobData.id),
-      FortellisCacheEnums.DMSVid
-    );
-    if (!DMSVid) {
-      const friendlyMessage =
-        "Fortellis vehicle context is missing after reconnect. Click Post again to restart the Fortellis flow.";
-      CreateFortellisLogEvent(socket, "WARN", friendlyMessage, {
-        jobid,
-        hasDMSVid: !!DMSVid
-      });
-      socket.emit("export-failed", {
-        title: "Fortellis",
-        severity: "warning",
-        errorCode: "FORTELLIS_CONTEXT_MISSING",
-        friendlyMessage
-      });
-      return;
-    }
-
     let DMSCust;
     if (selectedCustomerId) {
       CreateFortellisLogEvent(socket, "DEBUG", `{3.1} Querying the Customer using Customer ID: ${selectedCustomerId}`);
 
       //Get cust list from Redis. Return the item
-      const DMSCustList =
-        (await getSessionTransactionData(socket.id, getTransactionType(jobid), FortellisCacheEnums.DMSCustList)) || [];
+      const DMSCustList = await getSessionTransactionData(
+        socket.id,
+        getTransactionType(jobid),
+        FortellisCacheEnums.DMSCustList
+      );
       const existingCustomerInDMSCustList = DMSCustList.find((c) => c.customerId === selectedCustomerId);
       DMSCust = existingCustomerInDMSCustList || {
         customerId: selectedCustomerId //This is the fall back in case it is the generic customer.
@@ -336,7 +306,7 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
           //There was something wrong. Throw an error to trigger clean up.
           //throw new Error("Error posting DMS Batch Transaction");
         }
-      } catch {
+      } catch (error) {
         //Clean up the transaction and insert a faild error code
         // //Get the error code
         CreateFortellisLogEvent(socket, "DEBUG", `{6.1} Getting errors for Transaction ID ${DMSTransHeader.transID}`);
@@ -366,12 +336,6 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
       stack: error.stack,
       data: error.errorData
     });
-    socket.emit("export-failed", {
-      title: "Fortellis",
-      severity: "error",
-      error: error.message,
-      friendlyMessage: "Fortellis export failed. Please click Post again to retry."
-    });
     await InsertFailedExportLog({
       socket,
       JobData,
@@ -793,13 +757,7 @@ async function InsertDmsVehicle({ socket, redisHelpers, JobData, txEnvelope, DMS
           modelAbrev: txEnvelope.dms_model,
           // "modelDescription": "SILVERADO 1500 2WD EXT CAB LT",
           // "modelType": "T",
-          modelYear:
-            JobData.v_model_yr &&
-            (JobData.v_model_yr < 100
-              ? JobData.v_model_yr >= (moment().year() + 1) % 100
-                ? 1900 + parseInt(JobData.v_model_yr, 10)
-                : 2000 + parseInt(JobData.v_model_yr, 10)
-              : JobData.v_model_yr),
+          modelYear: JobData.v_model_yr,
           // "numberOfEngineCylinders": 4,
           odometerStatus: txEnvelope.kmout,
           // "options": [
@@ -958,10 +916,6 @@ async function UpdateDmsVehicle({ socket, redisHelpers, JobData, DMSVeh, DMSCust
     delete DMSVehToSend.invoice;
     delete DMSVehToSend.inventoryAccount;
 
-    !DMSVehToSend.vehicle.engineNumber && delete DMSVehToSend.vehicle.engineNumber;
-    !DMSVehToSend.vehicle.saleClassValue && DMSVehToSend.vehicle.saleClassValue === "MISC";
-    !DMSVehToSend.vehicle.exteriorColor && delete DMSVehToSend.vehicle.exteriorColor;
-
     const result = await MakeFortellisCall({
       ...FortellisActions.UpdateVehicle,
       requestSearchParams: {},
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 0c18aaea1..40e99d174 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -1285,7 +1285,6 @@ exports.KAIZEN_QUERY = `query KAIZEN_EXPORT($start: timestamptz, $bodyshopid: uu
     date_repairstarted
     date_void
     dms_allocation
-    ded_amt
     employee_body_rel {
       first_name
       last_name
@@ -1381,7 +1380,6 @@ exports.KAIZEN_QUERY = `query KAIZEN_EXPORT($start: timestamptz, $bodyshopid: uu
     }
     parts_tax_rates
     plate_no
-    policy_no
     rate_la1
     rate_la2
     rate_la3
diff --git a/server/routes/aiRoutes.js b/server/routes/aiRoutes.js
deleted file mode 100644
index f06125718..000000000
--- a/server/routes/aiRoutes.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const express = require("express");
-const router = express.Router();
-const multer = require("multer");
-const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
-const withUserGraphQLClientMiddleware = require("../middleware/withUserGraphQLClientMiddleware");
-const { handleBillOcr, handleBillOcrStatus } = require("../ai/bill-ocr/bill-ocr");
-
-// Configure multer for form data parsing
-const upload = multer();
-
-router.use(validateFirebaseIdTokenMiddleware);
-router.use(withUserGraphQLClientMiddleware);
-
-router.post("/bill-ocr", upload.single('billScan'), handleBillOcr);
-router.get("/bill-ocr/status/:textractJobId", handleBillOcrStatus);
-
-module.exports = router;
diff --git a/server/routes/miscellaneousRoutes.js b/server/routes/miscellaneousRoutes.js
index f5e8d491b..df6c3448a 100644
--- a/server/routes/miscellaneousRoutes.js
+++ b/server/routes/miscellaneousRoutes.js
@@ -144,5 +144,20 @@ router.post("/emsupload", validateFirebaseIdTokenMiddleware, data.emsUpload);
 // Redis Cache Routes
 router.post("/bodyshop-cache", eventAuthorizationMiddleware, updateBodyshopCache);
 
+// Estimate Scrubber Vehicle Type
+router.post("/es/vehicletype", data.vehicletype);
+router.post("/analytics/documents", data.documentAnalytics);
+// Health Check for docker-compose-cluster load balancer, only available in development
+if (process.env.NODE_ENV === "development") {
+  router.get("/health", (req, res) => {
+    const healthStatus = {
+      status: "healthy",
+      timestamp: new Date().toISOString(),
+      environment: process.env.NODE_ENV || "unknown",
+      uptime: process.uptime()
+    };
+    res.status(200).json(healthStatus);
+  });
+}
 
 module.exports = router;
diff --git a/server/rr/rr-register-socket-events.js b/server/rr/rr-register-socket-events.js
index bdb51580e..98897eaa7 100644
--- a/server/rr/rr-register-socket-events.js
+++ b/server/rr/rr-register-socket-events.js
@@ -48,46 +48,6 @@ const resolveJobId = (explicit, payload, job) => explicit || payload?.jobId || j
  */
 const resolveVin = ({ tx, job }) => tx?.jobData?.vin || job?.v_vin || null;
 
-/**
- * Extract request/response XML from RR response/result shapes.
- * @param rrObj
- * @returns {{requestXml: string|null, responseXml: string|null}}
- */
-const extractRRXmlPair = (rrObj) => {
-  const xml = rrObj?.xml;
-
-  let requestXml = null;
-  let responseXml = null;
-
-  if (typeof xml === "string") {
-    requestXml = xml;
-  } else {
-    if (typeof xml?.request === "string") requestXml = xml.request;
-    else if (typeof xml?.req === "string") requestXml = xml.req;
-    else if (typeof xml?.starXml === "string") requestXml = xml.starXml;
-    if (typeof xml?.response === "string") responseXml = xml.response;
-  }
-
-  if (!requestXml && typeof rrObj?.requestXml === "string") requestXml = rrObj.requestXml;
-  if (!responseXml && typeof rrObj?.responseXml === "string") responseXml = rrObj.responseXml;
-
-  return { requestXml, responseXml };
-};
-
-/**
- * Add Reynolds request/response XML to RR log metadata when available.
- * @param rrObj
- * @param meta
- * @returns {*}
- */
-const withRRRequestXml = (rrObj, meta = {}) => {
-  const { requestXml, responseXml } = extractRRXmlPair(rrObj);
-  const xmlMeta = {};
-  if (requestXml) xmlMeta.requestXml = requestXml;
-  if (responseXml) xmlMeta.responseXml = responseXml;
-  return Object.keys(xmlMeta).length ? { ...meta, ...xmlMeta } : meta;
-};
-
 /**
  * Sort vehicle owners first in the list, preserving original order otherwise.
  * @param list
@@ -194,13 +154,15 @@ const setJobDmsIdForSocket = async ({ socket, jobId, dmsId, dmsCustomerId, dmsAd
     if (!token) throw new Error("Missing auth token for setJobDmsIdForSocket");
 
     const client = new GraphQLClient(endpoint, {});
-    await client.setHeaders({ Authorization: `Bearer ${token}` }).request(queries.SET_JOB_DMS_ID, {
-      id: jobId,
-      dms_id: String(dmsId),
-      dms_customer_id: dmsCustomerId ? String(dmsCustomerId) : null,
-      dms_advisor_id: dmsAdvisorId ? String(dmsAdvisorId) : null,
-      kmin: mileageIn != null && mileageIn > 0 ? parseInt(mileageIn, 10) : null
-    });
+    await client
+      .setHeaders({ Authorization: `Bearer ${token}` })
+      .request(queries.SET_JOB_DMS_ID, { 
+        id: jobId, 
+        dms_id: String(dmsId),
+        dms_customer_id: dmsCustomerId ? String(dmsCustomerId) : null,
+        dms_advisor_id: dmsAdvisorId ? String(dmsAdvisorId) : null,
+        kmin: mileageIn != null && mileageIn > 0 ? parseInt(mileageIn, 10) : null
+      });
 
     CreateRRLogEvent(socket, "INFO", "Linked job.dms_id to RR RO", {
       jobId,
@@ -549,11 +511,7 @@ const registerRREvents = ({ socket, redisHelpers }) => {
       });
 
       // Filter out invalid values
-      if (
-        selectedCustNo === "undefined" ||
-        selectedCustNo === "null" ||
-        (selectedCustNo && selectedCustNo.trim() === "")
-      ) {
+      if (selectedCustNo === "undefined" || selectedCustNo === "null" || (selectedCustNo && selectedCustNo.trim() === "")) {
         selectedCustNo = null;
       }
 
@@ -747,52 +705,42 @@ const registerRREvents = ({ socket, redisHelpers }) => {
 
         const outsdRoNo = data?.outsdRoNo ?? job?.ro_number ?? job?.id ?? null;
 
-        CreateRRLogEvent(
-          socket,
-          "DEBUG",
-          "Early RO created - checking dmsRoNo",
-          withRRRequestXml(result, {
-            dmsRoNo,
-            resultRoNo: result?.roNo,
-            dataRoNo: data?.dmsRoNo,
-            jobId: rid
-          })
-        );
+        CreateRRLogEvent(socket, "DEBUG", "Early RO created - checking dmsRoNo", {
+          dmsRoNo,
+          resultRoNo: result?.roNo,
+          dataRoNo: data?.dmsRoNo,
+          jobId: rid
+        });
 
         // ✅ Persist DMS RO number, customer ID, advisor ID, and mileage on the job
         if (dmsRoNo) {
           const mileageIn = txEnvelope?.kmin ?? null;
-          CreateRRLogEvent(socket, "DEBUG", "Calling setJobDmsIdForSocket", {
-            jobId: rid,
+          CreateRRLogEvent(socket, "DEBUG", "Calling setJobDmsIdForSocket", { 
+            jobId: rid, 
             dmsId: dmsRoNo,
             customerId: effectiveCustNo,
             advisorId: String(advisorNo),
             mileageIn
           });
-          await setJobDmsIdForSocket({
-            socket,
-            jobId: rid,
+          await setJobDmsIdForSocket({ 
+            socket, 
+            jobId: rid, 
             dmsId: dmsRoNo,
             dmsCustomerId: effectiveCustNo,
             dmsAdvisorId: String(advisorNo),
             mileageIn
           });
         } else {
-          CreateRRLogEvent(
-            socket,
-            "WARN",
-            "RR early RO creation succeeded but no DMS RO number was returned",
-            withRRRequestXml(result, {
-              jobId: rid,
-              resultPreview: {
-                roNo: result?.roNo,
-                data: {
-                  dmsRoNo: data?.dmsRoNo,
-                  outsdRoNo: data?.outsdRoNo
-                }
+          CreateRRLogEvent(socket, "WARN", "RR early RO creation succeeded but no DMS RO number was returned", {
+            jobId: rid,
+            resultPreview: {
+              roNo: result?.roNo,
+              data: {
+                dmsRoNo: data?.dmsRoNo,
+                outsdRoNo: data?.outsdRoNo
               }
-            })
-          );
+            }
+          });
         }
 
         await redisHelpers.setSessionTransactionData(
@@ -810,15 +758,10 @@ const registerRREvents = ({ socket, redisHelpers }) => {
           defaultRRTTL
         );
 
-        CreateRRLogEvent(
-          socket,
-          "INFO",
-          `{EARLY-5} Minimal RO created successfully`,
-          withRRRequestXml(result, {
-            dmsRoNo: dmsRoNo || null,
-            outsdRoNo: outsdRoNo || null
-          })
-        );
+        CreateRRLogEvent(socket, "INFO", `{EARLY-5} Minimal RO created successfully`, {
+          dmsRoNo: dmsRoNo || null,
+          outsdRoNo: outsdRoNo || null
+        });
 
         // Mark success in export logs
         await markRRExportSuccess({
@@ -867,16 +810,11 @@ const registerRREvents = ({ socket, redisHelpers }) => {
           message: vendorMessage
         });
 
-        CreateRRLogEvent(
-          socket,
-          "ERROR",
-          `Early RO creation failed`,
-          withRRRequestXml(result, {
-            roStatus: result?.roStatus,
-            statusBlocks: result?.statusBlocks,
-            classification: cls
-          })
-        );
+        CreateRRLogEvent(socket, "ERROR", `Early RO creation failed`, {
+          roStatus: result?.roStatus,
+          statusBlocks: result?.statusBlocks,
+          classification: cls
+        });
 
         await insertRRFailedExportLog({
           socket,
@@ -1002,14 +940,14 @@ const registerRREvents = ({ socket, redisHelpers }) => {
 
       // Check if this job already has an early RO - if so, use stored IDs and skip customer search
       const hasEarlyRO = !!job?.dms_id;
-
+      
       if (hasEarlyRO) {
         CreateRRLogEvent(socket, "DEBUG", `{2} Early RO exists - using stored customer/advisor`, {
           dms_id: job.dms_id,
           dms_customer_id: job.dms_customer_id,
           dms_advisor_id: job.dms_advisor_id
         });
-
+        
         // Cache the stored customer/advisor IDs for the next step
         if (job.dms_customer_id) {
           await redisHelpers.setSessionTransactionData(
@@ -1029,18 +967,18 @@ const registerRREvents = ({ socket, redisHelpers }) => {
             defaultRRTTL
           );
         }
-
+        
         // Emit empty customer list to frontend (won't show modal)
         socket.emit("rr-select-customer", []);
-
+        
         // Continue directly with the export by calling the selected customer handler logic inline
         // This is essentially the same as if user selected the stored customer
         const selectedCustNo = job.dms_customer_id;
-
+        
         if (!selectedCustNo) {
           throw new Error("Early RO exists but no customer ID stored");
         }
-
+        
         // Continue with ensureRRServiceVehicle and export (same as rr-selected-customer handler)
         const { client, opts } = await buildClientAndOpts(bodyshop);
         const routing = opts?.routing || client?.opts?.routing || null;
@@ -1073,12 +1011,7 @@ const registerRREvents = ({ socket, redisHelpers }) => {
           redisHelpers
         });
 
-        const advisorNo =
-          job.dms_advisor_id ||
-          readAdvisorNo(
-            { txEnvelope },
-            await redisHelpers.getSessionTransactionData(socket.id, getTransactionType(rid), RRCacheEnums.AdvisorNo)
-          );
+        const advisorNo = job.dms_advisor_id || readAdvisorNo({ txEnvelope }, await redisHelpers.getSessionTransactionData(socket.id, getTransactionType(rid), RRCacheEnums.AdvisorNo));
 
         if (!advisorNo) {
           throw new Error("Advisor is required (advisorNo).");
@@ -1126,20 +1059,15 @@ const registerRREvents = ({ socket, redisHelpers }) => {
           defaultRRTTL
         );
 
-        CreateRRLogEvent(
-          socket,
-          "INFO",
-          `RR Repair Order updated successfully`,
-          withRRRequestXml(result, {
-            dmsRoNo,
-            jobId: rid
-          })
-        );
+        CreateRRLogEvent(socket, "INFO", `RR Repair Order updated successfully`, {
+          dmsRoNo,
+          jobId: rid
+        });
 
         // For early RO flow, only emit validation-required (not export-job:result)
         // since the export is not complete yet - we're just waiting for validation
         socket.emit("rr-validation-required", { dmsRoNo, jobId: rid });
-
+        
         return ack?.({ ok: true, skipCustomerSelection: true, dmsRoNo });
       }
 
@@ -1349,25 +1277,25 @@ const registerRREvents = ({ socket, redisHelpers }) => {
       // When updating an early RO, use stored customer/advisor IDs
       let finalEffectiveCustNo = effectiveCustNo;
       let finalAdvisorNo = advisorNo;
-
+      
       if (shouldUpdate && job?.dms_customer_id) {
-        CreateRRLogEvent(socket, "DEBUG", `Using stored customer ID from early RO`, {
+        CreateRRLogEvent(socket, "DEBUG", `Using stored customer ID from early RO`, { 
           storedCustomerId: job.dms_customer_id,
-          originalCustomerId: effectiveCustNo
+          originalCustomerId: effectiveCustNo  
         });
         finalEffectiveCustNo = String(job.dms_customer_id);
       }
-
+      
       if (shouldUpdate && job?.dms_advisor_id) {
-        CreateRRLogEvent(socket, "DEBUG", `Using stored advisor ID from early RO`, {
+        CreateRRLogEvent(socket, "DEBUG", `Using stored advisor ID from early RO`, { 
           storedAdvisorId: job.dms_advisor_id,
-          originalAdvisorId: advisorNo
+          originalAdvisorId: advisorNo  
         });
         finalAdvisorNo = String(job.dms_advisor_id);
       }
 
       let result;
-
+      
       if (shouldUpdate) {
         // UPDATE existing RO with full data
         CreateRRLogEvent(socket, "DEBUG", `{4} Updating existing RR RO with full data`, { dmsRoNo: existingDmsId });
@@ -1416,21 +1344,16 @@ const registerRREvents = ({ socket, redisHelpers }) => {
         if (dmsRoNo) {
           await setJobDmsIdForSocket({ socket, jobId: rid, dmsId: dmsRoNo });
         } else {
-          CreateRRLogEvent(
-            socket,
-            "WARN",
-            "RR export succeeded but no DMS RO number was returned",
-            withRRRequestXml(result, {
-              jobId: rid,
-              resultPreview: {
-                roNo: result?.roNo,
-                data: {
-                  dmsRoNo: data?.dmsRoNo,
-                  outsdRoNo: data?.outsdRoNo
-                }
+          CreateRRLogEvent(socket, "WARN", "RR export succeeded but no DMS RO number was returned", {
+            jobId: rid,
+            resultPreview: {
+              roNo: result?.roNo,
+              data: {
+                dmsRoNo: data?.dmsRoNo,
+                outsdRoNo: data?.outsdRoNo
               }
-            })
-          );
+            }
+          });
         }
 
         await redisHelpers.setSessionTransactionData(
@@ -1447,15 +1370,10 @@ const registerRREvents = ({ socket, redisHelpers }) => {
           defaultRRTTL
         );
 
-        CreateRRLogEvent(
-          socket,
-          "INFO",
-          `{5} RO created. Waiting for validation.`,
-          withRRRequestXml(result, {
-            dmsRoNo: dmsRoNo || null,
-            outsdRoNo: outsdRoNo || null
-          })
-        );
+        CreateRRLogEvent(socket, "INFO", `{5} RO created. Waiting for validation.`, {
+          dmsRoNo: dmsRoNo || null,
+          outsdRoNo: outsdRoNo || null
+        });
 
         // Tell FE to prompt for "Finished/Close"
         socket.emit("rr-validation-required", { jobId: rid, dmsRoNo, outsdRoNo });
@@ -1494,16 +1412,11 @@ const registerRREvents = ({ socket, redisHelpers }) => {
           message: vendorMessage
         });
 
-        CreateRRLogEvent(
-          socket,
-          "ERROR",
-          `Export failed (step 1)`,
-          withRRRequestXml(result, {
-            roStatus: result?.roStatus,
-            statusBlocks: result?.statusBlocks,
-            classification: cls
-          })
-        );
+        CreateRRLogEvent(socket, "ERROR", `Export failed (step 1)`, {
+          roStatus: result?.roStatus,
+          statusBlocks: result?.statusBlocks,
+          classification: cls
+        });
 
         await insertRRFailedExportLog({
           socket,
@@ -1628,12 +1541,7 @@ const registerRREvents = ({ socket, redisHelpers }) => {
       });
 
       if (finalizeResult?.success) {
-        CreateRRLogEvent(
-          socket,
-          "INFO",
-          `{7} Finalize success; marking exported`,
-          withRRRequestXml(finalizeResult, { dmsRoNo, outsdRoNo })
-        );
+        CreateRRLogEvent(socket, "INFO", `{7} Finalize success; marking exported`, { dmsRoNo, outsdRoNo });
 
         // ✅ Mark exported + success log
         await markRRExportSuccess({
@@ -1676,17 +1584,6 @@ const registerRREvents = ({ socket, redisHelpers }) => {
           message: vendorMessage
         });
 
-        CreateRRLogEvent(
-          socket,
-          "ERROR",
-          "Finalize failed",
-          withRRRequestXml(finalizeResult, {
-            roStatus: finalizeResult?.roStatus,
-            statusBlocks: finalizeResult?.statusBlocks,
-            classification: cls
-          })
-        );
-
         await insertRRFailedExportLog({
           socket,
           jobId: rid,
diff --git a/server/utils/redisHelpers.js b/server/utils/redisHelpers.js
index 0ca8b599d..a317e7e7a 100644
--- a/server/utils/redisHelpers.js
+++ b/server/utils/redisHelpers.js
@@ -68,33 +68,12 @@ const fetchBodyshopFromDB = async (bodyshopId, logger) => {
  * @param logger
  */
 const applyRedisHelpers = ({ pubClient, app, logger }) => {
-  const toRedisJson = (value) => JSON.stringify(value === undefined ? null : value);
-
   // Store session data in Redis
   const setSessionData = async (socketId, key, value, ttl) => {
     try {
-      const sessionKey = `socket:${socketId}`;
-
-      // Supports both forms:
-      // 1) setSessionData(socketId, "field", value, ttl)
-      // 2) setSessionData(socketId, { fieldA: valueA, fieldB: valueB }, ttl)
-      if (key && typeof key === "object" && !Array.isArray(key)) {
-        const entries = Object.entries(key).flatMap(([field, fieldValue]) => [field, toRedisJson(fieldValue)]);
-
-        if (entries.length > 0) {
-          await pubClient.hset(sessionKey, ...entries);
-        }
-
-        const objectTtl = typeof value === "number" ? value : typeof ttl === "number" ? ttl : null;
-        if (objectTtl) {
-          await pubClient.expire(sessionKey, objectTtl);
-        }
-        return;
-      }
-
-      await pubClient.hset(sessionKey, key, toRedisJson(value)); // Use Redis pubClient
+      await pubClient.hset(`socket:${socketId}`, key, JSON.stringify(value)); // Use Redis pubClient
       if (ttl && typeof ttl === "number") {
-        await pubClient.expire(sessionKey, ttl);
+        await pubClient.expire(`socket:${socketId}`, ttl);
       }
     } catch (error) {
       logger.log(`Error Setting Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
@@ -109,26 +88,7 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
    */
   const getSessionData = async (socketId, key) => {
     try {
-      const sessionKey = `socket:${socketId}`;
-
-      // Supports:
-      // 1) getSessionData(socketId, "field") -> parsed field value
-      // 2) getSessionData(socketId) -> parsed object of all fields
-      if (typeof key === "undefined") {
-        const raw = await pubClient.hgetall(sessionKey);
-        if (!raw || Object.keys(raw).length === 0) return null;
-
-        return Object.entries(raw).reduce((acc, [field, rawValue]) => {
-          try {
-            acc[field] = JSON.parse(rawValue);
-          } catch {
-            acc[field] = rawValue;
-          }
-          return acc;
-        }, {});
-      }
-
-      const data = await pubClient.hget(sessionKey, key);
+      const data = await pubClient.hget(`socket:${socketId}`, key);
       return data ? JSON.parse(data) : null;
     } catch (error) {
       logger.log(`Error Getting Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
@@ -146,7 +106,7 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
    */
   const setSessionTransactionData = async (socketId, transactionType, key, value, ttl) => {
     try {
-      await pubClient.hset(getSocketTransactionkey({ socketId, transactionType }), key, toRedisJson(value)); // Use Redis pubClient
+      await pubClient.hset(getSocketTransactionkey({ socketId, transactionType }), key, JSON.stringify(value)); // Use Redis pubClient
       if (ttl && typeof ttl === "number") {
         await pubClient.expire(getSocketTransactionkey({ socketId, transactionType }), ttl);
       }
@@ -200,17 +160,7 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
    */
   const clearSessionTransactionData = async (socketId, transactionType) => {
     try {
-      if (transactionType) {
-        await pubClient.del(getSocketTransactionkey({ socketId, transactionType }));
-        return;
-      }
-
-      // If no transactionType is provided, clear all transaction namespaces for this socket.
-      const pattern = getSocketTransactionkey({ socketId, transactionType: "*" });
-      const keys = await pubClient.keys(pattern);
-      if (Array.isArray(keys) && keys.length > 0) {
-        await pubClient.del(...keys);
-      }
+      await pubClient.del(getSocketTransactionkey({ socketId, transactionType }));
     } catch (error) {
       logger.log(
         `Error Clearing Session Transaction Data for socket ${socketId}:${transactionType}: ${error}`,
diff --git a/server/web-sockets/createLogEvent.js b/server/web-sockets/createLogEvent.js
index b1824d334..0e0d52cbc 100644
--- a/server/web-sockets/createLogEvent.js
+++ b/server/web-sockets/createLogEvent.js
@@ -1,113 +1,114 @@
 const { isArray } = require("lodash");
 const logger = require("../utils/logger");
 
-function createLogEvent(socket, level, message) {
-  if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy(level)) {
-    // console.log(`[WS LOG EVENT] ${level} - ${new Date()} - ${socket.user.email} - ${socket.id} - ${message}`);
-    socket.emit("log-event", {
-      timestamp: new Date(),
-      level,
-      message
-    });
 
-    logger.log("ws-log-event", level, socket.user.email, socket.recordid, {
-      wsmessage: message
-    });
+function createLogEvent(socket, level, message) {
+    if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy(level)) {
+        // console.log(`[WS LOG EVENT] ${level} - ${new Date()} - ${socket.user.email} - ${socket.id} - ${message}`);
+        socket.emit("log-event", {
+            timestamp: new Date(),
+            level,
+            message
+        });
+
+        logger.log("ws-log-event", level, socket.user.email, socket.recordid, {
+            wsmessage: message
+        });
+
+        if (socket.logEvents && isArray(socket.logEvents)) {
+            socket.logEvents.push({
+                timestamp: new Date(),
+                level,
+                message
+            });
+        }
+        // if (level === "ERROR") {
+        //   throw new Error(message);
+        // }
+    }
+}
+
+function createJsonEvent(socket, level, message, json) {
+    if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy(level)) {
+        //console.log(`[WS LOG EVENT] ${level} - ${new Date()} - ${socket.user.email} - ${socket.id} - ${message}`);
+        socket.emit("log-event", {
+            timestamp: new Date(),
+            level,
+            message
+        }); 
+    }
+    logger.log(
+        "ws-log-event-json",
+        level,
+        socket.user.email,
+        socket.recordid,
+        {
+            wsmessage: message,
+            json
+        },
+        true
+    );
 
     if (socket.logEvents && isArray(socket.logEvents)) {
-      socket.logEvents.push({
-        timestamp: new Date(),
-        level,
-        message
-      });
+        socket.logEvents.push({
+            timestamp: new Date(),
+            level,
+            message
+        });
     }
     // if (level === "ERROR") {
     //   throw new Error(message);
     // }
-  }
-}
-
-function createJsonEvent(socket, level, message, json) {
-  if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy(level)) {
-    //console.log(`[WS LOG EVENT] ${level} - ${new Date()} - ${socket.user.email} - ${socket.id} - ${message}`);
-    socket.emit("log-event", {
-      timestamp: new Date(),
-      level,
-      message
-    });
-  }
-  logger.log(
-    "ws-log-event-json",
-    level,
-    socket.user.email,
-    socket.recordid,
-    {
-      wsmessage: message,
-      json
-    },
-    true
-  );
-
-  if (socket.logEvents && isArray(socket.logEvents)) {
-    socket.logEvents.push({
-      timestamp: new Date(),
-      level,
-      message
-    });
-  }
-  // if (level === "ERROR") {
-  //   throw new Error(message);
-  // }
 }
 
 function createXmlEvent(socket, xml, message, isError = false) {
-  if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy("SILLY")) {
-    socket.emit("log-event", {
-      timestamp: new Date(),
-      level: isError ? "ERROR" : "SILLY",
-      message: `${message}: ${xml}`
-    });
-  }
+    if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy("SILLY")) {
+        socket.emit("log-event", {
+            timestamp: new Date(),
+            level: isError ? "ERROR" : "SILLY",
+            message: `${message}: ${xml}`
+        });
+    }
 
-  logger.log(
-    isError ? "ws-log-event-xml-error" : "ws-log-event-xml",
-    isError ? "ERROR" : "SILLY",
-    socket.user.email,
-    socket.recordid,
-    {
-      wsmessage: message,
-      xml
-    },
-    true
-  );
+    logger.log(
+        isError ? "ws-log-event-xml-error" : "ws-log-event-xml",
+        isError ? "ERROR" : "SILLY",
+        socket.user.email,
+        socket.recordid,
+        {
+            wsmessage: message,
+            xml
+        },
+        true
+    );
 
-  if (socket.logEvents && isArray(socket.logEvents)) {
-    socket.logEvents.push({
-      timestamp: new Date(),
-      level: isError ? "ERROR" : "SILLY",
-      message,
-      xml
-    });
-  }
+    if (socket.logEvents && isArray(socket.logEvents)) {
+        socket.logEvents.push({
+            timestamp: new Date(),
+            level: isError ? "ERROR" : "SILLY",
+            message,
+            xml
+        });
+    }
 }
 
 function LogLevelHierarchy(level) {
-  switch (level) {
-    case "XML":
-      return 5;
-    case "SILLY":
-      return 5;
-    case "DEBUG":
-      return 4;
-    case "INFO":
-      return 3;
-    case "WARN":
-      return 2;
-    case "ERROR":
-      return 1;
-    default:
-      return 3;
-  }
+    switch (level) {
+        case "XML":
+            return 5;
+        case "SILLY":
+            return 5;
+        case "DEBUG":
+            return 4;
+        case "INFO":
+            return 3;
+        case "WARN":
+            return 2;
+        case "ERROR":
+            return 1;
+        default:
+            return 3;
+    }
 }
 
 exports.createLogEvent = createLogEvent;
diff --git a/server/web-sockets/redisSocketEvents.js b/server/web-sockets/redisSocketEvents.js
index 1d8effeff..c4af2fb55 100644
--- a/server/web-sockets/redisSocketEvents.js
+++ b/server/web-sockets/redisSocketEvents.js
@@ -4,14 +4,11 @@ const { FortellisJobExport, FortellisSelectedCustomer } = require("../fortellis/
 const CdkCalculateAllocations = require("../cdk/cdk-calculate-allocations").default;
 const registerRREvents = require("../rr/rr-register-socket-events");
 
-const SOCKET_SESSION_TTL_SECONDS = 60 * 60 * 24;
-
 const redisSocketEvents = ({ io, redisHelpers, ioHelpers, logger }) => {
   // Destructure helpers locally, but keep full objects available for downstream modules
   const {
     setSessionData,
     getSessionData,
-    clearSessionData,
     addUserSocketMapping,
     removeUserSocketMapping,
     refreshUserSocketTTL,
@@ -54,16 +51,12 @@ const redisSocketEvents = ({ io, redisHelpers, ioHelpers, logger }) => {
       }
 
       // NEW: seed a base session for this socket so downstream handlers can read it
-      await setSessionData(
-        socket.id,
-        {
-          bodyshopId,
-          email: user.email,
-          uid: user.user_id || user.uid,
-          seededAt: Date.now()
-        },
-        SOCKET_SESSION_TTL_SECONDS
-      );
+      await setSessionData(socket.id, {
+        bodyshopId,
+        email: user.email,
+        uid: user.user_id || user.uid,
+        seededAt: Date.now()
+      });
 
       await addUserSocketMapping(user.email, socket.id, bodyshopId);
       next();
@@ -133,18 +126,14 @@ const redisSocketEvents = ({ io, redisHelpers, ioHelpers, logger }) => {
           }
 
           // NEW: refresh (or create) the base session with the latest info
-          await setSessionData(
-            socket.id,
-            {
-              bodyshopId,
-              email: user.email,
-              uid: user.user_id || user.uid,
-              refreshedAt: Date.now()
-            },
-            SOCKET_SESSION_TTL_SECONDS
-          );
+          await setSessionData(socket.id, {
+            bodyshopId,
+            email: user.email,
+            uid: user.user_id || user.uid,
+            refreshedAt: Date.now()
+          });
 
-          await refreshUserSocketTTL(user.email);
+          await refreshUserSocketTTL(user.email, bodyshopId);
           socket.emit("token-updated", { success: true });
         } catch (error) {
           if (error.code === "auth/id-token-expired") {
@@ -200,11 +189,6 @@ const redisSocketEvents = ({ io, redisHelpers, ioHelpers, logger }) => {
         if (socket.user?.email) {
           await removeUserSocketMapping(socket.user.email, socket.id);
         }
-        try {
-          await clearSessionData(socket.id);
-        } catch {
-          //
-        }
         // Optional: clear transactional session
         try {
           await clearSessionTransactionData(socket.id);