Template parts, theme refactoring, moderniser, touch device refinements