Conflicting Messages

Don't merge yet. Checking themes this affects (Vengeful and FE are the two Roild and I thought of)