Simplify wiki RegEx and add Csfd addon