Enhanced desktop-mode config