School theme improved