Pull in new Kalatheme 3.x commits