Cleanup commenting
Add theme html hook
Update functions