Default Colors for Classification based on Theme

What is  the recommended way to provide default colors for the dark and light themes? I have attempted to use the IVsBroadcastMessageEvents class to listen to when the theme changes and then setting the colors using the IVsFontAndColorsStorage class. The event is always triggered but sometimes the colors don't change.  Is there a better way to set default colors for when the theme changes or a user installs under a theme other than the light theme? 

I am using the ClassificationFormatDefintion class  here: https://github.com/adamdriscoll/poshtools/blob/dev/PowerShellTools/Classification/ClassificationType.cs

I've been attempting to switch between the themes using a helper class I found on Stacknbsp;https://github.com/adamdriscoll/poshtools/blob/dev/PowerShellTools/Classification/ThemeUtility.cs

Thanks,

Adam