Theme UI polishing