Themes in Core v1

Fresh branch from a clean master
Missing type