Classic theme fixes