cleanup y remove theme wrapping