diff --git a/__snapshots__/storybook.test.ts.snap b/__snapshots__/storybook.test.ts.snap
index ed34d8b5c..980484b23 100644
--- a/__snapshots__/storybook.test.ts.snap
+++ b/__snapshots__/storybook.test.ts.snap
@@ -269118,12 +269118,6 @@ exports[`Storyshots Trip Form Components/Advanced Mode Settings Buttons Advanced
   cursor: pointer;
 }
 
-.c3 {
-  display: inline-block;
-  vertical-align: middle;
-  overflow: hidden;
-}
-
 .c7 {
   display: grid;
   grid-column: span 2;
@@ -269196,16 +269190,6 @@ exports[`Storyshots Trip Form Components/Advanced Mode Settings Buttons Advanced
 
 .c1 {
   width: 100%;
-  max-width: 500px;
-}
-
-.c2 > input {
-  -webkit-clip: rect(0,0,0,0);
-  clip: rect(0,0,0,0);
-  height: 0;
-  overflow: hidden;
-  position: absolute;
-  width: 0;
 }
 
 .c2 > label {
@@ -269214,18 +269198,32 @@ exports[`Storyshots Trip Form Components/Advanced Mode Settings Buttons Advanced
   -ms-flex-align: center;
   align-items: center;
   background-color: #fff;
-  border: 1px solid #336B9E;
+  border: 2px solid #336B9E;
   border-left-width: 2px;
   border-right-width: 2px;
   color: #336B9E;
+  cursor: pointer;
   display: grid;
+  font-size: 18px;
+  font-weight: 400;
   gap: 20px;
   grid-template-columns: 40px auto 40px;
   height: 51px;
   justify-items: center;
+  margin-bottom: 0;
+  margin-top: -2px;
   padding: 0 10px;
 }
 
+.c2 > input {
+  -webkit-clip: rect(0,0,0,0);
+  clip: rect(0,0,0,0);
+  height: 0;
+  overflow: hidden;
+  position: absolute;
+  width: 0;
+}
+
 .c2 > input:checked + label {
   background-color: #336B9E;
   color: #fff;
@@ -269233,6 +269231,17 @@ exports[`Storyshots Trip Form Components/Advanced Mode Settings Buttons Advanced
   border-bottom-right-radius: 0 !important;
 }
 
+.c2 > input:focus-visible + label,
+.c2 > input:focus + label {
+  outline: #336B9E 1px solid;
+  outline-offset: -4px;
+}
+
+.c2 > input:checked:focus-visible + label,
+.c2 > input:checked:focus + label {
+  outline: white 1px solid;
+}
+
 .c2 span {
   justify-self: flex-start;
 }
@@ -269247,33 +269256,38 @@ exports[`Storyshots Trip Form Components/Advanced Mode Settings Buttons Advanced
   cursor: pointer;
 }
 
-.c12 > input {
-  -webkit-clip: rect(0,0,0,0);
-  clip: rect(0,0,0,0);
-  height: 0;
-  overflow: hidden;
-  position: absolute;
-  width: 0;
-}
-
 .c12 > label {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
   background-color: #fff;
-  border: 1px solid #336B9E;
+  border: 2px solid #336B9E;
   border-left-width: 2px;
   border-right-width: 2px;
   color: #336B9E;
+  cursor: pointer;
   display: grid;
+  font-size: 18px;
+  font-weight: 400;
   gap: 20px;
   grid-template-columns: 40px auto 40px;
   height: 51px;
   justify-items: center;
+  margin-bottom: 0;
+  margin-top: -2px;
   padding: 0 10px;
 }
 
+.c12 > input {
+  -webkit-clip: rect(0,0,0,0);
+  clip: rect(0,0,0,0);
+  height: 0;
+  overflow: hidden;
+  position: absolute;
+  width: 0;
+}
+
 .c12 > input:checked + label {
   background-color: #336B9E;
   color: #fff;
@@ -269281,6 +269295,17 @@ exports[`Storyshots Trip Form Components/Advanced Mode Settings Buttons Advanced
   border-bottom-right-radius: !important;
 }
 
+.c12 > input:focus-visible + label,
+.c12 > input:focus + label {
+  outline: #336B9E 1px solid;
+  outline-offset: -4px;
+}
+
+.c12 > input:checked:focus-visible + label,
+.c12 > input:checked:focus + label {
+  outline: white 1px solid;
+}
+
 .c12 span {
   justify-self: flex-start;
 }
@@ -269304,7 +269329,6 @@ exports[`Storyshots Trip Form Components/Advanced Mode Settings Buttons Advanced
 .c0 {
   border: none;
   margin: 0;
-  width: 90%;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -269333,377 +269357,392 @@ exports[`Storyshots Trip Form Components/Advanced Mode Settings Buttons Advanced
   border-radius: 0 0 8px 8px;
 }
 
-.c0 div.advanced-submode-container:last-of-type div:last-child {
+.c0 div.advanced-submode-container:last-of-type div.subsettings-container {
   border-radius: 0 0 8px 8px;
+  border-bottom: 1px solid #B3B3B3;
 }
 
-<fieldset
-  className="c0"
+.c3 {
+  display: inline-block;
+  vertical-align: middle;
+  overflow: hidden;
+}
+
+<div
+  style={
+    Object {
+      "maxWidth": "500px",
+    }
+  }
 >
-  <legend>
-    Select a transit mode
-  </legend>
-  <div
-    className="c1 advanced-submode-container"
+  <fieldset
+    className="c0"
   >
+    <legend>
+      Select a transit mode
+    </legend>
     <div
-      className="c2"
-      id="transit"
+      className="c1 advanced-submode-container"
     >
-      <input
-        aria-label="Transit"
-        checked={true}
-        id="metro-submode-selector-mode-transit"
-        onChange={[Function]}
-        type="checkbox"
-      />
-      <label
-        htmlFor="metro-submode-selector-mode-transit"
+      <div
+        className="c2 advanced-submode-mode-button"
+        id="transit"
       >
-        <svg
-          aria-hidden="true"
-          className="c3"
-          fill="currentColor"
-          focusable="false"
-          viewBox="0 0 512 512"
-          xmlns="http://www.w3.org/2000/svg"
+        <input
+          aria-label="Transit"
+          checked={true}
+          id="metro-submode-selector-mode-transit"
+          onChange={[Function]}
+          type="checkbox"
+        />
+        <label
+          htmlFor="metro-submode-selector-mode-transit"
         >
-          <path
-            d="M256 0c134.4 0 224 35.2 224 80v48c17.7 0 32 14.3 32 32v64c0 17.7-14.3 32-32 32v160c0 17.7-14.3 32-32 32v32c0 17.7-14.3 32-32 32h-32c-17.7 0-32-14.3-32-32v-32H160v32c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32v-32c-17.7 0-32-14.3-32-32V256c-17.7 0-32-14.3-32-32v-64c0-17.7 14.3-32 32-32V80c0-44.8 89.6-80 224-80zM96 160v96c0 17.7 14.3 32 32 32h112V128H128c-17.7 0-32 14.3-32 32zm176 128h112c17.7 0 32-14.3 32-32v-96c0-17.7-14.3-32-32-32H272v160zM112 400c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm288 0c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zM352 80c0-8.8-7.2-16-16-16H176c-8.8 0-16 7.2-16 16s7.2 16 16 16h160c8.8 0 16-7.2 16-16z"
+          <svg
+            aria-hidden="true"
+            className="c3"
             fill="currentColor"
-          />
-        </svg>
-        <span>
-          Transit
-        </span>
-        <svg
-          aria-hidden="true"
-          className="c4"
-          fill="currentColor"
-          focusable="false"
-          viewBox="0 0 16 16"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"
-          />
-        </svg>
-      </label>
-    </div>
-    <div
-      aria-hidden={false}
-      className="rah-static rah-static--height-auto "
-      style={
-        Object {
-          "height": "auto",
-          "overflow": "visible",
-        }
-      }
-    >
+            focusable="false"
+            viewBox="0 0 512 512"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M256 0c134.4 0 224 35.2 224 80v48c17.7 0 32 14.3 32 32v64c0 17.7-14.3 32-32 32v160c0 17.7-14.3 32-32 32v32c0 17.7-14.3 32-32 32h-32c-17.7 0-32-14.3-32-32v-32H160v32c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32v-32c-17.7 0-32-14.3-32-32V256c-17.7 0-32-14.3-32-32v-64c0-17.7 14.3-32 32-32V80c0-44.8 89.6-80 224-80zM96 160v96c0 17.7 14.3 32 32 32h112V128H128c-17.7 0-32 14.3-32 32zm176 128h112c17.7 0 32-14.3 32-32v-96c0-17.7-14.3-32-32-32H272v160zM112 400c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm288 0c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zM352 80c0-8.8-7.2-16-16-16H176c-8.8 0-16 7.2-16 16s7.2 16 16 16h160c8.8 0 16-7.2 16-16z"
+              fill="currentColor"
+            />
+          </svg>
+          <span>
+            Transit
+          </span>
+          <svg
+            aria-hidden="true"
+            className="c4"
+            fill="currentColor"
+            focusable="false"
+            viewBox="0 0 16 16"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"
+            />
+          </svg>
+        </label>
+      </div>
       <div
-        style={Object {}}
+        aria-hidden={false}
+        className="rah-static rah-static--height-auto "
+        style={
+          Object {
+            "height": "auto",
+            "overflow": "visible",
+          }
+        }
       >
         <div
-          className="c5"
+          style={Object {}}
         >
-          <fieldset
-            className="c6"
+          <div
+            className="c5 subsettings-container"
           >
-            <legend>
-              <span
-                id="metro-mode-selector-transit-button-label"
-              >
-                Transit
-              </span>
-            </legend>
-            <div
-              className="c7"
+            <fieldset
+              className="c6"
             >
+              <legend>
+                <span
+                  id="metro-mode-selector-transit-button-label"
+                >
+                  Transit
+                </span>
+              </legend>
               <div
-                className="c8"
+                className="c7"
               >
-                <input
-                  checked={true}
-                  id="id-query-param-tram"
-                  onChange={[Function]}
-                  type="checkbox"
-                />
-                <label
-                  className="c9"
-                  htmlFor="id-query-param-tram"
+                <div
+                  className="c8"
                 >
-                  <span
-                    className="c10"
+                  <input
+                    checked={true}
+                    id="id-query-param-tram"
+                    onChange={[Function]}
+                    type="checkbox"
+                  />
+                  <label
+                    className="c9"
+                    htmlFor="id-query-param-tram"
                   >
-                    <div
-                      role="none"
+                    <span
+                      className="c10"
                     >
-                      <svg
-                        aria-hidden="true"
-                        className="c3"
-                        fill="currentColor"
-                        focusable="false"
-                        viewBox="0 0 448 512"
-                        xmlns="http://www.w3.org/2000/svg"
+                      <div
+                        role="none"
                       >
-                        <path
-                          d="M86.8 48c-12.2 0-23.6 5.5-31.2 15L42.7 79C34.5 89.3 19.4 91 9 82.7S-3 59.4 5.3 49L18 33C34.7 12.2 60 0 86.8 0h274.4c26.7 0 52 12.2 68.7 33l12.8 16c8.3 10.4 6.6 25.5-3.7 33.7s-25.5 6.6-33.7-3.7l-12.8-16c-7.6-9.5-19.1-15-31.2-15H248v48h40c53 0 96 43 96 96v160c0 30.6-14.3 57.8-36.6 75.4l65.5 65.5C420 500 415 512 405 512h-39.7c-8.5 0-16.6-3.4-22.6-9.4L288 448H160l-54.6 54.6c-6 6-14.1 9.4-22.6 9.4H43c-10 0-15-12.1-7.9-19.1l65.5-65.5C78.3 409.8 64 382.6 64 352V192c0-53 43-96 96-96h40V48H86.8zM160 160c-17.7 0-32 14.3-32 32v32c0 17.7 14.3 32 32 32h128c17.7 0 32-14.3 32-32v-32c0-17.7-14.3-32-32-32H160zm32 192c0-17.7-14.3-32-32-32s-32 14.3-32 32 14.3 32 32 32 32-14.3 32-32zm96 32c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32z"
+                        <svg
+                          aria-hidden="true"
+                          className="c3"
                           fill="currentColor"
-                        />
-                      </svg>
-                    </div>
-                    <div>
-                      Tram
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div
-                className="c8"
-              >
-                <input
-                  checked={true}
-                  id="id-query-param-bus"
-                  onChange={[Function]}
-                  type="checkbox"
-                />
-                <label
-                  className="c9"
-                  htmlFor="id-query-param-bus"
+                          focusable="false"
+                          viewBox="0 0 448 512"
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M86.8 48c-12.2 0-23.6 5.5-31.2 15L42.7 79C34.5 89.3 19.4 91 9 82.7S-3 59.4 5.3 49L18 33C34.7 12.2 60 0 86.8 0h274.4c26.7 0 52 12.2 68.7 33l12.8 16c8.3 10.4 6.6 25.5-3.7 33.7s-25.5 6.6-33.7-3.7l-12.8-16c-7.6-9.5-19.1-15-31.2-15H248v48h40c53 0 96 43 96 96v160c0 30.6-14.3 57.8-36.6 75.4l65.5 65.5C420 500 415 512 405 512h-39.7c-8.5 0-16.6-3.4-22.6-9.4L288 448H160l-54.6 54.6c-6 6-14.1 9.4-22.6 9.4H43c-10 0-15-12.1-7.9-19.1l65.5-65.5C78.3 409.8 64 382.6 64 352V192c0-53 43-96 96-96h40V48H86.8zM160 160c-17.7 0-32 14.3-32 32v32c0 17.7 14.3 32 32 32h128c17.7 0 32-14.3 32-32v-32c0-17.7-14.3-32-32-32H160zm32 192c0-17.7-14.3-32-32-32s-32 14.3-32 32 14.3 32 32 32 32-14.3 32-32zm96 32c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32z"
+                            fill="currentColor"
+                          />
+                        </svg>
+                      </div>
+                      <div>
+                        Tram
+                      </div>
+                    </span>
+                  </label>
+                </div>
+                <div
+                  className="c8"
                 >
-                  <span
-                    className="c10"
+                  <input
+                    checked={true}
+                    id="id-query-param-bus"
+                    onChange={[Function]}
+                    type="checkbox"
+                  />
+                  <label
+                    className="c9"
+                    htmlFor="id-query-param-bus"
                   >
-                    <div
-                      role="none"
+                    <span
+                      className="c10"
                     >
-                      <svg
-                        aria-hidden="true"
-                        className="c3"
-                        fill="currentColor"
-                        focusable="false"
-                        viewBox="0 0 512 512"
-                        xmlns="http://www.w3.org/2000/svg"
+                      <div
+                        role="none"
                       >
-                        <path
-                          d="M256 0c134.4 0 224 35.2 224 80v48c17.7 0 32 14.3 32 32v64c0 17.7-14.3 32-32 32v160c0 17.7-14.3 32-32 32v32c0 17.7-14.3 32-32 32h-32c-17.7 0-32-14.3-32-32v-32H160v32c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32v-32c-17.7 0-32-14.3-32-32V256c-17.7 0-32-14.3-32-32v-64c0-17.7 14.3-32 32-32V80c0-44.8 89.6-80 224-80zM96 160v96c0 17.7 14.3 32 32 32h112V128H128c-17.7 0-32 14.3-32 32zm176 128h112c17.7 0 32-14.3 32-32v-96c0-17.7-14.3-32-32-32H272v160zM112 400c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm288 0c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zM352 80c0-8.8-7.2-16-16-16H176c-8.8 0-16 7.2-16 16s7.2 16 16 16h160c8.8 0 16-7.2 16-16z"
+                        <svg
+                          aria-hidden="true"
+                          className="c3"
                           fill="currentColor"
-                        />
-                      </svg>
-                    </div>
-                    <div>
-                      MARTA Rail
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div
-                className="c8"
-              >
-                <input
-                  checked={true}
-                  id="id-query-param-subway"
-                  onChange={[Function]}
-                  type="checkbox"
-                />
-                <label
-                  className="c9"
-                  htmlFor="id-query-param-subway"
+                          focusable="false"
+                          viewBox="0 0 512 512"
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M256 0c134.4 0 224 35.2 224 80v48c17.7 0 32 14.3 32 32v64c0 17.7-14.3 32-32 32v160c0 17.7-14.3 32-32 32v32c0 17.7-14.3 32-32 32h-32c-17.7 0-32-14.3-32-32v-32H160v32c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32v-32c-17.7 0-32-14.3-32-32V256c-17.7 0-32-14.3-32-32v-64c0-17.7 14.3-32 32-32V80c0-44.8 89.6-80 224-80zM96 160v96c0 17.7 14.3 32 32 32h112V128H128c-17.7 0-32 14.3-32 32zm176 128h112c17.7 0 32-14.3 32-32v-96c0-17.7-14.3-32-32-32H272v160zM112 400c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm288 0c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zM352 80c0-8.8-7.2-16-16-16H176c-8.8 0-16 7.2-16 16s7.2 16 16 16h160c8.8 0 16-7.2 16-16z"
+                            fill="currentColor"
+                          />
+                        </svg>
+                      </div>
+                      <div>
+                        MARTA Rail
+                      </div>
+                    </span>
+                  </label>
+                </div>
+                <div
+                  className="c8"
                 >
-                  <span
-                    className="c10"
+                  <input
+                    checked={true}
+                    id="id-query-param-subway"
+                    onChange={[Function]}
+                    type="checkbox"
+                  />
+                  <label
+                    className="c9"
+                    htmlFor="id-query-param-subway"
                   >
-                    <div
-                      role="none"
+                    <span
+                      className="c10"
                     >
-                      <svg
-                        aria-hidden="true"
-                        className="c3"
-                        fill="currentColor"
-                        focusable="false"
-                        viewBox="0 0 448 512"
-                        xmlns="http://www.w3.org/2000/svg"
+                      <div
+                        role="none"
                       >
-                        <path
-                          d="M96 0C43 0 0 43 0 96v256c0 48 35.2 87.7 81.1 94.9l-46 46c-7 7-2 19.1 7.9 19.1h39.7c8.5 0 16.6-3.4 22.6-9.4L160 448h128l54.6 54.6c6 6 14.1 9.4 22.6 9.4H405c10 0 15-12.1 7.9-19.1l-46-46c46-7.1 81.1-46.9 81.1-94.9V96c0-53-43-96-96-96H96zM64 128c0-17.7 14.3-32 32-32h80c17.7 0 32 14.3 32 32v96c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32v-96zm208-32h80c17.7 0 32 14.3 32 32v96c0 17.7-14.3 32-32 32h-80c-17.7 0-32-14.3-32-32v-96c0-17.7 14.3-32 32-32zM128 352c0 17.7-14.3 32-32 32s-32-14.3-32-32 14.3-32 32-32 32 14.3 32 32zm224 32c-17.7 0-32-14.3-32-32s14.3-32 32-32 32 14.3 32 32-14.3 32-32 32z"
+                        <svg
+                          aria-hidden="true"
+                          className="c3"
                           fill="currentColor"
-                        />
-                      </svg>
-                    </div>
-                    <div>
-                      Subway
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div
-                className="c8"
-              >
-                <input
-                  checked={true}
-                  id="id-query-param-ferry"
-                  onChange={[Function]}
-                  type="checkbox"
-                />
-                <label
-                  className="c9"
-                  htmlFor="id-query-param-ferry"
+                          focusable="false"
+                          viewBox="0 0 448 512"
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            d="M96 0C43 0 0 43 0 96v256c0 48 35.2 87.7 81.1 94.9l-46 46c-7 7-2 19.1 7.9 19.1h39.7c8.5 0 16.6-3.4 22.6-9.4L160 448h128l54.6 54.6c6 6 14.1 9.4 22.6 9.4H405c10 0 15-12.1 7.9-19.1l-46-46c46-7.1 81.1-46.9 81.1-94.9V96c0-53-43-96-96-96H96zM64 128c0-17.7 14.3-32 32-32h80c17.7 0 32 14.3 32 32v96c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32v-96zm208-32h80c17.7 0 32 14.3 32 32v96c0 17.7-14.3 32-32 32h-80c-17.7 0-32-14.3-32-32v-96c0-17.7 14.3-32 32-32zM128 352c0 17.7-14.3 32-32 32s-32-14.3-32-32 14.3-32 32-32 32 14.3 32 32zm224 32c-17.7 0-32-14.3-32-32s14.3-32 32-32 32 14.3 32 32-14.3 32-32 32z"
+                            fill="currentColor"
+                          />
+                        </svg>
+                      </div>
+                      <div>
+                        Subway
+                      </div>
+                    </span>
+                  </label>
+                </div>
+                <div
+                  className="c8"
                 >
-                  <span
-                    className="c10"
+                  <input
+                    checked={true}
+                    id="id-query-param-ferry"
+                    onChange={[Function]}
+                    type="checkbox"
+                  />
+                  <label
+                    className="c9"
+                    htmlFor="id-query-param-ferry"
                   >
-                    <div>
-                      Ferry
-                    </div>
-                  </span>
-                </label>
+                    <span
+                      className="c10"
+                    >
+                      <div>
+                        Ferry
+                      </div>
+                    </span>
+                  </label>
+                </div>
               </div>
-            </div>
-            <div
-              className="c11"
-              style={null}
-            >
-              <div>
-                <label
-                  className="c9"
-                  htmlFor="id-query-param-busColor"
-                >
-                  <span
-                    className="c10"
+              <div
+                className="c11"
+                style={null}
+              >
+                <div>
+                  <label
+                    className="c9"
+                    htmlFor="id-query-param-busColor"
                   >
-                    <div>
-                      Bus Color
-                    </div>
-                  </span>
-                </label>
-              </div>
-              <div>
-                <select
-                  id="id-query-param-busColor"
-                  onChange={[Function]}
-                  onTouchStart={[Function]}
-                  value="blue"
-                >
-                  <option
+                    <span
+                      className="c10"
+                    >
+                      <div>
+                        Bus Color
+                      </div>
+                    </span>
+                  </label>
+                </div>
+                <div>
+                  <select
+                    id="id-query-param-busColor"
+                    onChange={[Function]}
+                    onTouchStart={[Function]}
                     value="blue"
                   >
-                    Blue
-                  </option>
-                </select>
+                    <option
+                      value="blue"
+                    >
+                      Blue
+                    </option>
+                  </select>
+                </div>
               </div>
-            </div>
-          </fieldset>
+            </fieldset>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-  <div
-    className="c1 advanced-submode-container"
-  >
     <div
-      className="c12"
-      id="walk"
+      className="c1 advanced-submode-container"
     >
-      <input
-        aria-label="Walk"
-        checked={false}
-        id="metro-submode-selector-mode-walk"
-        onChange={[Function]}
-        type="checkbox"
-      />
-      <label
-        htmlFor="metro-submode-selector-mode-walk"
+      <div
+        className="c12 advanced-submode-mode-button"
+        id="walk"
       >
-        <svg
-          aria-hidden="true"
-          className="c3"
-          fill="currentColor"
-          focusable="false"
-          viewBox="0 0 320 512"
-          xmlns="http://www.w3.org/2000/svg"
+        <input
+          aria-label="Walk"
+          checked={false}
+          id="metro-submode-selector-mode-walk"
+          onChange={[Function]}
+          type="checkbox"
+        />
+        <label
+          htmlFor="metro-submode-selector-mode-walk"
         >
-          <path
-            d="M256 48c0 26.5-21.5 48-48 48s-48-21.5-48-48 21.5-48 48-48 48 21.5 48 48zM126.5 199.3c-1 .4-1.9.8-2.9 1.2l-8 3.5c-16.4 7.3-29 21.2-34.7 38.2l-2.6 7.8c-5.6 16.8-23.7 25.8-40.5 20.2S12 246.5 17.6 229.7l2.6-7.8c11.4-34.1 36.6-61.9 69.4-76.5l8-3.5c20.8-9.2 43.3-14 66.1-14 44.6 0 84.8 26.8 101.9 67.9l15.4 36.9 21.4 10.7c15.8 7.9 22.2 27.1 14.3 42.9s-27.1 22.2-42.9 14.3L247 287.3c-10.3-5.2-18.4-13.8-22.8-24.5l-9.6-23-19.3 65.5 49.5 54c5.4 5.9 9.2 13 11.2 20.8l23 92.1c4.3 17.1-6.1 34.5-23.3 38.8s-34.5-6.1-38.8-23.3l-22-88.1-70.7-77.1c-14.8-16.1-20.3-38.6-14.7-59.7l16.9-63.5zM68.7 398l25-62.4c2.1 3 4.5 5.8 7 8.6l40.7 44.4-14.5 36.2c-2.4 6-6 11.5-10.6 16.1l-61.7 61.7c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L68.7 398z"
+          <svg
+            aria-hidden="true"
+            className="c3"
             fill="currentColor"
-          />
-        </svg>
-        <span>
-          Walk
-        </span>
-      </label>
+            focusable="false"
+            viewBox="0 0 320 512"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M256 48c0 26.5-21.5 48-48 48s-48-21.5-48-48 21.5-48 48-48 48 21.5 48 48zM126.5 199.3c-1 .4-1.9.8-2.9 1.2l-8 3.5c-16.4 7.3-29 21.2-34.7 38.2l-2.6 7.8c-5.6 16.8-23.7 25.8-40.5 20.2S12 246.5 17.6 229.7l2.6-7.8c11.4-34.1 36.6-61.9 69.4-76.5l8-3.5c20.8-9.2 43.3-14 66.1-14 44.6 0 84.8 26.8 101.9 67.9l15.4 36.9 21.4 10.7c15.8 7.9 22.2 27.1 14.3 42.9s-27.1 22.2-42.9 14.3L247 287.3c-10.3-5.2-18.4-13.8-22.8-24.5l-9.6-23-19.3 65.5 49.5 54c5.4 5.9 9.2 13 11.2 20.8l23 92.1c4.3 17.1-6.1 34.5-23.3 38.8s-34.5-6.1-38.8-23.3l-22-88.1-70.7-77.1c-14.8-16.1-20.3-38.6-14.7-59.7l16.9-63.5zM68.7 398l25-62.4c2.1 3 4.5 5.8 7 8.6l40.7 44.4-14.5 36.2c-2.4 6-6 11.5-10.6 16.1l-61.7 61.7c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L68.7 398z"
+              fill="currentColor"
+            />
+          </svg>
+          <span>
+            Walk
+          </span>
+        </label>
+      </div>
     </div>
-  </div>
-  <div
-    className="c1 advanced-submode-container"
-  >
     <div
-      className="c12"
-      id="bicycle"
+      className="c1 advanced-submode-container"
     >
-      <input
-        aria-label="Bike"
-        checked={false}
-        id="metro-submode-selector-mode-bicycle"
-        onChange={[Function]}
-        type="checkbox"
-      />
-      <label
-        htmlFor="metro-submode-selector-mode-bicycle"
+      <div
+        className="c12 advanced-submode-mode-button"
+        id="bicycle"
       >
-        <svg
-          height="100%"
-          version="1.1"
-          viewBox="0 0 100 61.3"
-          width="100%"
-          xmlns="http://www.w3.org/2000/svg"
+        <input
+          aria-label="Bike"
+          checked={false}
+          id="metro-submode-selector-mode-bicycle"
+          onChange={[Function]}
+          type="checkbox"
+        />
+        <label
+          htmlFor="metro-submode-selector-mode-bicycle"
         >
-          <path
-            d="M0,41.6C0,52.3,8.7,61,19.4,61c9.4,0,17.2-6.7,19-15.5c0.1,0,0.1,0,0.2,0c15.3-0.6,4.6,4.2,33-25.7c0.5,1.5,0.9,2.9,1.4,4.3  c-6.9,3-11.8,9.8-11.8,17.9c0,10.7,8.7,19.4,19.4,19.4c10.7,0,19.4-8.7,19.4-19.4s-8.7-19.4-19.4-19.4c-1.2,0-2.4,0.1-3.6,0.3  C69.5-1.5,71.9,0.1,57.9,0v3.9c10.2,0,8.9-0.6,11.2,7.3H35.3L34,7.5c7.6-1.7,9.7-1.7,8.2-3.7H25.1v3.8l4.5,0.1l1.3,3.6  c-2.1,4.6-3.8,8.5-5.3,11.9c-2-0.7-4-1-6.2-1C8.7,22.2,0,30.9,0,41.6z M74.4,28.4c4.8,15.4,4.4,15.1,6.3,15.3c1.1-0.1,1.9-0.9,1.9-2  c0-1.3,0.5,0.4-4.2-14.5c0.7-0.1,1.4-0.2,2.2-0.2c8.2,0,14.9,6.7,14.9,14.9s-6.7,14.9-14.9,14.9s-14.9-6.7-14.9-14.9  C65.7,35.9,69.3,30.7,74.4,28.4z M37,15.3l33,0.1L46.6,41L37,15.3z M29.4,24.9l3.6-8.1l9.4,24.6l-3.6,0C38.8,34.5,35,28.3,29.4,24.9  z M34.3,41.5l-12.3,0l5.6-12.4C31.6,31.8,34.2,36.3,34.3,41.5z M4.5,41.6c0-8.2,6.7-14.9,14.9-14.9c1.5,0,3,0.2,4.3,0.6  c-6.7,14.9-7,15.4-7,16.2c0.2,2.7,1.6,1.9,17.1,1.9c-1.7,6.3-7.5,11-14.3,11C11.2,56.4,4.5,49.8,4.5,41.6z"
-          />
-        </svg>
-        <span>
-          Bike
-        </span>
-      </label>
+          <svg
+            height="100%"
+            version="1.1"
+            viewBox="0 0 100 61.3"
+            width="100%"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M0,41.6C0,52.3,8.7,61,19.4,61c9.4,0,17.2-6.7,19-15.5c0.1,0,0.1,0,0.2,0c15.3-0.6,4.6,4.2,33-25.7c0.5,1.5,0.9,2.9,1.4,4.3  c-6.9,3-11.8,9.8-11.8,17.9c0,10.7,8.7,19.4,19.4,19.4c10.7,0,19.4-8.7,19.4-19.4s-8.7-19.4-19.4-19.4c-1.2,0-2.4,0.1-3.6,0.3  C69.5-1.5,71.9,0.1,57.9,0v3.9c10.2,0,8.9-0.6,11.2,7.3H35.3L34,7.5c7.6-1.7,9.7-1.7,8.2-3.7H25.1v3.8l4.5,0.1l1.3,3.6  c-2.1,4.6-3.8,8.5-5.3,11.9c-2-0.7-4-1-6.2-1C8.7,22.2,0,30.9,0,41.6z M74.4,28.4c4.8,15.4,4.4,15.1,6.3,15.3c1.1-0.1,1.9-0.9,1.9-2  c0-1.3,0.5,0.4-4.2-14.5c0.7-0.1,1.4-0.2,2.2-0.2c8.2,0,14.9,6.7,14.9,14.9s-6.7,14.9-14.9,14.9s-14.9-6.7-14.9-14.9  C65.7,35.9,69.3,30.7,74.4,28.4z M37,15.3l33,0.1L46.6,41L37,15.3z M29.4,24.9l3.6-8.1l9.4,24.6l-3.6,0C38.8,34.5,35,28.3,29.4,24.9  z M34.3,41.5l-12.3,0l5.6-12.4C31.6,31.8,34.2,36.3,34.3,41.5z M4.5,41.6c0-8.2,6.7-14.9,14.9-14.9c1.5,0,3,0.2,4.3,0.6  c-6.7,14.9-7,15.4-7,16.2c0.2,2.7,1.6,1.9,17.1,1.9c-1.7,6.3-7.5,11-14.3,11C11.2,56.4,4.5,49.8,4.5,41.6z"
+            />
+          </svg>
+          <span>
+            Bike
+          </span>
+        </label>
+      </div>
     </div>
-  </div>
-  <div
-    className="c1 advanced-submode-container"
-  >
     <div
-      className="c12"
-      id="car"
+      className="c1 advanced-submode-container"
     >
-      <input
-        aria-label="Drive"
-        checked={false}
-        id="metro-submode-selector-mode-car"
-        onChange={[Function]}
-        type="checkbox"
-      />
-      <label
-        htmlFor="metro-submode-selector-mode-car"
+      <div
+        className="c12 advanced-submode-mode-button"
+        id="car"
       >
-        <svg
-          aria-hidden="true"
-          className="c3"
-          fill="currentColor"
-          focusable="false"
-          viewBox="0 0 512 512"
-          xmlns="http://www.w3.org/2000/svg"
+        <input
+          aria-label="Drive"
+          checked={false}
+          id="metro-submode-selector-mode-car"
+          onChange={[Function]}
+          type="checkbox"
+        />
+        <label
+          htmlFor="metro-submode-selector-mode-car"
         >
-          <path
-            d="M135.2 117.4 109.1 192h293.8l-26.1-74.6c-4.5-12.8-16.6-21.4-30.2-21.4H165.4c-13.6 0-25.7 8.6-30.2 21.4zm-95.6 79.4L74.8 96.3C88.3 57.8 124.6 32 165.4 32h181.2c40.8 0 77.1 25.8 90.6 64.3l35.2 100.5c23.2 9.6 39.6 32.5 39.6 59.2v192c0 17.7-14.3 32-32 32h-32c-17.7 0-32-14.3-32-32v-48H96v48c0 17.7-14.3 32-32 32H32c-17.7 0-32-14.3-32-32V256c0-26.7 16.4-49.6 39.6-59.2zM128 288c0-17.7-14.3-32-32-32s-32 14.3-32 32 14.3 32 32 32 32-14.3 32-32zm288 32c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32z"
+          <svg
+            aria-hidden="true"
+            className="c3"
             fill="currentColor"
-          />
-        </svg>
-        <span>
-          Car
-        </span>
-      </label>
+            focusable="false"
+            viewBox="0 0 512 512"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M135.2 117.4 109.1 192h293.8l-26.1-74.6c-4.5-12.8-16.6-21.4-30.2-21.4H165.4c-13.6 0-25.7 8.6-30.2 21.4zm-95.6 79.4L74.8 96.3C88.3 57.8 124.6 32 165.4 32h181.2c40.8 0 77.1 25.8 90.6 64.3l35.2 100.5c23.2 9.6 39.6 32.5 39.6 59.2v192c0 17.7-14.3 32-32 32h-32c-17.7 0-32-14.3-32-32v-48H96v48c0 17.7-14.3 32-32 32H32c-17.7 0-32-14.3-32-32V256c0-26.7 16.4-49.6 39.6-59.2zM128 288c0-17.7-14.3-32-32-32s-32 14.3-32 32 14.3 32 32 32 32-14.3 32-32zm288 32c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32z"
+              fill="currentColor"
+            />
+          </svg>
+          <span>
+            Car
+          </span>
+        </label>
+      </div>
     </div>
-  </div>
-</fieldset>
+  </fieldset>
+</div>
 `;
 
 exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector 1`] = `
@@ -269780,12 +269819,6 @@ exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector
 `;
 
 exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector 2`] = `
-.c2 {
-  display: inline-block;
-  vertical-align: middle;
-  overflow: hidden;
-}
-
 .c3 {
   display: inline-block;
   -webkit-clip: rect(0,0,0,0);
@@ -269925,6 +269958,12 @@ exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector
   color: #eee;
 }
 
+.c2 {
+  display: inline-block;
+  vertical-align: middle;
+  overflow: hidden;
+}
+
 <fieldset
   className="c0 metro-mode-selector"
 >
@@ -269943,13 +269982,6 @@ exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector
     />
     <label
       htmlFor="metro-mode-selector-mode-transit"
-      onClick={[Function]}
-      onKeyDown={[Function]}
-      onKeyUp={[Function]}
-      onMouseDown={[Function]}
-      onMouseMove={[Function]}
-      onPointerDown={[Function]}
-      onPointerEnter={[Function]}
       title="Transit"
     >
       <svg
@@ -269973,44 +270005,6 @@ exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector
         Transit
       </span>
     </label>
-    <button
-      aria-expanded="false"
-      aria-haspopup="dialog"
-      disabled={false}
-      onClick={[Function]}
-      onKeyDown={[Function]}
-      onKeyUp={[Function]}
-      onMouseDown={[Function]}
-      onMouseMove={[Function]}
-      onPointerDown={[Function]}
-      onPointerEnter={[Function]}
-      type="button"
-    >
-      <span
-        role="none"
-      >
-        <svg
-          aria-hidden="true"
-          className="c2"
-          fill="currentColor"
-          focusable="false"
-          height={14}
-          viewBox="0 0 320 512"
-          width={14}
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M137.4 374.6c12.5 12.5 32.8 12.5 45.3 0l128-128c9.2-9.2 11.9-22.9 6.9-34.9S301 191.9 288 191.9L32 192c-12.9 0-24.6 7.8-29.6 19.8s-2.2 25.7 6.9 34.9l128 128z"
-            fill="currentColor"
-          />
-        </svg>
-      </span>
-      <span
-        className="c3"
-      >
-        Transit settings
-      </span>
-    </button>
   </span>
   <span
     className="c1"
@@ -270024,13 +270018,6 @@ exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector
     />
     <label
       htmlFor="metro-mode-selector-mode-walk"
-      onClick={[Function]}
-      onKeyDown={[Function]}
-      onKeyUp={[Function]}
-      onMouseDown={[Function]}
-      onMouseMove={[Function]}
-      onPointerDown={[Function]}
-      onPointerEnter={[Function]}
       title="Walk"
     >
       <svg
@@ -270054,44 +270041,6 @@ exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector
         Walk
       </span>
     </label>
-    <button
-      aria-expanded="false"
-      aria-haspopup="dialog"
-      disabled={true}
-      onClick={[Function]}
-      onKeyDown={[Function]}
-      onKeyUp={[Function]}
-      onMouseDown={[Function]}
-      onMouseMove={[Function]}
-      onPointerDown={[Function]}
-      onPointerEnter={[Function]}
-      type="button"
-    >
-      <span
-        role="none"
-      >
-        <svg
-          aria-hidden="true"
-          className="c2"
-          fill="currentColor"
-          focusable="false"
-          height={14}
-          viewBox="0 0 320 512"
-          width={14}
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M137.4 374.6c12.5 12.5 32.8 12.5 45.3 0l128-128c9.2-9.2 11.9-22.9 6.9-34.9S301 191.9 288 191.9L32 192c-12.9 0-24.6 7.8-29.6 19.8s-2.2 25.7 6.9 34.9l128 128z"
-            fill="currentColor"
-          />
-        </svg>
-      </span>
-      <span
-        className="c3"
-      >
-        Walk settings
-      </span>
-    </button>
   </span>
   <span
     className="c1"
@@ -270105,13 +270054,6 @@ exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector
     />
     <label
       htmlFor="metro-mode-selector-mode-bicycle"
-      onClick={[Function]}
-      onKeyDown={[Function]}
-      onKeyUp={[Function]}
-      onMouseDown={[Function]}
-      onMouseMove={[Function]}
-      onPointerDown={[Function]}
-      onPointerEnter={[Function]}
       title="Bike"
     >
       <svg
@@ -270133,44 +270075,6 @@ exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector
         Bike
       </span>
     </label>
-    <button
-      aria-expanded="false"
-      aria-haspopup="dialog"
-      disabled={true}
-      onClick={[Function]}
-      onKeyDown={[Function]}
-      onKeyUp={[Function]}
-      onMouseDown={[Function]}
-      onMouseMove={[Function]}
-      onPointerDown={[Function]}
-      onPointerEnter={[Function]}
-      type="button"
-    >
-      <span
-        role="none"
-      >
-        <svg
-          aria-hidden="true"
-          className="c2"
-          fill="currentColor"
-          focusable="false"
-          height={14}
-          viewBox="0 0 320 512"
-          width={14}
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M137.4 374.6c12.5 12.5 32.8 12.5 45.3 0l128-128c9.2-9.2 11.9-22.9 6.9-34.9S301 191.9 288 191.9L32 192c-12.9 0-24.6 7.8-29.6 19.8s-2.2 25.7 6.9 34.9l128 128z"
-            fill="currentColor"
-          />
-        </svg>
-      </span>
-      <span
-        className="c3"
-      >
-        Bike settings
-      </span>
-    </button>
   </span>
   <span
     className="c1"
@@ -270184,13 +270088,6 @@ exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector
     />
     <label
       htmlFor="metro-mode-selector-mode-car"
-      onClick={[Function]}
-      onKeyDown={[Function]}
-      onKeyUp={[Function]}
-      onMouseDown={[Function]}
-      onMouseMove={[Function]}
-      onPointerDown={[Function]}
-      onPointerEnter={[Function]}
       title="Drive"
     >
       <svg
@@ -270214,44 +270111,6 @@ exports[`Storyshots Trip Form Components/Metro Mode Selector Metro Mode Selector
         Drive
       </span>
     </label>
-    <button
-      aria-expanded="false"
-      aria-haspopup="dialog"
-      disabled={true}
-      onClick={[Function]}
-      onKeyDown={[Function]}
-      onKeyUp={[Function]}
-      onMouseDown={[Function]}
-      onMouseMove={[Function]}
-      onPointerDown={[Function]}
-      onPointerEnter={[Function]}
-      type="button"
-    >
-      <span
-        role="none"
-      >
-        <svg
-          aria-hidden="true"
-          className="c2"
-          fill="currentColor"
-          focusable="false"
-          height={14}
-          viewBox="0 0 320 512"
-          width={14}
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M137.4 374.6c12.5 12.5 32.8 12.5 45.3 0l128-128c9.2-9.2 11.9-22.9 6.9-34.9S301 191.9 288 191.9L32 192c-12.9 0-24.6 7.8-29.6 19.8s-2.2 25.7 6.9 34.9l128 128z"
-            fill="currentColor"
-          />
-        </svg>
-      </span>
-      <span
-        className="c3"
-      >
-        Drive settings
-      </span>
-    </button>
   </span>
 </fieldset>
 `;
diff --git a/packages/base-map/package.json b/packages/base-map/package.json
index d8819d3a6..51029971a 100644
--- a/packages/base-map/package.json
+++ b/packages/base-map/package.json
@@ -12,10 +12,10 @@
     "mapbox-gl": "npm:empty-npm-package@1.0.0",
     "maplibre-gl": "^2.1.9",
     "react-map-gl": "^7.0.15",
-    "@opentripplanner/map-popup": "^3.1.0"
+    "@opentripplanner/map-popup": "^3.1.1"
   },
   "peerDependencies": {
-    "@opentripplanner/types": "^6.5.0",
+    "@opentripplanner/types": "^6.5.1",
     "react": "^16.14.0",
     "styled-components": "^5.3.0"
   },
diff --git a/packages/building-blocks/package.json b/packages/building-blocks/package.json
index ba6dbb76c..045b14eb6 100644
--- a/packages/building-blocks/package.json
+++ b/packages/building-blocks/package.json
@@ -9,8 +9,8 @@
   "module": "esm/index.js",
   "private": false,
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0",
-    "@opentripplanner/core-utils": "^11.4.0"
+    "@opentripplanner/types": "^6.5.1",
+    "@opentripplanner/core-utils": "^11.4.2"
   },
   "peerDependencies": {
     "react": "^16.14.0",
diff --git a/packages/core-utils/package.json b/packages/core-utils/package.json
index 0ea1e7375..31749d8a4 100644
--- a/packages/core-utils/package.json
+++ b/packages/core-utils/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@conveyal/lonlat": "^1.4.1",
     "@mapbox/polyline": "^1.1.0",
-    "@opentripplanner/geocoder": "^3.0.0",
+    "@opentripplanner/geocoder": "^3.0.1",
     "@styled-icons/foundation": "^10.34.0",
     "@turf/along": "^6.0.1",
     "chroma-js": "^2.4.2",
@@ -30,7 +30,7 @@
     "tsc": "tsc"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0",
+    "@opentripplanner/types": "^6.5.1",
     "@types/chroma-js": "^2.1.4"
   }
 }
