Merge "Ensure correct themes for Pia in dark mode" into main