More theme adjustments, cleanup of code helper calls.