WIP Changing mediadefinitions and adapting the rest
Finished new definitions integration, errors still exist
Added feedback