Update keywords.txt and theme.txt to provide highlighting more consistent with actual C++ keywords and functions