[#83303294] fixes for etc theme