Some more concise generic functions
Updated templates, using newer functions, and modern, non-inline css