can you still keep toolbar_CMS (because some configurations already use CMS) and add toolbar_HTMLField for the new one? Than I guess we can merge it