Have you tried the built-in titlebar setting in Customize? There's an option at the bottom to turn on the regular system titlebar so that it displays as a normal window.