Moving KZOO messages + themes into the upstream source