In my opinion, switching to WPF is the way to go and gives you more control over UI customizations.