Themes in Core v1

Fresh branch from a clean master
This is now `options`