Thesis: Unified numbering of everything within chapter