Refactor the overlay to make it themable