Themes in Core v1

Fresh branch from a clean master
Does this change belong here?