Add Device: Remove overlay theme (still causes issues)