core: add more keywords and separators

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>