Theme supported and UI tuned further