Cleanup templates to allow for easier custom skinning.

Signed-off-by: DavidJClark <david@noticeabledesigns.com>