Theme update for new scaffolding technique, removed the if wrapper
comment cleanup