sync w/ kate.git