Near finished the theme picker stuff