Flat theme fixes