Rebuild theme and adjust main section templates