Moved parts of Marketplace into theme