Added even more regex rules

TODO: Investigate why version history got
messed up (same version linked multiple
times to a single version)