thesis: Rewrite theory part