Refactored Exchange to IThemesExchange. Fixes issues #82 and #84