Refactor: [ready] for [theme integration]