Missed a few
Move pattern into settings
fixing