I have updated the patch into Claro theme and addressed comment #23. Please r...