Move theme type test to TypeServiceProvider test
Update theme type definition to make its import and export more flexible