#664 Cannot expand fillStyles in DefineShape tags in raw edit fixed + some misssing files from the previous commit