diff --git a/resources/images/tutorial/phone_screen_de.png b/resources/images/tutorial/phone_screen_de.png
diff --git a/resources/images/tutorial/phone_screen_en.png b/resources/images/tutorial/phone_screen_en.png
diff --git a/resources/images/tutorial/pin-5@2x.png b/resources/images/tutorial/pin-5@2x.png
diff --git a/resources/images/tutorial/pin-6@2x.png b/resources/images/tutorial/pin-6@2x.png
diff --git a/resources/images/tutorial/play_movie.png b/resources/images/tutorial/play_movie.png
diff --git a/resources/images/tutorial/provider_home.svg b/resources/images/tutorial/provider_home.svg
diff --git a/resources/images/tutorial/providericons.png b/resources/images/tutorial/providericons.png
diff --git a/resources/images/tutorial/questionmark.svg b/resources/images/tutorial/questionmark.svg
diff --git a/resources/images/tutorial/reader.svg b/resources/images/tutorial/reader.svg
diff --git a/resources/images/tutorial/reader_nfc_finished.svg b/resources/images/tutorial/reader_nfc_finished.svg
diff --git a/resources/images/tutorial/reader_nfc_npa_on_smartphone.svg b/resources/images/tutorial/reader_nfc_npa_on_smartphone.svg
diff --git a/resources/images/tutorial/reader_nfc_pin6.svg b/resources/images/tutorial/reader_nfc_pin6.svg
diff --git a/resources/images/tutorial/reader_nfc_provider_on_smartphone.svg b/resources/images/tutorial/reader_nfc_provider_on_smartphone.svg
diff --git a/resources/images/tutorial/reader_nfc_smartphone_nfc_position.svg b/resources/images/tutorial/reader_nfc_smartphone_nfc_position.svg
diff --git a/resources/images/tutorial/reader_nfc_userdata_example_de.svg b/resources/images/tutorial/reader_nfc_userdata_example_de.svg
diff --git a/resources/images/tutorial/reader_nfc_userdata_example_en.svg b/resources/images/tutorial/reader_nfc_userdata_example_en.svg
diff --git a/resources/images/tutorial/reader_sac_aa2_ok.svg b/resources/images/tutorial/reader_sac_aa2_ok.svg
diff --git a/resources/images/tutorial/reader_sac_menu_android_de.svg b/resources/images/tutorial/reader_sac_menu_android_de.svg
diff --git a/resources/images/tutorial/reader_sac_menu_android_en.svg b/resources/images/tutorial/reader_sac_menu_android_en.svg
diff --git a/resources/images/tutorial/reader_sac_menu_ios_de.svg b/resources/images/tutorial/reader_sac_menu_ios_de.svg
diff --git a/resources/images/tutorial/reader_sac_menu_ios_en.svg b/resources/images/tutorial/reader_sac_menu_ios_en.svg
diff --git a/resources/images/tutorial/reader_sac_no_nfc_devices.svg b/resources/images/tutorial/reader_sac_no_nfc_devices.svg
diff --git a/resources/images/tutorial/reader_sac_no_nfc_provider.svg b/resources/images/tutorial/reader_sac_no_nfc_provider.svg
diff --git a/resources/images/tutorial/reader_sac_npa_on_laptop.svg b/resources/images/tutorial/reader_sac_npa_on_laptop.svg
diff --git a/resources/images/tutorial/reader_sac_provider_on_laptop.svg b/resources/images/tutorial/reader_sac_provider_on_laptop.svg
diff --git a/resources/images/tutorial/rectangles.svg b/resources/images/tutorial/rectangles.svg
diff --git a/resources/images/tutorial/save.svg b/resources/images/tutorial/save.svg
diff --git a/resources/images/tutorial/screenshot_cert_android_de.png b/resources/images/tutorial/screenshot_cert_android_de.png
diff --git a/resources/images/tutorial/screenshot_cert_android_en.png b/resources/images/tutorial/screenshot_cert_android_en.png
diff --git a/resources/images/tutorial/screenshot_cert_ios_de.png b/resources/images/tutorial/screenshot_cert_ios_de.png
diff --git a/resources/images/tutorial/screenshot_cert_ios_en.png b/resources/images/tutorial/screenshot_cert_ios_en.png
diff --git a/resources/images/tutorial/screenshot_check_id_card_android_de.png b/resources/images/tutorial/screenshot_check_id_card_android_de.png
diff --git a/resources/images/tutorial/screenshot_check_id_card_android_en.png b/resources/images/tutorial/screenshot_check_id_card_android_en.png
diff --git a/resources/images/tutorial/screenshot_check_id_card_ios_de.png b/resources/images/tutorial/screenshot_check_id_card_ios_de.png
diff --git a/resources/images/tutorial/screenshot_check_id_card_ios_en.png b/resources/images/tutorial/screenshot_check_id_card_ios_en.png
diff --git a/resources/images/tutorial/screenshot_choose_reader_android_de.png b/resources/images/tutorial/screenshot_choose_reader_android_de.png
diff --git a/resources/images/tutorial/screenshot_choose_reader_android_en.png b/resources/images/tutorial/screenshot_choose_reader_android_en.png
diff --git a/resources/images/tutorial/screenshot_choose_reader_ios_de.png b/resources/images/tutorial/screenshot_choose_reader_ios_de.png
diff --git a/resources/images/tutorial/screenshot_choose_reader_ios_en.png b/resources/images/tutorial/screenshot_choose_reader_ios_en.png
diff --git a/resources/images/tutorial/screenshot_pairing_de.png b/resources/images/tutorial/screenshot_pairing_de.png
diff --git a/resources/images/tutorial/screenshot_pairing_en.png b/resources/images/tutorial/screenshot_pairing_en.png
diff --git a/resources/images/tutorial/screenshot_pin_management_menu_android_de.png b/resources/images/tutorial/screenshot_pin_management_menu_android_de.png
diff --git a/resources/images/tutorial/screenshot_pin_management_menu_android_en.png b/resources/images/tutorial/screenshot_pin_management_menu_android_en.png
diff --git a/resources/images/tutorial/screenshot_pin_management_menu_ios_de.png b/resources/images/tutorial/screenshot_pin_management_menu_ios_de.png
diff --git a/resources/images/tutorial/screenshot_pin_management_menu_ios_en.png b/resources/images/tutorial/screenshot_pin_management_menu_ios_en.png
diff --git a/resources/images/tutorial/screenshot_providerlist_android_de.png b/resources/images/tutorial/screenshot_providerlist_android_de.png
diff --git a/resources/images/tutorial/screenshot_providerlist_android_en.png b/resources/images/tutorial/screenshot_providerlist_android_en.png
diff --git a/resources/images/tutorial/screenshot_providerlist_ios_de.png b/resources/images/tutorial/screenshot_providerlist_ios_de.png
diff --git a/resources/images/tutorial/screenshot_providerlist_ios_en.png b/resources/images/tutorial/screenshot_providerlist_ios_en.png
diff --git a/resources/images/tutorial/screenshot_remoteservice_android_de.png b/resources/images/tutorial/screenshot_remoteservice_android_de.png
diff --git a/resources/images/tutorial/screenshot_remoteservice_android_en.png b/resources/images/tutorial/screenshot_remoteservice_android_en.png
diff --git a/resources/images/tutorial/screenshot_remoteservice_ios_de.png b/resources/images/tutorial/screenshot_remoteservice_ios_de.png
diff --git a/resources/images/tutorial/screenshot_remoteservice_ios_en.png b/resources/images/tutorial/screenshot_remoteservice_ios_en.png
diff --git a/resources/images/tutorial/screenshot_selfauthentication_android_de.png b/resources/images/tutorial/screenshot_selfauthentication_android_de.png
diff --git a/resources/images/tutorial/screenshot_selfauthentication_android_en.png b/resources/images/tutorial/screenshot_selfauthentication_android_en.png
diff --git a/resources/images/tutorial/screenshot_selfauthentication_ios_de.png b/resources/images/tutorial/screenshot_selfauthentication_ios_de.png
diff --git a/resources/images/tutorial/screenshot_selfauthentication_ios_en.png b/resources/images/tutorial/screenshot_selfauthentication_ios_en.png
diff --git a/resources/images/tutorial/screenshot_start_android_de.png b/resources/images/tutorial/screenshot_start_android_de.png
diff --git a/resources/images/tutorial/screenshot_start_android_en.png b/resources/images/tutorial/screenshot_start_android_en.png
diff --git a/resources/images/tutorial/screenshot_start_ios_de.png b/resources/images/tutorial/screenshot_start_ios_de.png
diff --git a/resources/images/tutorial/screenshot_start_ios_en.png b/resources/images/tutorial/screenshot_start_ios_en.png
diff --git a/resources/images/tutorial/section_seperator_how.svg b/resources/images/tutorial/section_seperator_how.svg
diff --git a/resources/images/tutorial/section_seperator_important.svg b/resources/images/tutorial/section_seperator_important.svg
diff --git a/resources/images/tutorial/section_seperator_what.svg b/resources/images/tutorial/section_seperator_what.svg
diff --git a/resources/images/tutorial/section_seperator_where.svg b/resources/images/tutorial/section_seperator_where.svg
diff --git a/resources/images/tutorial/src/phone_screen_de.svg b/resources/images/tutorial/src/phone_screen_de.svg
diff --git a/resources/images/tutorial/src/phone_screen_en.svg b/resources/images/tutorial/src/phone_screen_en.svg
diff --git a/resources/images/tutorial/tablet-nfc.svg b/resources/images/tutorial/tablet-nfc.svg
diff --git a/resources/images/tutorial/tablet-no-nfc.svg b/resources/images/tutorial/tablet-no-nfc.svg
diff --git a/resources/images/tutorial/tablet.svg b/resources/images/tutorial/tablet.svg
diff --git a/resources/images/tutorial/thumb_up.svg b/resources/images/tutorial/thumb_up.svg
diff --git a/resources/images/tutorial/up_icon.svg b/resources/images/tutorial/up_icon.svg
diff --git a/resources/images/tutorial/usb.svg b/resources/images/tutorial/usb.svg
diff --git a/resources/images/tutorial/user-tine@3x.png b/resources/images/tutorial/user-tine@3x.png
diff --git a/resources/images/tutorial/where_identify_now_de.svg b/resources/images/tutorial/where_identify_now_de.svg
diff --git a/resources/images/tutorial/where_identify_now_en.svg b/resources/images/tutorial/where_identify_now_en.svg
diff --git a/resources/images/tutorial/where_lay_down_id.svg b/resources/images/tutorial/where_lay_down_id.svg
diff --git a/resources/images/tutorial/where_overview_question.svg b/resources/images/tutorial/where_overview_question.svg
diff --git a/resources/images/tutorial/where_pin6.svg b/resources/images/tutorial/where_pin6.svg
diff --git a/resources/images/tutorial/where_userdata_example_de.svg b/resources/images/tutorial/where_userdata_example_de.svg
diff --git a/resources/images/tutorial/where_userdata_example_en.svg b/resources/images/tutorial/where_userdata_example_en.svg
diff --git a/resources/images/tutorial/wifi.svg b/resources/images/tutorial/wifi.svg
diff --git a/resources/images/wix_dialog.jpg b/resources/images/wix_dialog.jpg
diff --git a/resources/images/workflow_error_card_darkmode.svg b/resources/images/workflow_error_card_darkmode.svg
diff --git a/resources/images/workflow_error_card_highcontrast.svg b/resources/images/workflow_error_card_highcontrast.svg
diff --git a/resources/images/workflow_error_card_lightmode.svg b/resources/images/workflow_error_card_lightmode.svg
diff --git a/resources/images/workflow_error_network_darkmode.svg b/resources/images/workflow_error_network_darkmode.svg
diff --git a/resources/images/workflow_error_network_highcontrast.svg b/resources/images/workflow_error_network_highcontrast.svg
diff --git a/resources/images/workflow_error_network_lightmode.svg b/resources/images/workflow_error_network_lightmode.svg
diff --git a/resources/images/workflow_error_nfc_darkmode.svg b/resources/images/workflow_error_nfc_darkmode.svg
diff --git a/resources/images/workflow_error_nfc_highcontrast.svg b/resources/images/workflow_error_nfc_highcontrast.svg
diff --git a/resources/images/workflow_error_nfc_lightmode.svg b/resources/images/workflow_error_nfc_lightmode.svg
diff --git a/resources/images/workflow_error_no_sak_darkmode.svg b/resources/images/workflow_error_no_sak_darkmode.svg
diff --git a/resources/images/workflow_error_no_sak_highcontrast.svg b/resources/images/workflow_error_no_sak_highcontrast.svg
diff --git a/resources/images/workflow_error_no_sak_lightmode.svg b/resources/images/workflow_error_no_sak_lightmode.svg
diff --git a/resources/images/workflow_error_puk_blocked_darkmode.svg b/resources/images/workflow_error_puk_blocked_darkmode.svg
diff --git a/resources/images/workflow_error_puk_blocked_highcontrast.svg b/resources/images/workflow_error_puk_blocked_highcontrast.svg
diff --git a/resources/images/workflow_error_puk_blocked_lightmode.svg b/resources/images/workflow_error_puk_blocked_lightmode.svg
diff --git a/resources/images/workflow_error_wrong_can_darkmode.svg b/resources/images/workflow_error_wrong_can_darkmode.svg
diff --git a/resources/images/workflow_error_wrong_can_highcontrast.svg b/resources/images/workflow_error_wrong_can_highcontrast.svg
diff --git a/resources/images/workflow_error_wrong_can_lightmode.svg b/resources/images/workflow_error_wrong_can_lightmode.svg
diff --git a/resources/images/workflow_error_wrong_pin_darkmode.svg b/resources/images/workflow_error_wrong_pin_darkmode.svg
diff --git a/resources/images/workflow_error_wrong_pin_highcontrast.svg b/resources/images/workflow_error_wrong_pin_highcontrast.svg
diff --git a/resources/images/workflow_error_wrong_pin_lightmode.svg b/resources/images/workflow_error_wrong_pin_lightmode.svg
diff --git a/resources/images/workflow_error_wrong_puk_darkmode.svg b/resources/images/workflow_error_wrong_puk_darkmode.svg
diff --git a/resources/images/workflow_error_wrong_puk_highcontrast.svg b/resources/images/workflow_error_wrong_puk_highcontrast.svg
diff --git a/resources/images/workflow_error_wrong_puk_lightmode.svg b/resources/images/workflow_error_wrong_puk_lightmode.svg
diff --git a/resources/images/workflow_error_wrong_transportpin_darkmode.svg b/resources/images/workflow_error_wrong_transportpin_darkmode.svg
diff --git a/resources/images/workflow_error_wrong_transportpin_highcontrast.svg b/resources/images/workflow_error_wrong_transportpin_highcontrast.svg
diff --git a/resources/images/workflow_error_wrong_transportpin_lightmode.svg b/resources/images/workflow_error_wrong_transportpin_lightmode.svg
diff --git a/resources/images/workflow_success_changepin_darkmode.svg b/resources/images/workflow_success_changepin_darkmode.svg
diff --git a/resources/images/workflow_success_changepin_highcontrast.svg b/resources/images/workflow_success_changepin_highcontrast.svg
diff --git a/resources/images/workflow_success_changepin_lightmode.svg b/resources/images/workflow_success_changepin_lightmode.svg
diff --git a/resources/jenkins/docker/Dockerfile b/resources/jenkins/docker/Dockerfile
diff --git a/resources/jenkins/docker/alpine-swarm/Dockerfile b/resources/jenkins/docker/alpine-swarm/Dockerfile
diff --git a/resources/jenkins/docker/ubuntu-android/Dockerfile b/resources/jenkins/docker/ubuntu-android/Dockerfile
diff --git a/resources/jenkins/docker/ubuntu-swarm/Dockerfile b/resources/jenkins/docker/ubuntu-swarm/Dockerfile
diff --git a/resources/jenkins/docker/ubuntu-vanilla/Dockerfile b/resources/jenkins/docker/ubuntu-vanilla/Dockerfile
diff --git a/resources/jenkins/dsl/Builds/Build_Android.groovy b/resources/jenkins/dsl/Builds/Build_Android.groovy
diff --git a/resources/jenkins/dsl/Builds/Build_Container.groovy b/resources/jenkins/dsl/Builds/Build_Container.groovy
diff --git a/resources/jenkins/dsl/Builds/Build_Docker_VNC.groovy b/resources/jenkins/dsl/Builds/Build_Docker_VNC.groovy
diff --git a/resources/jenkins/dsl/Builds/Build_Docs.groovy b/resources/jenkins/dsl/Builds/Build_Docs.groovy
diff --git a/resources/jenkins/dsl/Builds/Build_SonarQube.groovy b/resources/jenkins/dsl/Builds/Build_SonarQube.groovy
diff --git a/resources/jenkins/dsl/Builds/Build_Win64_GNU_MSI_dev.groovy b/resources/jenkins/dsl/Builds/Build_Win64_GNU_MSI_dev.groovy
diff --git a/resources/jenkins/dsl/Builds/Build_iOS_IPA.groovy b/resources/jenkins/dsl/Builds/Build_iOS_IPA.groovy
diff --git a/resources/jenkins/dsl/Libraries/Libs_Win64_GNU.groovy b/resources/jenkins/dsl/Libraries/Libs_Win64_GNU.groovy
diff --git a/resources/jenkins/dsl/Libraries/Libs_Win64_GNU_dev.groovy b/resources/jenkins/dsl/Libraries/Libs_Win64_GNU_dev.groovy
diff --git a/resources/jenkins/dsl/Libraries/Libs_Win64_MSVC.groovy b/resources/jenkins/dsl/Libraries/Libs_Win64_MSVC.groovy
diff --git a/resources/jenkins/dsl/Libraries/Libs_Win64_MSVC_dev.groovy b/resources/jenkins/dsl/Libraries/Libs_Win64_MSVC_dev.groovy
diff --git a/resources/jenkins/dsl/Releases/Release_Android.groovy b/resources/jenkins/dsl/Releases/Release_Android.groovy
diff --git a/resources/jenkins/dsl/Releases/Release_Container.groovy b/resources/jenkins/dsl/Releases/Release_Container.groovy
diff --git a/resources/jenkins/dsl/Releases/Release_Docs.groovy b/resources/jenkins/dsl/Releases/Release_Docs.groovy
diff --git a/resources/jenkins/dsl/Releases/Release_MacOS.groovy b/resources/jenkins/dsl/Releases/Release_MacOS.groovy
diff --git a/resources/jenkins/dsl/Releases/Release_iOS.groovy b/resources/jenkins/dsl/Releases/Release_iOS.groovy
diff --git a/resources/jenkins/dsl/Releases/Release_iOS_Framework.groovy b/resources/jenkins/dsl/Releases/Release_iOS_Framework.groovy
diff --git a/resources/jenkins/dsl/Releases/Release_iOS_Simulator_Framework.groovy b/resources/jenkins/dsl/Releases/Release_iOS_Simulator_Framework.groovy
diff --git a/resources/jenkins/dsl/Releases/Release_iOS_Simulator_arm64_Framework.groovy b/resources/jenkins/dsl/Releases/Release_iOS_Simulator_arm64_Framework.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Android.groovy b/resources/jenkins/dsl/Reviews/Review_Android.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Container.groovy b/resources/jenkins/dsl/Reviews/Review_Container.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Docker_VNC.groovy b/resources/jenkins/dsl/Reviews/Review_Docker_VNC.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Docs.groovy b/resources/jenkins/dsl/Reviews/Review_Docs.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Formatting.groovy b/resources/jenkins/dsl/Reviews/Review_Formatting.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Libs_Win64_GNU.groovy b/resources/jenkins/dsl/Reviews/Review_Libs_Win64_GNU.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Libs_Win64_MSVC.groovy b/resources/jenkins/dsl/Reviews/Review_Libs_Win64_MSVC.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Libs_Win64_MSVC_dev.groovy b/resources/jenkins/dsl/Reviews/Review_Libs_Win64_MSVC_dev.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_SonarQube.groovy b/resources/jenkins/dsl/Reviews/Review_SonarQube.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Trigger.groovy b/resources/jenkins/dsl/Reviews/Review_Trigger.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Trigger_Configuration.groovy b/resources/jenkins/dsl/Reviews/Review_Trigger_Configuration.groovy
diff --git a/resources/jenkins/dsl/Reviews/Review_Trigger_Libs.groovy b/resources/jenkins/dsl/Reviews/Review_Trigger_Libs.groovy
diff --git a/resources/jenkins/dsl/common/RootTrigger.groovy b/resources/jenkins/dsl/common/RootTrigger.groovy
diff --git a/resources/jenkins/dsl/config.xml b/resources/jenkins/dsl/config.xml
diff --git a/resources/jenkins/import.py b/resources/jenkins/import.py
diff --git a/resources/packaging/android/AndroidManifest.xml.apk.in b/resources/packaging/android/AndroidManifest.xml.apk.in
diff --git a/resources/packaging/android/build.gradle.append b/resources/packaging/android/build.gradle.append
diff --git a/resources/packaging/android/build.gradle.append.aar b/resources/packaging/android/build.gradle.append.aar
diff --git a/resources/packaging/android/build.gradle.append.smarteid b/resources/packaging/android/build.gradle.append.smarteid
diff --git a/...usweisApp2.so-deployment-settings.json.in → ...AusweisApp.so-deployment-settings.json.in b/...usweisApp2.so-deployment-settings.json.in → ...AusweisApp.so-deployment-settings.json.in
diff --git a/resources/packaging/android/lint.aar.xml b/resources/packaging/android/lint.aar.xml
diff --git a/resources/packaging/android/lint.apk.xml b/resources/packaging/android/lint.apk.xml
diff --git a/resources/packaging/android/pom.xml.in b/resources/packaging/android/pom.xml.in
diff --git a/...ing/android/res/mipmap-anydpi-v26/npa.xml → ...ckaging/android/res/mipmap-anydpi/npa.xml b/...ing/android/res/mipmap-anydpi-v26/npa.xml → ...ckaging/android/res/mipmap-anydpi/npa.xml
diff --git a/resources/packaging/android/res/values/strings.xml b/resources/packaging/android/res/values/strings.xml
diff --git a/resources/packaging/android/res/values/style.xml b/resources/packaging/android/res/values/style.xml
diff --git a/...es/packaging/ios/AusweisApp2.entitlements → ...ces/packaging/ios/AusweisApp.entitlements b/...es/packaging/ios/AusweisApp2.entitlements → ...ces/packaging/ios/AusweisApp.entitlements
diff --git a/resources/packaging/ios/Info.framework.plist.in b/resources/packaging/ios/Info.framework.plist.in
diff --git a/resources/packaging/ios/Info.plist.in b/resources/packaging/ios/Info.plist.in
diff --git a/resources/packaging/ios/de.lproj/InfoPlist.strings b/resources/packaging/ios/de.lproj/InfoPlist.strings
diff --git a/resources/packaging/ios/launchscreen.storyboard b/resources/packaging/ios/launchscreen.storyboard
diff --git a/resources/packaging/linux/com.governikus.ausweisapp2.desktop.in b/resources/packaging/linux/com.governikus.ausweisapp2.desktop.in
diff --git a/resources/packaging/linux/com.governikus.ausweisapp2.metainfo.xml.in b/resources/packaging/linux/com.governikus.ausweisapp2.metainfo.xml.in
diff --git a/.../packaging/macos/AusweisApp2.entitlements → ...s/packaging/macos/AusweisApp.entitlements b/.../packaging/macos/AusweisApp2.entitlements → ...s/packaging/macos/AusweisApp.entitlements
diff --git a/resources/packaging/macos/DS_Store b/resources/packaging/macos/DS_Store
diff --git a/resources/packaging/win/WIX.Texts.de-DE.wxl b/resources/packaging/win/WIX.Texts.de-DE.wxl
diff --git a/resources/packaging/win/WIX.Texts.en-US.wxl b/resources/packaging/win/WIX.Texts.en-US.wxl
diff --git a/resources/packaging/win/WIX.template.in b/resources/packaging/win/WIX.template.in
diff --git a/resources/packaging/win/executable.wxs b/resources/packaging/win/executable.wxs
diff --git a/resources/packaging/win/install_settings.wxs b/resources/packaging/win/install_settings.wxs
diff --git a/resources/packaging/win/runtime_settings.wxs b/resources/packaging/win/runtime_settings.wxs
diff --git a/resources/qml/+desktop/main.qml b/resources/qml/+desktop/main.qml
diff --git a/resources/qml/+mobile/main.qml b/resources/qml/+mobile/main.qml
diff --git a/resources/qml/Governikus/AuthView/+desktop/AuthController.qml b/resources/qml/Governikus/AuthView/+desktop/AuthController.qml
diff --git a/resources/qml/Governikus/AuthView/+desktop/AuthView.qml b/resources/qml/Governikus/AuthView/+desktop/AuthView.qml
diff --git a/resources/qml/Governikus/AuthView/+desktop/CertificateDescriptionPage.qml b/resources/qml/Governikus/AuthView/+desktop/CertificateDescriptionPage.qml
diff --git a/resources/qml/Governikus/AuthView/+desktop/DataGroup.qml b/resources/qml/Governikus/AuthView/+desktop/DataGroup.qml
diff --git a/resources/qml/Governikus/AuthView/+desktop/EditRights.qml b/resources/qml/Governikus/AuthView/+desktop/EditRights.qml
diff --git a/resources/qml/Governikus/AuthView/+desktop/ProviderInfoSection.qml b/resources/qml/Governikus/AuthView/+desktop/ProviderInfoSection.qml
diff --git a/resources/qml/Governikus/AuthView/+desktop/SelfAuthenticationData.qml b/resources/qml/Governikus/AuthView/+desktop/SelfAuthenticationData.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/+phone/DataGroup.qml b/resources/qml/Governikus/AuthView/+mobile/+phone/DataGroup.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/+phone/EditRights.qml b/resources/qml/Governikus/AuthView/+mobile/+phone/EditRights.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/+tablet/EditRights.qml b/resources/qml/Governikus/AuthView/+mobile/+tablet/EditRights.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/AbortedProgressView.qml b/resources/qml/Governikus/AuthView/+mobile/AbortedProgressView.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/AuthController.qml b/resources/qml/Governikus/AuthView/+mobile/AuthController.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/AuthView.qml b/resources/qml/Governikus/AuthView/+mobile/AuthView.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/CardPositionView.qml b/resources/qml/Governikus/AuthView/+mobile/CardPositionView.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/CertificateDescriptionPage.qml b/resources/qml/Governikus/AuthView/+mobile/CertificateDescriptionPage.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/CheckConnectivityView.qml b/resources/qml/Governikus/AuthView/+mobile/CheckConnectivityView.qml
diff --git a/...us/AuthView/+mobile/+tablet/DataGroup.qml → ...Governikus/AuthView/+mobile/DataGroup.qml b/...us/AuthView/+mobile/+tablet/DataGroup.qml → ...Governikus/AuthView/+mobile/DataGroup.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/EditRights.qml b/resources/qml/Governikus/AuthView/+mobile/EditRights.qml
diff --git a/.../Provider/+mobile/ProviderInfoSection.qml → .../AuthView/+mobile/ProviderInfoSection.qml b/.../Provider/+mobile/ProviderInfoSection.qml → .../AuthView/+mobile/ProviderInfoSection.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/SelfAuthenticationData.qml b/resources/qml/Governikus/AuthView/+mobile/SelfAuthenticationData.qml
diff --git a/resources/qml/Governikus/AuthView/+mobile/TransportPinReminderView.qml b/resources/qml/Governikus/AuthView/+mobile/TransportPinReminderView.qml
diff --git a/resources/qml/Governikus/AuthView/qmldir b/resources/qml/Governikus/AuthView/qmldir
diff --git a/resources/qml/Governikus/ChangePinView/+desktop/ChangePinController.qml b/resources/qml/Governikus/ChangePinView/+desktop/ChangePinController.qml
diff --git a/resources/qml/Governikus/ChangePinView/+desktop/ChangePinView.qml b/resources/qml/Governikus/ChangePinView/+desktop/ChangePinView.qml
diff --git a/resources/qml/Governikus/ChangePinView/+mobile/ChangePinController.qml b/resources/qml/Governikus/ChangePinView/+mobile/ChangePinController.qml
diff --git a/resources/qml/Governikus/ChangePinView/+mobile/ChangePinView.qml b/resources/qml/Governikus/ChangePinView/+mobile/ChangePinView.qml
diff --git a/resources/qml/Governikus/ChangePinView/ChangePinViewContent.qml b/resources/qml/Governikus/ChangePinView/ChangePinViewContent.qml
diff --git a/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardResultView.qml b/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardResultView.qml
diff --git a/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardSuggestionView.qml b/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardSuggestionView.qml
diff --git a/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardView.qml b/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardView.qml
diff --git a/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardWorkflow.qml b/resources/qml/Governikus/CheckIDCardView/+mobile/CheckIDCardWorkflow.qml
diff --git a/resources/qml/Governikus/CheckResultView/+mobile/CheckResultSuggestionView.qml b/resources/qml/Governikus/CheckResultView/+mobile/CheckResultSuggestionView.qml
diff --git a/resources/qml/Governikus/CheckResultView/+mobile/CheckResultView.qml b/resources/qml/Governikus/CheckResultView/+mobile/CheckResultView.qml
diff --git a/resources/qml/Governikus/CheckResultView/+mobile/ResultEntry.qml b/resources/qml/Governikus/CheckResultView/+mobile/ResultEntry.qml
diff --git a/resources/qml/Governikus/CheckResultView/+mobile/SuggestionData.qml b/resources/qml/Governikus/CheckResultView/+mobile/SuggestionData.qml
diff --git a/resources/qml/Governikus/CheckSmartView/+mobile/CheckSmartResultView.qml b/resources/qml/Governikus/CheckSmartView/+mobile/CheckSmartResultView.qml
diff --git a/resources/qml/Governikus/CheckSmartView/+mobile/CheckSmartView.qml b/resources/qml/Governikus/CheckSmartView/+mobile/CheckSmartView.qml
diff --git a/resources/qml/Governikus/CheckSmartView/qmldir b/resources/qml/Governikus/CheckSmartView/qmldir
diff --git a/resources/qml/Governikus/EnterPasswordView/+desktop/EnterPasswordView.qml b/resources/qml/Governikus/EnterPasswordView/+desktop/EnterPasswordView.qml
diff --git a/resources/qml/Governikus/EnterPasswordView/+desktop/NumberPad.qml b/resources/qml/Governikus/EnterPasswordView/+desktop/NumberPad.qml
diff --git a/resources/qml/Governikus/EnterPasswordView/+desktop/NumberPadButton.qml b/resources/qml/Governikus/EnterPasswordView/+desktop/NumberPadButton.qml
diff --git a/resources/qml/Governikus/EnterPasswordView/+mobile/EnterPasswordView.qml b/resources/qml/Governikus/EnterPasswordView/+mobile/EnterPasswordView.qml
diff --git a/resources/qml/Governikus/EnterPasswordView/+mobile/NumberPad.qml b/resources/qml/Governikus/EnterPasswordView/+mobile/NumberPad.qml
diff --git a/resources/qml/Governikus/EnterPasswordView/+mobile/NumberPadButton.qml b/resources/qml/Governikus/EnterPasswordView/+mobile/NumberPadButton.qml
diff --git a/resources/qml/Governikus/FeedbackView/+desktop/DetachedLogView.qml b/resources/qml/Governikus/FeedbackView/+desktop/DetachedLogView.qml
diff --git a/resources/qml/Governikus/FeedbackView/+desktop/LogView.qml b/resources/qml/Governikus/FeedbackView/+desktop/LogView.qml
diff --git a/resources/qml/Governikus/FeedbackView/+desktop/LogViewDelegate.qml b/resources/qml/Governikus/FeedbackView/+desktop/LogViewDelegate.qml
diff --git a/resources/qml/Governikus/FeedbackView/+desktop/LogViewHighLight.qml b/resources/qml/Governikus/FeedbackView/+desktop/LogViewHighLight.qml
diff --git a/resources/qml/Governikus/FeedbackView/+mobile/+android/StoreFeedbackPopup.qml b/resources/qml/Governikus/FeedbackView/+mobile/+android/StoreFeedbackPopup.qml
diff --git a/resources/qml/Governikus/FeedbackView/+mobile/+ios/StoreFeedbackPopup.qml b/resources/qml/Governikus/FeedbackView/+mobile/+ios/StoreFeedbackPopup.qml
diff --git a/resources/qml/Governikus/FeedbackView/+mobile/LogTitleBarControls.qml b/resources/qml/Governikus/FeedbackView/+mobile/LogTitleBarControls.qml
diff --git a/resources/qml/Governikus/FeedbackView/+mobile/LogView.qml b/resources/qml/Governikus/FeedbackView/+mobile/LogView.qml
diff --git a/resources/qml/Governikus/FeedbackView/qmldir b/resources/qml/Governikus/FeedbackView/qmldir
diff --git a/resources/qml/Governikus/Global/+desktop/ConfirmationPopup.qml b/resources/qml/Governikus/Global/+desktop/ConfirmationPopup.qml
diff --git a/resources/qml/Governikus/Global/+desktop/DecisionView.qml b/resources/qml/Governikus/Global/+desktop/DecisionView.qml
diff --git a/resources/qml/Governikus/Global/+desktop/GFileDialog.qml b/resources/qml/Governikus/Global/+desktop/GFileDialog.qml
diff --git a/resources/qml/Governikus/Global/+desktop/GPane.qml b/resources/qml/Governikus/Global/+desktop/GPane.qml
diff --git a/resources/qml/Governikus/Global/+desktop/Hint.qml b/resources/qml/Governikus/Global/+desktop/Hint.qml
diff --git a/resources/qml/Governikus/Global/+desktop/LocationButton.qml b/resources/qml/Governikus/Global/+desktop/LocationButton.qml
diff --git a/resources/qml/Governikus/Global/+desktop/NavigationButton.qml b/resources/qml/Governikus/Global/+desktop/NavigationButton.qml
diff --git a/resources/qml/Governikus/Global/+desktop/PlatformConstants.qml b/resources/qml/Governikus/Global/+desktop/PlatformConstants.qml
diff --git a/resources/qml/Governikus/Global/+desktop/RetryCounter.qml b/resources/qml/Governikus/Global/+desktop/RetryCounter.qml
diff --git a/resources/qml/Governikus/Global/+desktop/ScrollGradients.qml b/resources/qml/Governikus/Global/+desktop/ScrollGradients.qml
diff --git a/resources/qml/Governikus/Global/+desktop/ScrollablePane.qml b/resources/qml/Governikus/Global/+desktop/ScrollablePane.qml
diff --git a/resources/qml/Governikus/Global/+desktop/SearchBar.qml b/resources/qml/Governikus/Global/+desktop/SearchBar.qml
diff --git a/resources/qml/Governikus/Global/+desktop/TabbedPane.qml b/resources/qml/Governikus/Global/+desktop/TabbedPane.qml
diff --git a/resources/qml/Governikus/Global/+desktop/TabbedPaneDelegateIconAndText.qml b/resources/qml/Governikus/Global/+desktop/TabbedPaneDelegateIconAndText.qml
diff --git a/resources/qml/Governikus/Global/+desktop/TabbedPaneDelegateIconAndThreeLineText.qml b/resources/qml/Governikus/Global/+desktop/TabbedPaneDelegateIconAndThreeLineText.qml
diff --git a/resources/qml/Governikus/Global/+desktop/TabbedPaneDelegateText.qml b/resources/qml/Governikus/Global/+desktop/TabbedPaneDelegateText.qml
diff --git a/resources/qml/Governikus/Global/+mobile/+android/+phone/DeviceConstants.qml b/resources/qml/Governikus/Global/+mobile/+android/+phone/DeviceConstants.qml
diff --git a/resources/qml/Governikus/Global/+mobile/+android/+tablet/DeviceConstants.qml b/resources/qml/Governikus/Global/+mobile/+android/+tablet/DeviceConstants.qml
diff --git a/resources/qml/Governikus/Global/+mobile/+android/BrandConstants.qml b/resources/qml/Governikus/Global/+mobile/+android/BrandConstants.qml
diff --git a/resources/qml/Governikus/Global/+mobile/+android/ConfirmationPopup.qml b/resources/qml/Governikus/Global/+mobile/+android/ConfirmationPopup.qml
diff --git a/resources/qml/Governikus/Global/+mobile/+android/SearchBar.qml b/resources/qml/Governikus/Global/+mobile/+android/SearchBar.qml
diff --git a/resources/qml/Governikus/Global/+mobile/+ios/+phone/DeviceConstants.qml b/resources/qml/Governikus/Global/+mobile/+ios/+phone/DeviceConstants.qml
diff --git a/resources/qml/Governikus/Global/+mobile/+ios/+tablet/DeviceConstants.qml b/resources/qml/Governikus/Global/+mobile/+ios/+tablet/DeviceConstants.qml
diff --git a/resources/qml/Governikus/Global/+mobile/+ios/BrandConstants.qml b/resources/qml/Governikus/Global/+mobile/+ios/BrandConstants.qml
diff --git a/resources/qml/Governikus/Global/+mobile/+ios/ConfirmationPopup.qml b/resources/qml/Governikus/Global/+mobile/+ios/ConfirmationPopup.qml
diff --git a/resources/qml/Governikus/Global/+mobile/+ios/SearchBar.qml b/resources/qml/Governikus/Global/+mobile/+ios/SearchBar.qml
diff --git a/resources/qml/Governikus/Global/+mobile/GCollapsibleSubButton.qml b/resources/qml/Governikus/Global/+mobile/GCollapsibleSubButton.qml
diff --git a/resources/qml/Governikus/Global/+mobile/GOptionsContainer.qml b/resources/qml/Governikus/Global/+mobile/GOptionsContainer.qml
diff --git a/resources/qml/Governikus/Global/+mobile/GPane.qml b/resources/qml/Governikus/Global/+mobile/GPane.qml
diff --git a/resources/qml/Governikus/Global/+mobile/GSwitch.qml b/resources/qml/Governikus/Global/+mobile/GSwitch.qml
diff --git a/resources/qml/Governikus/Global/Hint.qml → ...es/qml/Governikus/Global/+mobile/Hint.qml b/resources/qml/Governikus/Global/Hint.qml → ...es/qml/Governikus/Global/+mobile/Hint.qml
diff --git a/resources/qml/Governikus/Global/+mobile/IosBackGestureMouseArea.qml b/resources/qml/Governikus/Global/+mobile/IosBackGestureMouseArea.qml
diff --git a/resources/qml/Governikus/Global/+mobile/LabeledSwitch.qml b/resources/qml/Governikus/Global/+mobile/LabeledSwitch.qml
diff --git a/resources/qml/Governikus/Global/+mobile/ListItem.qml b/resources/qml/Governikus/Global/+mobile/ListItem.qml
diff --git a/resources/qml/Governikus/Global/+mobile/MenuItem.qml b/resources/qml/Governikus/Global/+mobile/MenuItem.qml
diff --git a/resources/qml/Governikus/Global/+mobile/PaneTitle.qml b/resources/qml/Governikus/Global/+mobile/PaneTitle.qml
diff --git a/resources/qml/Governikus/Global/+mobile/PlatformConstants.qml b/resources/qml/Governikus/Global/+mobile/PlatformConstants.qml
diff --git a/resources/qml/Governikus/Global/+mobile/SwipeActionDelegate.qml b/resources/qml/Governikus/Global/+mobile/SwipeActionDelegate.qml
diff --git a/resources/qml/Governikus/Global/+mobile/TitledSeparator.qml b/resources/qml/Governikus/Global/+mobile/TitledSeparator.qml
diff --git a/resources/qml/Governikus/Global/+qt5/RegExpValidatorCompat.qml b/resources/qml/Governikus/Global/+qt5/RegExpValidatorCompat.qml
diff --git a/resources/qml/Governikus/Global/+qt6/RegExpValidatorCompat.qml b/resources/qml/Governikus/Global/+qt6/RegExpValidatorCompat.qml
diff --git a/resources/qml/Governikus/Global/BaseConfirmationPopup.qml b/resources/qml/Governikus/Global/BaseConfirmationPopup.qml
diff --git a/resources/qml/Governikus/Global/Category.qml b/resources/qml/Governikus/Global/Category.qml
diff --git a/resources/qml/Governikus/Global/Constants.qml b/resources/qml/Governikus/Global/Constants.qml
diff --git a/resources/qml/Governikus/Global/Crossed.qml b/resources/qml/Governikus/Global/Crossed.qml
diff --git a/resources/qml/Governikus/Global/GBusyIndicator.qml b/resources/qml/Governikus/Global/GBusyIndicator.qml
diff --git a/resources/qml/Governikus/Global/GButton.qml b/resources/qml/Governikus/Global/GButton.qml
diff --git a/resources/qml/Governikus/Global/GCheckBox.qml b/resources/qml/Governikus/Global/GCheckBox.qml
diff --git a/resources/qml/Governikus/Global/GCollapsible.qml b/resources/qml/Governikus/Global/GCollapsible.qml
diff --git a/resources/qml/Governikus/Global/GComboBox.qml b/resources/qml/Governikus/Global/GComboBox.qml
diff --git a/resources/qml/Governikus/Global/GConicalGradient.qml b/resources/qml/Governikus/Global/GConicalGradient.qml
diff --git a/resources/qml/Governikus/Global/GControl.qml b/resources/qml/Governikus/Global/GControl.qml
diff --git a/resources/qml/Governikus/Global/GDropShadow.qml b/resources/qml/Governikus/Global/GDropShadow.qml
diff --git a/resources/qml/Governikus/Global/GDropShadow_6.5.qml b/resources/qml/Governikus/Global/GDropShadow_6.5.qml
diff --git a/resources/qml/Governikus/Global/GFlickable.qml b/resources/qml/Governikus/Global/GFlickable.qml
diff --git a/resources/qml/Governikus/Global/GFlickableColumnLayout.qml b/resources/qml/Governikus/Global/GFlickableColumnLayout.qml
diff --git a/resources/qml/Governikus/Global/GGridView.qml b/resources/qml/Governikus/Global/GGridView.qml
diff --git a/resources/qml/Governikus/Global/GInformativeButton.qml b/resources/qml/Governikus/Global/GInformativeButton.qml
diff --git a/resources/qml/Governikus/Global/GListView.qml b/resources/qml/Governikus/Global/GListView.qml
diff --git a/resources/qml/Governikus/Global/GPaneBackground.qml b/resources/qml/Governikus/Global/GPaneBackground.qml
diff --git a/resources/qml/Governikus/Global/GPaneBackgroundDelegate.qml b/resources/qml/Governikus/Global/GPaneBackgroundDelegate.qml
diff --git a/resources/qml/Governikus/Global/GProgressBar.qml b/resources/qml/Governikus/Global/GProgressBar.qml
diff --git a/resources/qml/Governikus/Global/GRadioButton.qml b/resources/qml/Governikus/Global/GRadioButton.qml
diff --git a/resources/qml/Governikus/Global/GRepeater.qml b/resources/qml/Governikus/Global/GRepeater.qml
diff --git a/resources/qml/Governikus/Global/GScrollBar.qml b/resources/qml/Governikus/Global/GScrollBar.qml
diff --git a/resources/qml/Governikus/Global/GSeparator.qml b/resources/qml/Governikus/Global/GSeparator.qml
diff --git a/resources/qml/Governikus/Global/GSpacer.qml b/resources/qml/Governikus/Global/GSpacer.qml