Separate the themes functionality out into the Content module