diff --git a/packages/endpoints-overlay/package.json b/packages/endpoints-overlay/package.json
index 0a4b75a03..fe34e4b9c 100644
--- a/packages/endpoints-overlay/package.json
+++ b/packages/endpoints-overlay/package.json
@@ -19,15 +19,15 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.1.0",
+    "@opentripplanner/base-map": "^3.2.0",
     "@opentripplanner/location-icon": "^1.4.1",
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/core-utils": "^11.4.2",
     "flat": "^5.0.2",
     "@styled-icons/fa-solid": "^10.34.0",
-    "@opentripplanner/map-popup": "^3.1.0"
+    "@opentripplanner/map-popup": "^3.1.1"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0",
+    "@opentripplanner/types": "^6.5.1",
     "@types/flat": "^5.0.2"
   },
   "peerDependencies": {
diff --git a/packages/from-to-location-picker/package.json b/packages/from-to-location-picker/package.json
index 360bec62a..9441e2539 100644
--- a/packages/from-to-location-picker/package.json
+++ b/packages/from-to-location-picker/package.json
@@ -13,7 +13,7 @@
     "flat": "^5.0.2"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0"
+    "@opentripplanner/types": "^6.5.1"
   },
   "peerDependencies": {
     "react": "^16.14.0",
diff --git a/packages/icons/package.json b/packages/icons/package.json
index a5fcc894e..e1bdccc69 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -10,7 +10,7 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/core-utils": "^11.4.2",
     "prop-types": "^15.7.2"
   },
   "peerDependencies": {
diff --git a/packages/itinerary-body/package.json b/packages/itinerary-body/package.json
index 2ffe85659..20bef12c6 100644
--- a/packages/itinerary-body/package.json
+++ b/packages/itinerary-body/package.json
@@ -10,7 +10,7 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/core-utils": "^11.4.2",
     "@opentripplanner/humanize-distance": "^1.2.0",
     "@opentripplanner/icons": "^2.0.10",
     "@opentripplanner/location-icon": "^1.4.1",
@@ -24,7 +24,7 @@
     "string-similarity": "^4.0.4"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0",
+    "@opentripplanner/types": "^6.5.1",
     "@types/flat": "^5.0.2"
   },
   "peerDependencies": {
diff --git a/packages/location-field/package.json b/packages/location-field/package.json
index 7a91f7d07..5ca2ff1ef 100644
--- a/packages/location-field/package.json
+++ b/packages/location-field/package.json
@@ -10,8 +10,8 @@
   "private": false,
   "dependencies": {
     "@conveyal/geocoder-arcgis-geojson": "^0.0.3",
-    "@opentripplanner/core-utils": "^11.4.0",
-    "@opentripplanner/geocoder": "^3.0.0",
+    "@opentripplanner/core-utils": "^11.4.2",
+    "@opentripplanner/geocoder": "^3.0.1",
     "@opentripplanner/humanize-distance": "^1.2.0",
     "@opentripplanner/location-icon": "^1.4.1",
     "@styled-icons/fa-solid": "^10.34.0",
diff --git a/packages/map-popup/package.json b/packages/map-popup/package.json
index bd1f12a04..c9938a491 100644
--- a/packages/map-popup/package.json
+++ b/packages/map-popup/package.json
@@ -11,12 +11,12 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/core-utils": "^11.4.2",
     "@opentripplanner/from-to-location-picker": "^2.1.12",
     "flat": "^5.0.2"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0"
+    "@opentripplanner/types": "^6.5.1"
   },
   "peerDependencies": {
     "react": "^16.14.0",
diff --git a/packages/otp2-tile-overlay/package.json b/packages/otp2-tile-overlay/package.json
index 3ac5faf5e..b24061f1c 100644
--- a/packages/otp2-tile-overlay/package.json
+++ b/packages/otp2-tile-overlay/package.json
@@ -16,10 +16,10 @@
     "react-map-gl": "^7.0.15"
   },
   "dependencies": {
-    "@opentripplanner/map-popup": "^3.1.0"
+    "@opentripplanner/map-popup": "^3.1.1"
   },
   "devDependencies": {
-    "@opentripplanner/base-map": "^3.1.0",
-    "@opentripplanner/types": "^6.5.0"
+    "@opentripplanner/base-map": "^3.2.0",
+    "@opentripplanner/types": "^6.5.1"
   }
 }
