Several theming updates, mostly regarding helpers