Move themes to seperate addon