Updated templates and rules.
Merge branch 'master' of https://github.com/syslabcom/osha.hwctheme

Conflicts:
	src/osha/hwctheme/theme