Move theme wrapper into separate file