Complete rework while hoppefully waiting for TUI version

Merge request reports

Loading