flex1986

I added this change earlier, but something went wrong with the project. If there are some other options that are hardcoded please let me know, I can also added them...