Simplified and renamed mixture menu files, aka. shaving yaks.