Resolves #405 Related to !325 and #354
Replaces the properties from the system property tree with the ones from the new property system implemented in !325. !325 has to be merged first though, as this MR includes all changes from !325 and is based on it.