Improves regex, captures markup and preset