Bundles and keymappings adjusted