I thought I reverted some changes, but all the cha...

# tornadofx

[tieskedh]

I thought I reverted some changes, but all the changes that are now in the branch are in my opinion correct.
I don't like the add/remove, but I will change this back to their original state...