OptionTree removed & clean up some stuff.
Add Options-Framework