various on-site polishing of theme