improve CSS selectors to reduce file size
fix 'watch' task