2.03.0:schwarherz:1

fixed missing brackets, made one change in the CB file to make it match
vanilla. (if that last part messes something up please just manually
change the code, don't revert the commit)