Thunar 4.18 - Restore Right Click UIs for Devices (Shortcuts Panel)

Using Debian Sid, I've had to stay on Thunar 4.16 in particular because the right click UIs for the Shortcuts panel had more straight-forward options (e.g. Mount, Unmount, Eject), whereas 4.18 treats it like a regular file or folder, thus my custom actions are mixed in there. If there was a way to directly edit that stuff to make it behave more like 4.16, that would be useful.

Also, when inserting a USB device, I liked it better when you could click Mount and not be taken to the next directory. Instead, give more options (e.g. mount and stay in the same directory, mount and open in a new tab, mount and open in a new window).

If you'd like screenshots showing specifically what I'd like restored, I can provide them. Thanks.