Class definition modifiers are not highlighted

It looks like all class definition modifiers are treated as part of the class name, which prevents them from being highlighted properly.

See example with comments:

CLASS zcl_abapgit_2fa_auth_base DEFINITION " the keyword class is higlighted
  PUBLIC " not even comments are treated correctly here
  ABSTRACT
  CREATE PUBLIC . " keywords until this point are the same color as the class name

  PUBLIC SECTION. " now higlighting is correct again
    INTERFACES:
      zif_abapgit_2fa_authenticator.
    ALIASES:
      authenticate FOR zif_abapgit_2fa_authenticator~authenticate,
      supports_url FOR zif_abapgit_2fa_authenticator~supports_url,
      is_2fa_required FOR zif_abapgit_2fa_authenticator~is_2fa_required,
      delete_access_tokens FOR zif_abapgit_2fa_authenticator~delete_access_tokens,
      begin FOR zif_abapgit_2fa_authenticator~begin,
      end FOR zif_abapgit_2fa_authenticator~end.
    METHODS:
...

Same applies to implementation, though it can only contain the word IMPLEMENTATION.

CLASS zcl_abapgit_2fa_auth_base IMPLEMENTATION.

pvl / abap.tmbundle

Class definition modifiers are not highlighted #20