Classic theme improvements