Last changes on flat theme