Remove todo
Renamed things to "themes"