Baseline commit of new gateway theme
Progress update of Gateway theming