diff --git a/package.json b/package.json
index a1561e7..1d45827 100644
--- a/package.json
+++ b/package.json
@@ -47,8 +47,8 @@
     "@patternfly/react-core": "5.0.0-alpha.115",
     "@patternfly/react-styles": "5.0.0-alpha.16",
     "@patternfly/react-icons": "5.0.0-alpha.19",
-    "@patternfly/react-tokens": "5.0.0-alpha.9",
-    "@patternfly/react-table": "5.0.0-alpha.74",
+    "@patternfly/react-table": "^5.0.0-alpha.118",
+    "@patternfly/react-tokens": "^5.0.0-alpha.14",
     "buffer": "^6.0.3",
     "comment-json": "^4.2.3",
     "date-fns": "^2.29.3",
diff --git a/src/config.jsx b/src/config.jsx
index d866a47..078aa07 100644
--- a/src/config.jsx
+++ b/src/config.jsx
@@ -208,14 +208,14 @@ class GeneralConfig extends React.Component {
                                 <TextInput
                                     id="shell"
                                     value={this.state.shell}
-                                    onChange={(_event, value) => this.handleInputChange("shell", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("shell", value)}
                                 />
                             </FormGroup>
                             <FormGroup label={_("Notice")}>
                                 <TextInput
                                     id="notice"
                                     value={this.state.notice}
-                                    onChange={(_event, value) => this.handleInputChange("notice", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("notice", value)}
                                 />
                             </FormGroup>
                             <FormGroup label={_("Latency")}>
@@ -224,7 +224,7 @@ class GeneralConfig extends React.Component {
                                     type="number"
                                     step="1"
                                     value={this.state.latency}
-                                    onChange={(_event, value) => this.handleInputChange("latency", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("latency", value)}
                                 />
                             </FormGroup>
                             <FormGroup label={_("Payload Size, bytes")}>
@@ -233,7 +233,7 @@ class GeneralConfig extends React.Component {
                                     type="number"
                                     step="1"
                                     value={this.state.payload}
-                                    onChange={(_event, value) => this.handleInputChange("payload", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("payload", value)}
                                 />
                             </FormGroup>
                             <FormGroup label={_("Logging")}>
@@ -262,7 +262,7 @@ class GeneralConfig extends React.Component {
                                     type="number"
                                     step="1"
                                     value={this.state.limit_rate}
-                                    onChange={(_event, value) => this.handleInputChange("limit_rate", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("limit_rate", value)}
                                 />
                             </FormGroup>
                             <FormGroup label={_("Burst, bytes")}>
@@ -271,14 +271,14 @@ class GeneralConfig extends React.Component {
                                     type="number"
                                     step="1"
                                     value={this.state.limit_burst}
-                                    onChange={(_event, value) => this.handleInputChange("limit_burst", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("limit_burst", value)}
                                 />
                             </FormGroup>
                             <FormGroup label={_("Logging Limit Action")}>
                                 <FormSelect
                                     id="limit_action"
                                     value={this.state.limit_action}
-                                    onChange={(_event, value) => this.handleInputChange("limit_action", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("limit_action", value)}
                                 >
                                     {[
                                         { value: "", label: "" },
@@ -298,14 +298,14 @@ class GeneralConfig extends React.Component {
                                 <TextInput
                                     id="file_path"
                                     value={this.state.file_path}
-                                    onChange={(_event, value) => this.handleInputChange("file_path", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("file_path", value)}
                                 />
                             </FormGroup>
                             <FormGroup label={_("Syslog Facility")}>
                                 <TextInput
                                     id="syslog_facility"
                                     value={this.state.syslog_facility}
-                                    onChange={(_event, value) => this.handleInputChange("syslog_facility", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("syslog_facility", value)}
 
                                 />
                             </FormGroup>
@@ -313,7 +313,7 @@ class GeneralConfig extends React.Component {
                                 <FormSelect
                                     id="syslog_priority"
                                     value={this.state.syslog_priority}
-                                    onChange={(_event, value) => this.handleInputChange("syslog_priority", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("syslog_priority", value)}
                                 >
                                     {[
                                         { value: "", label: "" },
@@ -331,7 +331,7 @@ class GeneralConfig extends React.Component {
                                 <FormSelect
                                     id="journal_priority"
                                     value={this.state.journal_priority}
-                                    onChange={(_event, value) => this.handleInputChange("journal_priority", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("journal_priority", value)}
 
                                 >
                                     {[
@@ -358,7 +358,7 @@ class GeneralConfig extends React.Component {
                                 <FormSelect
                                     id="writer"
                                     value={this.state.writer}
-                                    onChange={(_event, value) => this.handleInputChange("writer", _event, value)}
+                                    onChange={(_event, value) => this.handleInputChange("writer", value)}
                                 >
                                     {[
                                         { value: "", label: "" },
@@ -560,7 +560,7 @@ class SssdConfig extends React.Component {
                     <FormSelect
                         id="scope"
                         value={this.state.scope}
-                        onChange={(_event, value) => this.handleInputChange("scope", _event, value)}
+                        onChange={(_event, value) => this.handleInputChange("scope", value)}
                     >
                         {[
                             { value: "none", label: _("None") },
@@ -581,14 +581,14 @@ class SssdConfig extends React.Component {
                         <TextInput
                             id="users"
                             value={this.state.users}
-                            onChange={(_event, value) => this.handleInputChange("users", _event, value)}
+                            onChange={(_event, value) => this.handleInputChange("users", value)}
                         />
                     </FormGroup>
                     <FormGroup label={_("Groups")}>
                         <TextInput
                             id="groups"
                             value={this.state.groups}
-                            onChange={(_event, value) => this.handleInputChange("groups", _event, value)}
+                            onChange={(_event, value) => this.handleInputChange("groups", value)}
                         />
                     </FormGroup>
                 </>}
@@ -598,14 +598,14 @@ class SssdConfig extends React.Component {
                         <TextInput
                             id="exclude_users"
                             value={this.state.exclude_users}
-                            onChange={(_event, value) => this.handleInputChange("exclude_users", _event, value)}
+                            onChange={(_event, value) => this.handleInputChange("exclude_users", value)}
                         />
                     </FormGroup>
                     <FormGroup label={_("Exclude Groups")}>
                         <TextInput
                             id="exclude_groups"
                             value={this.state.exclude_groups}
-                            onChange={(_event, value) => this.handleInputChange("exclude_groups", _event, value)}
+                            onChange={(_event, value) => this.handleInputChange("exclude_groups", value)}
                         />
                     </FormGroup>
                 </>}
diff --git a/src/player.jsx b/src/player.jsx
index 70bbf16..0e2c9ca 100644
--- a/src/player.jsx
+++ b/src/player.jsx
@@ -37,7 +37,7 @@ import {
     Toolbar,
     ToolbarContent,
     ToolbarItem,
-    ToolbarGroup,
+    ToolbarGroup, InputGroupItem,
 } from '@patternfly/react-core';
 import {
     ArrowRightIcon,
@@ -688,24 +688,30 @@ class Search extends React.Component {
         return (
             <ToolbarItem>
                 <InputGroup>
-                    <TextInput
-                        id="search_rec"
-                        type="search"
-                        value={this.state.search}
-                        onChange={(_event, value) => this.handleInputChange("search", value)}
-                    />
-                    <Button
-                        variant="control"
-                        onClick={this.handleSearchSubmit}
-                    >
-                        <SearchIcon />
-                    </Button>
-                    <Button
-                        variant="control"
-                        onClick={this.handleClearSearchResults}
-                    >
-                        <MinusIcon />
-                    </Button>
+                    <InputGroupItem isFill>
+                        <TextInput
+                            id="search_rec"
+                            type="search"
+                            value={this.state.search}
+                            onChange={(_event, value) => this.handleInputChange("search", value)}
+                        />
+                    </InputGroupItem>
+                    <InputGroupItem>
+                        <Button
+                            variant="control"
+                            onClick={this.handleSearchSubmit}
+                        >
+                            <SearchIcon />
+                        </Button>
+                    </InputGroupItem>
+                    <InputGroupItem>
+                        <Button
+                            variant="control"
+                            onClick={this.handleClearSearchResults}
+                        >
+                            <MinusIcon />
+                        </Button>
+                    </InputGroupItem>
                 </InputGroup>
                 <ToolbarItem>
                     {this.state.items}
diff --git a/src/recordings.jsx b/src/recordings.jsx
index 6f10c44..092c0ec 100644
--- a/src/recordings.jsx
+++ b/src/recordings.jsx
@@ -861,7 +861,7 @@ export default class View extends React.Component {
                                 placeholder={_("Filter since")}
                                 value={this.state.date_since}
                                 type="search"
-                                onChange={(_event, value) => this.handleInputChange("date_since", _event, value)}
+                                onChange={(_event, value) => this.handleInputChange("date_since", value)}
                             />
                         </ToolbarItem>
                     </ToolbarGroup>
@@ -873,7 +873,7 @@ export default class View extends React.Component {
                                 placeholder={_("Filter until")}
                                 value={this.state.date_until}
                                 type="search"
-                                onChange={(_event, value) => this.handleInputChange("date_until", _event, value)}
+                                onChange={(_event, value) => this.handleInputChange("date_until", value)}
                             />
                         </ToolbarItem>
                     </ToolbarGroup>
@@ -885,7 +885,7 @@ export default class View extends React.Component {
                                 placeholder={_("Filter by content")}
                                 value={this.state.search}
                                 type="search"
-                                onChange={(_event, value) => this.handleInputChange("search", _event, value)}
+                                onChange={(_event, value) => this.handleInputChange("search", value)}
                             />
                         </ToolbarItem>
                     </ToolbarGroup>
@@ -897,7 +897,7 @@ export default class View extends React.Component {
                                 placeholder={_("Filter by username")}
                                 value={this.state.username}
                                 type="search"
-                                onChange={(_event, value) => this.handleInputChange("username", _event, value)}
+                                onChange={(_event, value) => this.handleInputChange("username", value)}
                             />
                         </ToolbarItem>
                     </ToolbarGroup>
@@ -910,7 +910,7 @@ export default class View extends React.Component {
                                 placeholder={_("Filter by hostname")}
                                 value={this.state.hostname}
                                 type="search"
-                                onChange={(_event, value) => this.handleInputChange("hostname", _event, value)}
+                                onChange={(_event, value) => this.handleInputChange("hostname", value)}
                             />
                         </ToolbarItem>
                     </ToolbarGroup>}
diff --git a/test/check-application b/test/check-application
index 05abd88..c174df3 100755
--- a/test/check-application
+++ b/test/check-application
@@ -72,7 +72,7 @@ class TestApplication(testlib.MachineCase):
         b.wait_in_text(self._term_line(25), "exit")
 
     def testFastforwardControls(self):
-        progress = ".pf-c-progress__indicator"
+        progress = ".pf-v5-c-progress__indicator"
 
         b, _ = self._login()
         self._sel_rec('rec1')
@@ -117,7 +117,7 @@ class TestApplication(testlib.MachineCase):
         b.click("#player-speed-down")
         b.wait_text("#player-speed", "/16")
         # restore speed
-        b.click(".pf-c-chip .pf-c-button")
+        b.click(".pf-v5-c-chip .pf-v5-c-button")
         b.click("#player-speed-down")
         b.wait_text("#player-speed", "/2")
 
@@ -297,12 +297,12 @@ class TestApplication(testlib.MachineCase):
         m.execute("timedatectl set-timezone America/New_York")
         # select the recording with the extra logs
         self._sel_rec('rec2')
-        b.click("#btn-logs-view .pf-c-expandable-section__toggle")
+        b.click("#btn-logs-view .pf-v5-c-expandable-section__toggle")
         # fast forward until the end
         while "exit" not in b.text(self._term_line(22)):
             b.click("#player-skip-frame")
         # check for extra log entries
-        b.wait_visible(".pf-c-data-list:contains('authentication failure')")
+        b.wait_visible(".pf-v5-c-data-list:contains('authentication failure')")
 
     def testZoomSpeedControls(self):
         b, m = self._login()
@@ -337,7 +337,7 @@ class TestApplication(testlib.MachineCase):
                 # enter the search term and wait for the results to return
                 b.set_input_text(inp, term)
                 time.sleep(5)
-                self.assertEqual(b.text(".pf-c-table").count("contractor"), occ)
+                self.assertEqual(b.text(".pf-v5-c-table").count("contractor"), occ)
 
     def testSearch(self):
         self._filter(