[Layout]: Fixed move section between themes