2.07.0:nivve:10 altbook - AND mercs capitals

- Regex error resulted in capital errors. Fixed them all.