Sync latest changes, use kindlegen