Made larger changes to Flat theme; Indigo almost unchanged.