diff --git a/packages/park-and-ride-overlay/package.json b/packages/park-and-ride-overlay/package.json
index 4a95a3e37..c431ee964 100644
--- a/packages/park-and-ride-overlay/package.json
+++ b/packages/park-and-ride-overlay/package.json
@@ -19,7 +19,7 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.1.0",
+    "@opentripplanner/base-map": "^3.2.0",
     "@opentripplanner/from-to-location-picker": "^2.1.12"
   },
   "peerDependencies": {
diff --git a/packages/printable-itinerary/package.json b/packages/printable-itinerary/package.json
index 1ef8e96e6..27d280df0 100644
--- a/packages/printable-itinerary/package.json
+++ b/packages/printable-itinerary/package.json
@@ -10,7 +10,7 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/core-utils": "^11.4.2",
     "@opentripplanner/itinerary-body": "^5.3.0"
   },
   "devDependencies": {
diff --git a/packages/route-viewer-overlay/package.json b/packages/route-viewer-overlay/package.json
index 27ee1e920..c61083114 100644
--- a/packages/route-viewer-overlay/package.json
+++ b/packages/route-viewer-overlay/package.json
@@ -20,12 +20,12 @@
   },
   "dependencies": {
     "@mapbox/polyline": "^1.1.0",
-    "@opentripplanner/base-map": "^3.1.0",
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/base-map": "^3.2.0",
+    "@opentripplanner/core-utils": "^11.4.2",
     "point-in-polygon": "^1.1.0"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0",
+    "@opentripplanner/types": "^6.5.1",
     "point-in-polygon": "^1.1.0"
   },
   "peerDependencies": {
diff --git a/packages/stop-viewer-overlay/package.json b/packages/stop-viewer-overlay/package.json
index 111b5e572..183f02b70 100644
--- a/packages/stop-viewer-overlay/package.json
+++ b/packages/stop-viewer-overlay/package.json
@@ -19,11 +19,11 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.1.0",
-    "@opentripplanner/core-utils": "^11.4.0"
+    "@opentripplanner/base-map": "^3.2.0",
+    "@opentripplanner/core-utils": "^11.4.2"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0"
+    "@opentripplanner/types": "^6.5.1"
   },
   "peerDependencies": {
     "react": "^16.14.0",
diff --git a/packages/stops-overlay/package.json b/packages/stops-overlay/package.json
index 66181a216..6ef66ff0b 100644
--- a/packages/stops-overlay/package.json
+++ b/packages/stops-overlay/package.json
@@ -19,13 +19,13 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.1.0",
+    "@opentripplanner/base-map": "^3.2.0",
     "@opentripplanner/from-to-location-picker": "^2.1.12",
-    "@opentripplanner/map-popup": "^3.1.0",
+    "@opentripplanner/map-popup": "^3.1.1",
     "flat": "^5.0.2"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0",
+    "@opentripplanner/types": "^6.5.1",
     "styled-icons": "^10.34.0"
   },
   "peerDependencies": {
diff --git a/packages/transit-vehicle-overlay/package.json b/packages/transit-vehicle-overlay/package.json
index 89a55b24e..1acfd516e 100644
--- a/packages/transit-vehicle-overlay/package.json
+++ b/packages/transit-vehicle-overlay/package.json
@@ -9,13 +9,13 @@
   "module": "esm/index.js",
   "private": false,
   "dependencies": {
-    "@opentripplanner/base-map": "^3.1.0",
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/base-map": "^3.2.0",
+    "@opentripplanner/core-utils": "^11.4.2",
     "@opentripplanner/icons": "^2.0.10",
     "flat": "^5.0.2"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0"
+    "@opentripplanner/types": "^6.5.1"
   },
   "peerDependencies": {
     "react": "^16.14.0",
diff --git a/packages/transitive-overlay/package.json b/packages/transitive-overlay/package.json
index 481c07455..aa7e4be7a 100644
--- a/packages/transitive-overlay/package.json
+++ b/packages/transitive-overlay/package.json
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@mapbox/polyline": "^1.1.1",
-    "@opentripplanner/base-map": "^3.1.0",
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/base-map": "^3.2.0",
+    "@opentripplanner/core-utils": "^11.4.2",
     "@opentripplanner/itinerary-body": "^5.3.0",
     "@turf/bbox": "^6.5.0",
     "@turf/bearing": "^6.5.0",
@@ -32,8 +32,8 @@
     "lodash.isequal": "^4.5.0"
   },
   "devDependencies": {
-    "@opentripplanner/endpoints-overlay": "^2.0.12",
-    "@opentripplanner/types": "^6.5.0"
+    "@opentripplanner/endpoints-overlay": "^2.1.0",
+    "@opentripplanner/types": "^6.5.1"
   },
   "peerDependencies": {
     "react": "^16.14.0",
diff --git a/packages/trip-details/package.json b/packages/trip-details/package.json
index da2c4a6af..87a6d64d4 100644
--- a/packages/trip-details/package.json
+++ b/packages/trip-details/package.json
@@ -11,13 +11,13 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/core-utils": "^11.4.2",
     "@styled-icons/fa-solid": "^10.34.0",
     "flat": "^5.0.2",
     "react-animate-height": "^3.0.4"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0",
+    "@opentripplanner/types": "^6.5.1",
     "@types/flat": "^5.0.2"
   },
   "peerDependencies": {
diff --git a/packages/trip-form/i18n/en-US.yml b/packages/trip-form/i18n/en-US.yml
index 3cf235912..fc542ad3d 100644
--- a/packages/trip-form/i18n/en-US.yml
+++ b/packages/trip-form/i18n/en-US.yml
@@ -30,10 +30,6 @@ otpUi:
       walkTolerance-labelHigh: More Walking
       walkTolerance-labelLow: Less Walking
       wheelchair-label: Accessible Routing
-    settingsLabel: "{mode} settings"
-  TripOptions:
-    transitOnly: Go by Transit
-    openApp: Open app
   SettingsSelectorPanel:
     bikeOnly: Bike Only
     escooterOnly: E-scooter Only
@@ -42,6 +38,9 @@ otpUi:
     use: Use
     useCompanies: Use companies
     walkOnly: Walk Only
+  TripOptions:
+    openApp: Open app
+    transitOnly: Go by Transit
   queryParameters:
     bikeSpeed: Bicycle Speed
     distanceInMiles: |
diff --git a/packages/trip-form/i18n/fr.yml b/packages/trip-form/i18n/fr.yml
index 2fcf44212..0482f8e26 100644
--- a/packages/trip-form/i18n/fr.yml
+++ b/packages/trip-form/i18n/fr.yml
@@ -30,7 +30,6 @@ otpUi:
       walkTolerance-labelHigh: Plus de marche
       walkTolerance-labelLow: Moins de marche
       wheelchair-label: Accès avec mobilité réduite
-    settingsLabel: "Paramètres pour : {mode}"
   SettingsSelectorPanel:
     bikeOnly: Vélo uniquement
     escooterOnly: Trottinette uniquement
@@ -40,8 +39,8 @@ otpUi:
     useCompanies: Prestataires
     walkOnly: À pied uniquement
   TripOptions:
-    transitOnly: En transports publics
     openApp: Ouvrir l'application
+    transitOnly: En transports publics
   queryParameters:
     bikeSpeed: Vitesse à vélo
     distanceInMiles: "{miles, number, :: unit/mile unit-width-full-name}"
diff --git a/packages/trip-form/package.json b/packages/trip-form/package.json
index 249419fbd..e1d36b6ac 100644
--- a/packages/trip-form/package.json
+++ b/packages/trip-form/package.json
@@ -10,8 +10,7 @@
   "types": "lib/index.d.ts",
   "private": false,
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.0",
-    "@floating-ui/react": "^0.19.2",
+    "@opentripplanner/core-utils": "^11.4.2",
     "@opentripplanner/building-blocks": "^1.0.3",
     "@styled-icons/bootstrap": "^10.34.0",
     "@styled-icons/boxicons-regular": "^10.38.0",
@@ -24,8 +23,9 @@
     "react-inlinesvg": "^2.3.0"
   },
   "devDependencies": {
-    "@opentripplanner/types": "6.5.0",
-    "@types/flat": "^5.0.2"
+    "@types/flat": "^5.0.2",
+    "@opentripplanner/types": "6.5.1"
+
   },
   "peerDependencies": {
     "react": "^16.14.0",
diff --git a/packages/trip-form/src/MetroModeSelector/index.tsx b/packages/trip-form/src/MetroModeSelector/index.tsx
index b21fc14f8..58fefaab9 100644
--- a/packages/trip-form/src/MetroModeSelector/index.tsx
+++ b/packages/trip-form/src/MetroModeSelector/index.tsx
@@ -1,24 +1,8 @@
-import {
-  arrow,
-  FloatingFocusManager,
-  offset,
-  safePolygon,
-  shift,
-  useClick,
-  useDismiss,
-  useFloating,
-  useHover,
-  useInteractions,
-  useRole
-} from "@floating-ui/react";
 import { ModeButtonDefinition } from "@opentripplanner/types";
-import { CaretDown } from "@styled-icons/fa-solid/CaretDown";
-import { CaretUp } from "@styled-icons/fa-solid/CaretUp";
-import React, { ReactElement, useCallback, useRef, useState } from "react";
-import { FormattedMessage, useIntl } from "react-intl";
+import React, { ReactElement, useCallback } from "react";
+import { useIntl } from "react-intl";
 import styled, { css } from "styled-components";
 
-import SubSettingsPane, { defaultMessages } from "./SubSettingsPane";
 import generateModeButtonLabel from "./i18n";
 
 export const invisibleCss = css`
@@ -151,34 +135,6 @@ const ModeButtonWrapper = styled.span<{
   }
 `;
 
-const HoverPanel = styled.div`
-  min-width: 300px;
-  padding: 0 10px;
-  width: 75%;
-  z-index: 100;
-`;
-
-const HoverInnerContainer = styled.div`
-  background: #fff;
-  border-radius: 4px;
-  color: #2e2e2e;
-  font-size: 90%;
-  font-weight: bold;
-  padding: 0px 20px 10px;
-  pointer-events: none;
-  ${boxShadowCss}
-`;
-
-const Arrow = styled.div`
-  background: #fff;
-  height: 10px;
-  margin-top: -5px;
-  position: absolute;
-  transform: rotate(-45deg);
-  width: 10px;
-  ${boxShadowCss}
-`;
-
 interface ModeButtonProps {
   // Optional properties for styling
   accentColor?: string;
@@ -186,10 +142,7 @@ interface ModeButtonProps {
 
   fillModeIcons?: boolean;
   id: string;
-  itemWithKeyboard?: string;
   modeButton: ModeButtonDefinition;
-  onPopupClose: () => void;
-  onPopupKeyboardExpand: (id: string) => void;
   onSettingsUpdate: (QueryParamChangeEvent) => void;
   onToggle: () => void;
 }
@@ -199,85 +152,13 @@ function ModeButton({
   activeHoverColor,
   fillModeIcons,
   id,
-  itemWithKeyboard,
   modeButton,
-  onPopupClose,
-  onPopupKeyboardExpand,
-  onSettingsUpdate,
   onToggle
 }: ModeButtonProps) {
   const intl = useIntl();
 
-  const [open, setOpen] = useState(false);
-  const [hoverEnabled, setHoverEnabled] = useState(true);
-  const arrowRef = useRef(null);
-  const onOpenChange = useCallback(
-    value => {
-      setOpen(value);
-      if (!value && typeof onPopupClose === "function") {
-        onPopupClose();
-      }
-    },
-    [onPopupClose, setOpen]
-  );
-  const {
-    context,
-    floating,
-    middlewareData: { arrow: { x: arrowX, y: arrowY } = {} },
-    reference,
-    strategy,
-    x,
-    y
-  } = useFloating({
-    middleware: [offset(8), shift(), arrow({ element: arrowRef })],
-    onOpenChange,
-    open
-  });
-
-  const { getFloatingProps, getReferenceProps } = useInteractions([
-    useHover(context, {
-      // Enable hover only if no popup has been triggered via keyboard.
-      // (This is to avoid focus being stolen by hovering out of another button.)
-      enabled: itemWithKeyboard === null && hoverEnabled,
-      handleClose: safePolygon({
-        blockPointerEvents: false,
-        restMs: 500,
-        buffer: 0
-      })
-    }),
-    useClick(context),
-    useRole(context),
-    useDismiss(context)
-  ]);
-
-  const renderDropdown =
-    open && modeButton.enabled && modeButton.modeSettings?.length > 0;
-  const interactionProps = getReferenceProps();
-
-  // ARIA roles are added by the `useRole` hook.
-  // Remove the aria-controls, aria-expanded, and aria-haspopup props from the label, they will
-  // instead be passed to the button for keyboard/screen reader users to trigger the popup.
-  const {
-    "aria-controls": ariaControls,
-    "aria-expanded": ariaExpanded,
-    "aria-haspopup": ariaHasPopup,
-    ...labelInteractionProps
-  } = interactionProps;
-
   const checkboxId = `metro-mode-selector-mode-${id}`;
 
-  const handleButtonClick = useCallback(
-    e => {
-      if (typeof onPopupKeyboardExpand === "function") {
-        onPopupKeyboardExpand(id);
-      }
-      if (typeof interactionProps.onClick === "function") {
-        interactionProps.onClick(e);
-      }
-    },
-    [id, interactionProps, onPopupKeyboardExpand]
-  );
-
   const label = generateModeButtonLabel(modeButton.key, intl, modeButton.label);
 
   return (
@@ -299,79 +180,13 @@ function ModeButton({
       <label
         // This library relies on prop spreading
         // eslint-disable-next-line react/jsx-props-no-spreading
-        {...labelInteractionProps}
         htmlFor={checkboxId}
         // This will trigger mouse effects such as showing popup on hover of on check.
-        ref={reference}
         title={label}
       >
         <modeButton.Icon aria-hidden size={32} />
         <InvisibleA11yLabel>{label}</InvisibleA11yLabel>
       </label>
-      <button
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...interactionProps}
-        // Disable button if mode is not checked (but keep in DOM for screen reader awareness)
-        disabled={!modeButton.enabled}
-        // Separate handler to communicate to the parent element
-        // which item had a popup triggered using the keyboard.
-        onClick={handleButtonClick}
-        // Required by linter settings
-        type="button"
-      >
-        <span role="none">
-          {open ? <CaretUp size={14} /> : <CaretDown size={14} />}
-        </span>
-        <InvisibleA11yLabel>
-          <FormattedMessage
-            defaultMessage={defaultMessages["otpUi.ModeSelector.settingsLabel"]}
-            description="Label for the button to open settings for a travel mode."
-            id="otpUi.ModeSelector.settingsLabel"
-            values={{ mode: label }}
-          />
-        </InvisibleA11yLabel>
-      </button>
-      {renderDropdown && (
-        <FloatingFocusManager
-          context={context}
-          // Restore the keyboard focus AND show focus cue on hovering out of the label
-          // only if this component triggered the popup using the keyboard.
-          // (Don't show focus cue if the popup was not triggered via keyboard.)
-          returnFocus={itemWithKeyboard === id}
-        >
-          <HoverPanel
-            // This library relies on prop spreading
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...getFloatingProps()}
-            // Matches ID on Header element in SubSettingsPane
-            aria-labelledby={`metro-mode-selector-${modeButton.key}-button-label`}
-            // This is a workaround for a bug in Firefox.
-            // https://github.com/floating-ui/floating-ui/issues/2299
-            // https://bugzilla.mozilla.org/show_bug.cgi?id=1829500
-            onPointerDown={() => {
-              setHoverEnabled(false);
-              setTimeout(() => setHoverEnabled(true), 100);
-            }}
-            ref={floating}
-            style={{
-              left: x ?? 0,
-              position: strategy,
-              top: y ?? 0
-            }}
-          >
-            <Arrow
-              ref={arrowRef}
-              style={{ top: arrowY ?? 0, left: arrowX ?? 0 }}
-            />
-            <HoverInnerContainer>
-              <SubSettingsPane
-                modeButton={modeButton}
-                onSettingUpdate={onSettingsUpdate}
-              />
-            </HoverInnerContainer>
-          </HoverPanel>
-        </FloatingFocusManager>
-      )}
     </ModeButtonWrapper>
   );
 }
@@ -417,10 +232,6 @@ export default function ModeSelector({
   onSettingsUpdate,
   onToggleModeButton
 }: Props): ReactElement {
-  // State that holds the id of the active mode combination popup that was triggered via keyboard.
-  // It is used to enable/disable hover effects to avoid keyboard focus being stolen
-  // and overlapping popups on mouse hover.
-  const [itemWithKeyboard, setItemWithKeyboard] = useState<string>(null);
   return (
     <ModeBar className="metro-mode-selector">
       <legend>{label}</legend>
@@ -430,13 +241,8 @@ export default function ModeSelector({
           activeHoverColor={activeHoverColor}
           fillModeIcons={fillModeIcons}
           id={button.key}
-          itemWithKeyboard={itemWithKeyboard}
           key={button.label}
           modeButton={button}
-          onPopupClose={useCallback(() => {
-            setItemWithKeyboard(null);
-          }, [setItemWithKeyboard])}
-          onPopupKeyboardExpand={setItemWithKeyboard}
           onSettingsUpdate={onSettingsUpdate}
           onToggle={useCallback(() => {
             onToggleModeButton(button.key, !button.enabled);
diff --git a/packages/trip-viewer-overlay/package.json b/packages/trip-viewer-overlay/package.json
index ef0187c4d..fcbfa78fc 100644
--- a/packages/trip-viewer-overlay/package.json
+++ b/packages/trip-viewer-overlay/package.json
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@mapbox/polyline": "^1.1.0",
-    "@opentripplanner/base-map": "^3.1.0",
-    "@opentripplanner/core-utils": "^11.4.0"
+    "@opentripplanner/base-map": "^3.2.0",
+    "@opentripplanner/core-utils": "^11.4.2"
   },
   "peerDependencies": {
     "react": "^16.14.0",
diff --git a/packages/vehicle-rental-overlay/package.json b/packages/vehicle-rental-overlay/package.json
index 497edb42c..fec01d9a6 100644
--- a/packages/vehicle-rental-overlay/package.json
+++ b/packages/vehicle-rental-overlay/package.json
@@ -19,16 +19,16 @@
     "url": "git+https://github.com/opentripplanner/otp-ui.git"
   },
   "dependencies": {
-    "@opentripplanner/base-map": "^3.1.0",
-    "@opentripplanner/core-utils": "^11.4.0",
+    "@opentripplanner/base-map": "^3.2.0",
+    "@opentripplanner/core-utils": "^11.4.2",
     "@opentripplanner/from-to-location-picker": "^2.1.12",
-    "@opentripplanner/map-popup": "^3.1.0",
+    "@opentripplanner/map-popup": "^3.1.1",
     "@styled-icons/fa-solid": "^10.34.0",
     "flat": "^5.0.2",
     "lodash.memoize": "^4.1.2"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0"
+    "@opentripplanner/types": "^6.5.1"
   },
   "peerDependencies": {
     "react": "^16.14.0",
diff --git a/packages/zoom-based-markers/package.json b/packages/zoom-based-markers/package.json
index 501442d70..8a91239bf 100644
--- a/packages/zoom-based-markers/package.json
+++ b/packages/zoom-based-markers/package.json
@@ -19,11 +19,11 @@
     "url": "https://github.com/opentripplanner/otp-ui/issues"
   },
   "dependencies": {
-    "@opentripplanner/core-utils": "^11.4.0",
-    "@opentripplanner/base-map": "^3.1.0"
+    "@opentripplanner/core-utils": "^11.4.2",
+    "@opentripplanner/base-map": "^3.2.0"
   },
   "devDependencies": {
-    "@opentripplanner/types": "^6.5.0"
+    "@opentripplanner/types": "^6.5.1"
   },
   "peerDependencies": {
     "react": "^16.14.0",
diff --git a/yarn.lock b/yarn.lock
index dbe0c1bd6..d88d923bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1474,34 +1474,6 @@
     unique-filename "^1.1.1"
     which "^1.3.1"
 
-"@floating-ui/core@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.2.2.tgz#66f62cf1b7de2ed23a09c101808536e68caffaec"
-  integrity sha512-FaO9KVLFnxknZaGWGmNtjD2CVFuc0u4yeGEofoyXO2wgRA7fLtkngT6UB0vtWQWuhH3iMTZZ/Y89CMeyGfn8pA==
-
-"@floating-ui/dom@^1.2.1":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.2.3.tgz#8dc6fbf799fbb5c29f705b54bdd51f3ab0ee03a2"
-  integrity sha512-lK9cZUrHSJLMVAdCvDqs6Ug8gr0wmqksYiaoj/bxj2gweRQkSuhg2/V6Jswz2KiQ0RAULbqw1oQDJIMpQ5GfGA==
-  dependencies:
-    "@floating-ui/core" "^1.2.2"
-
-"@floating-ui/react-dom@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-1.3.0.tgz#4d35d416eb19811c2b0e9271100a6aa18c1579b3"
-  integrity sha512-htwHm67Ji5E/pROEAr7f8IKFShuiCKHwUC/UY4vC3I5jiSvGFAYnSYiZO5MlGmads+QqvUkR9ANHEguGrDv72g==
-  dependencies:
-    "@floating-ui/dom" "^1.2.1"
-
-"@floating-ui/react@^0.19.2":
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/@floating-ui/react/-/react-0.19.2.tgz#c6e4d2097ed0dca665a7c042ddf9cdecc95e9412"
-  integrity sha512-JyNk4A0Ezirq8FlXECvRtQOX/iBe5Ize0W/pLkrZjfHW9GUV7Xnq6zm6fyZuQzaHHqEnVizmvlA96e1/CkZv+w==
-  dependencies:
-    "@floating-ui/react-dom" "^1.3.0"
-    aria-hidden "^1.1.3"
-    tabbable "^6.0.1"
-
 "@formatjs/cli@^4.2.32", "@formatjs/cli@^4.2.33":
   version "4.8.4"
   resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-4.8.4.tgz#c4f4e589b8c77c950b659948dbf0e877a4d910fd"
@@ -3246,11 +3218,6 @@
   resolved "https://registry.yarnpkg.com/@open-draft/until/-/until-1.0.3.tgz#db9cc719191a62e7d9200f6e7bab21c5b848adca"
   integrity sha512-Aq58f5HiWdyDlFffbbSjAlv596h/cOnt2DO1w3DOC7OJ5EHs0hd/nycJfiu9RJbT6Yk6F1knnRRXNSpxoIVZ9Q==
 
-"@opentripplanner/types@6.5.0":
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.5.0.tgz#d8cca355bf30f0984283faa793113ad6c0dba38d"
-  integrity sha512-FllEyE+1WQ2GOSKXQOuzrk+OPcJEqr4+zacsHQLB9WVyfm5D/BPHR1/OjfuVngrwLTK5bKP8VlDRS1ba/R8rtg==
-
 "@peculiar/asn1-schema@^2.1.6", "@peculiar/asn1-schema@^2.3.0":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.3.tgz#21418e1f3819e0b353ceff0c2dad8ccb61acd777"
@@ -5959,13 +5926,6 @@ argv-formatter@~1.0.0:
   resolved "https://registry.yarnpkg.com/argv-formatter/-/argv-formatter-1.0.0.tgz#a0ca0cbc29a5b73e836eebe1cbf6c5e0e4eb82f9"
   integrity sha1-oMoMvCmltz6Dbuvhy/bF4OTrgvk=
 
-aria-hidden@^1.1.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.3.tgz#14aeb7fb692bbb72d69bebfa47279c1fd725e954"
-  integrity sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==
-  dependencies:
-    tslib "^2.0.0"
-
 aria-query@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
@@ -18002,11 +17962,6 @@ synchronous-promise@^2.0.15, synchronous-promise@^2.0.6:
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.15.tgz#07ca1822b9de0001f5ff73595f3d08c4f720eb8e"
   integrity sha512-k8uzYIkIVwmT+TcglpdN50pS2y1BDcUnBPK9iJeGu0Pl1lOI8pD6wtzgw91Pjpe+RxtTncw32tLxs/R0yNL2Mg==
 
-tabbable@^6.0.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.1.1.tgz#40cfead5ed11be49043f04436ef924c8890186a0"
-  integrity sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg==
-
 table@^5.2.3:
   version "5.4.6"
   resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"