Fix more conflicts, enable transulecent bars