Refined less-watch tool.

Individual theme can be watched saparately now.