Updated CSS matching regex and sort order