consolidate into one theme, begin homepage