Fix for new keys names in Style