Added html on/off support and generalized code.

	* Now stuff can be added with some macro fun!