More Kate swap files, Moved tolerance to controls.h, Some shift functons

Check this before you merge