Spree and Locomotive improvements

Regex should be better now :)