Updates
- bump thus
- bump calamares
- bump menda-icon-themes
Fix merge conflict