Actually just removed the templates that were irritating me. Much better matching now!