Moved all apitypes types into each of the api_ definitions
Added support for user-configurable themes