Theme: refactor loading