Made theme consistent