diff --git a/packages/app/__mocks__/@nuclear/core.ts b/packages/app/__mocks__/@nuclear/core.ts
index ee18e2ee47..e7e152d51e 100644
--- a/packages/app/__mocks__/@nuclear/core.ts
+++ b/packages/app/__mocks__/@nuclear/core.ts
@@ -66,8 +66,6 @@ module.exports = {
       urlSearch: jest.fn().mockResolvedValue([]),
       liveStreamSearch: jest.fn().mockResolvedValue([])
     },
-    NuclearPlaylistsService: jest.requireActual('@nuclear/core/src/rest/Nuclear/Playlists').NuclearPlaylistsService,
-    NuclearStreamMappingsService: jest.requireActual('@nuclear/core/src/rest/Nuclear/StreamMappings').NuclearStreamMappingsService,
     Deezer: {
       ...jest.requireActual('@nuclear/core/src/rest/Deezer'),
       getEditorialCharts: jest.fn().mockResolvedValue({
diff --git a/packages/app/app/actions/actionTypes.ts b/packages/app/app/actions/actionTypes.ts
index 8728d865b9..bf754a88fc 100644
--- a/packages/app/app/actions/actionTypes.ts
+++ b/packages/app/app/actions/actionTypes.ts
@@ -20,15 +20,14 @@ export enum Search {
   ALBUM_INFO_SEARCH_START = 'ALBUM_INFO_SEARCH_START',
   ALBUM_INFO_SEARCH_SUCCESS = 'ALBUM_INFO_SEARCH_SUCCESS',
   ALBUM_INFO_SEARCH_ERROR = 'ALBUM_INFO_SEARCH_ERROR',
-  PODCAST_SEARCH_SUCCESS = 'PODCAST_SEARCH_SUCCESS',
   ARTIST_INFO_SEARCH_START = 'ARTIST_INFO_SEARCH_START',
   ARTIST_INFO_SEARCH_SUCCESS = 'ARTIST_INFO_SEARCH_SUCCESS',
   ARTIST_INFO_SEARCH_ERROR = 'ARTIST_INFO_SEARCH_ERROR',
   ARTIST_RELEASES_SEARCH_START = 'ARTIST_RELEASES_SEARCH_START',
   ARTIST_RELEASES_SEARCH_SUCCESS = 'ARTIST_RELEASES_SEARCH_SUCCESS',
   ARTIST_RELEASES_SEARCH_ERROR = 'ARTIST_RELEASES_SEARCH_ERROR',
-  LASTFM_TRACK_SEARCH_START = 'LASTFM_TRACK_SEARCH_START',
-  LASTFM_TRACK_SEARCH_SUCCESS = 'LASTFM_TRACK_SEARCH_SUCCESS',
+  TRACK_SEARCH_START = 'TRACK_SEARCH_START',
+  TRACK_SEARCH_ERROR = 'TRACK_SEARCH_ERROR',
   TRACK_SEARCH_SUCCESS = 'TRACK_SEARCH_SUCCESS',
   YOUTUBE_PLAYLIST_SEARCH_START = 'YOUTUBE_PLAYLIST_SEARCH_START',
   YOUTUBE_PLAYLIST_SEARCH_SUCCESS = 'YOUTUBE_PLAYLIST_SEARCH_SUCCESS',
@@ -62,10 +61,6 @@ export enum Playlists {
   LOAD_LOCAL_PLAYLISTS_SUCCESS = 'LOAD_LOCAL_PLAYLISTS_SUCCESS',
   LOAD_LOCAL_PLAYLISTS_ERROR = 'LOAD_LOCAL_PLAYLISTS_ERROR',
   UPDATE_LOCAL_PLAYLISTS = 'UPDATE_LOCAL_PLAYLISTS',
-
-  LOAD_REMOTE_PLAYLISTS_START = 'LOAD_REMOTE_PLAYLISTS_START',
-  LOAD_REMOTE_PLAYLISTS_SUCCESS = 'LOAD_REMOTE_PLAYLISTS_SUCCESS',
-  LOAD_REMOTE_PLAYLISTS_ERROR = 'LOAD_REMOTE_PLAYLISTS_ERROR',
 }
 
 export enum ImportFavs {
diff --git a/packages/app/app/actions/nuclear/identity.ts b/packages/app/app/actions/nuclear/identity.ts
deleted file mode 100644
index 23cda1d547..0000000000
--- a/packages/app/app/actions/nuclear/identity.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { createAsyncAction, createStandardAction } from 'typesafe-actions';
-
-import {
-  SignInResponseBody,
-  SignUpResponseBody
-} from '@nuclear/core/src/rest/Nuclear/Identity.types';
-import { ErrorBody } from '@nuclear/core/src/rest/Nuclear/types';
-
-import { NuclearIdentity } from '../actionTypes';
-
-export const signUpAction = createAsyncAction(
-  NuclearIdentity.SIGN_UP_START,
-  NuclearIdentity.SIGN_UP_SUCCESS,
-  NuclearIdentity.SIGN_UP_ERROR
-)<undefined, SignUpResponseBody, ErrorBody>();
-
-export const signInAction = createAsyncAction(
-  NuclearIdentity.SIGN_IN_START,
-  NuclearIdentity.SIGN_IN_SUCCESS,
-  NuclearIdentity.SIGN_IN_ERROR
-)<undefined, SignInResponseBody, ErrorBody>();
-
-export const signOutAction = createStandardAction(NuclearIdentity.SIGN_OUT)<undefined>();
diff --git a/packages/app/app/actions/playlists.ts b/packages/app/app/actions/playlists.ts
index f42eedff92..796b16f7a2 100644
--- a/packages/app/app/actions/playlists.ts
+++ b/packages/app/app/actions/playlists.ts
@@ -3,9 +3,7 @@ import { v4 } from 'uuid';
 import { createAsyncAction, createStandardAction } from 'typesafe-actions';
 import { ipcRenderer } from 'electron';
 
-import { store, PlaylistHelper, Playlist, PlaylistTrack, rest, IpcEvents } from '@nuclear/core';
-import { GetPlaylistsByUserIdResponseBody } from '@nuclear/core/src/rest/Nuclear/Playlists.types';
-import { ErrorBody } from '@nuclear/core/src/rest/Nuclear/types';
+import { store, PlaylistHelper, Playlist, PlaylistTrack, IpcEvents } from '@nuclear/core';
 
 import { Playlists } from './actionTypes';
 
@@ -15,7 +13,6 @@ import {
   updatePlaylistsOrderEffect
 } from './playlists.effects';
 import { success, error } from './toasts';
-import { IdentityStore } from '../reducers/nuclear/identity';
 import { PlaylistsStore } from '../reducers/playlists';
 import { isEmpty } from 'lodash';
 
@@ -27,12 +24,6 @@ export const loadLocalPlaylistsAction = createAsyncAction(
   Playlists.LOAD_LOCAL_PLAYLISTS_ERROR
 )<void, Array<Playlist>, void>();
 
-export const loadRemotePlaylistsAction = createAsyncAction(
-  Playlists.LOAD_REMOTE_PLAYLISTS_START,
-  Playlists.LOAD_REMOTE_PLAYLISTS_SUCCESS,
-  Playlists.LOAD_REMOTE_PLAYLISTS_ERROR
-)<void, GetPlaylistsByUserIdResponseBody, ErrorBody>();
-
 export const addPlaylist = (tracks: Array<PlaylistTrack>, name: string) => dispatch => {
   if (name?.length === 0) {
     return;
@@ -62,30 +53,6 @@ export const loadLocalPlaylists = () => dispatch => {
   }
 };
 
-
-export const loadRemotePlaylists = ({ token, signedInUser }: IdentityStore) => async (dispatch, getState) => {
-  dispatch(loadRemotePlaylistsAction.request());
-  const { settings } = getState();
-  const service = new rest.NuclearPlaylistsService(
-    settings.nuclearPlaylistsServiceUrl
-  );
-
-  try {
-    if (token) {
-      const playlists = await service.getPlaylistsByUserId(token, signedInUser.id);
-      if (playlists.ok) {
-        dispatch(loadRemotePlaylistsAction.success(playlists.body as GetPlaylistsByUserIdResponseBody));
-      } else {
-        throw playlists.body;
-      }
-    } else {
-      throw new Error('No token');
-    }
-  } catch (e) {
-    dispatch(loadRemotePlaylistsAction.failure(e.message));
-  }
-};
-
 export const updatePlaylist = (playlist: Playlist) => dispatch => {
   const playlists = updatePlaylistEffect(store)(playlist);
   dispatch(updatePlaylistsAction(playlists));
diff --git a/packages/app/app/actions/queue.ts b/packages/app/app/actions/queue.ts
index a331378523..51c8837e41 100644
--- a/packages/app/app/actions/queue.ts
+++ b/packages/app/app/actions/queue.ts
@@ -3,7 +3,9 @@ import { isEmpty, isString, find } from 'lodash';
 import { createStandardAction } from 'typesafe-actions';
 import { v4 } from 'uuid';
 
-import { rest, StreamProvider } from '@nuclear/core';
+import { StreamProvider } from '@nuclear/core';
+import StreamProviderPlugin from '@nuclear/core/src/plugins/streamProvider';
+import { Nuclear } from '@nuclear/core/src/rest';
 import { getTrackArtist, getTrackTitle } from '@nuclear/ui';
 import { Track } from '@nuclear/ui/lib/types';
 
@@ -13,8 +15,6 @@ import { QueueItem, TrackStream } from '../reducers/queue';
 import { RootState } from '../reducers';
 import { LocalLibraryState } from './local';
 import { Queue } from './actionTypes';
-import StreamProviderPlugin from '@nuclear/core/src/plugins/streamProvider';
-import { isSuccessCacheEntry } from '@nuclear/core/src/rest/Nuclear/StreamMappings';
 import { queue as queueSelector } from '../selectors/queue';
 import { error } from './toasts';
 import { random } from 'lodash';
@@ -200,7 +200,7 @@ const verifyStreamWithService = async (
   }
 
   try {
-    const StreamMappingsService = rest.NuclearStreamMappingsService.get(process.env.NUCLEAR_VERIFICATION_SERVICE_URL);
+    const StreamMappingsService = Nuclear.NuclearStreamMappingsService.get(process.env.NUCLEAR_VERIFICATION_SERVICE_URL);
     const topStream = await StreamMappingsService.getTopStream(
       getTrackArtist(track),
       getTrackTitle(track),
@@ -208,7 +208,7 @@ const verifyStreamWithService = async (
       settings?.userId
     );
 
-    if (!isSuccessCacheEntry(topStream)) {
+    if (!Nuclear.isSuccessCacheEntry(topStream)) {
       return streamData;
     }
 
diff --git a/packages/app/app/actions/search.ts b/packages/app/app/actions/search.ts
index a154bb9a70..26bbe2bd56 100644
--- a/packages/app/app/actions/search.ts
+++ b/packages/app/app/actions/search.ts
@@ -1,18 +1,14 @@
 import { logger } from '@nuclear/core';
 import { rest } from '@nuclear/core';
-import _, { isString } from 'lodash';
-import artPlaceholder from '../../resources/media/art_placeholder.png';
-import globals from '../globals';
+import _ from 'lodash';
 import { error } from './toasts';
 import { Search } from './actionTypes';
 import { History } from 'history';
 import { RootState } from '../reducers';
-import { AlbumDetails, ArtistDetails, SearchResultsAlbum, SearchResultsArtist, SearchResultsPodcast, SearchResultsSource } from '@nuclear/core/src/plugins/plugins.types';
-import { createStandardAction } from 'typesafe-actions';
-import { LastfmTrackMatch, LastfmTrackMatchInternal } from '@nuclear/core/src/rest/Lastfm.types';
+import { AlbumDetails, ArtistDetails, SearchResultsAlbum, SearchResultsArtist, SearchResultsSource, SearchResultsTrack } from '@nuclear/core/src/plugins/plugins.types';
+import { createAsyncAction, createStandardAction } from 'typesafe-actions';
 import { YoutubeResult } from '@nuclear/core/src/rest/Youtube';
-
-const lastfm = new rest.LastFmApi(globals.lastfmApiKey, globals.lastfmApiSecret);
+import { getTrackArtist } from '@nuclear/ui';
 
 export const SearchActions = {
   unifiedSearchStart: createStandardAction(Search.UNIFIED_SEARCH_START)<string>(),
@@ -28,7 +24,7 @@ export const SearchActions = {
     };
   }),
   youtubeLiveStreamSearchStart: createStandardAction(Search.YOUTUBE_LIVESTREAM_SEARCH_START)<string>(),
-  youtubeLiveStreamSearchSuccess: createStandardAction(Search.YOUTUBE_LIVESTREAM_SEARCH_SUCCESS).map((id: string, info: YoutubeResult[]) => {
+  youtubeLiveStreamSearchSuccess: createStandardAction(Search.YOUTUBE_LIVESTREAM_SEARCH_SUCCESS).map((id: string, info: SearchResultsTrack[]) => {
     return {
       payload: {
         id,
@@ -68,19 +64,8 @@ export const SearchActions = {
       }
     };
   }),
-  podcastSearchSuccess: createStandardAction(Search.PODCAST_SEARCH_SUCCESS)<SearchResultsPodcast[]>(),
   setSearchDropdownVisibility: createStandardAction(Search.SEARCH_DROPDOWN_DISPLAY_CHANGE)<boolean>(),
   updateSearchHistory: createStandardAction(Search.UPDATE_SEARCH_HISTORY)<string[]>(),
-  lastFmTrackSearchStart: createStandardAction(Search.LASTFM_TRACK_SEARCH_START)<string>(),
-  lastFmTrackSearchSuccess: createStandardAction(Search.LASTFM_TRACK_SEARCH_SUCCESS).map((terms: string, searchResults: LastfmTrackMatchInternal[]) => {
-    return {
-      payload: {
-        id: terms,
-        info: searchResults
-      }
-    };
-  }),
-  trackSearchSuccess: createStandardAction(Search.TRACK_SEARCH_SUCCESS)<SearchResultsAlbum[]>(),
   artistSearchSuccess: createStandardAction(Search.ARTIST_SEARCH_SUCCESS)<SearchResultsArtist[]>(),
   artistInfoStart: createStandardAction(Search.ARTIST_INFO_SEARCH_START)<string>(),
   artistInfoSuccess: createStandardAction(Search.ARTIST_INFO_SEARCH_SUCCESS).map((artistId: string, info: ArtistDetails) => {
@@ -121,7 +106,12 @@ export const SearchActions = {
         error
       }
     };
-  })
+  }),
+  trackSearchAction: createAsyncAction(
+    Search.TRACK_SEARCH_START,
+    Search.TRACK_SEARCH_SUCCESS,
+    Search.TRACK_SEARCH_ERROR
+  )<undefined, SearchResultsTrack[], undefined>()
 };
 
 
@@ -131,9 +121,12 @@ const getSelectedMetaProvider = (getState: () => RootState, wantedProvider: Sear
       plugins: { metaProviders }, selected }
   } = getState();
 
-  return wantedProvider ?
+  const selectedProvider = wantedProvider ?
     _.find(metaProviders, { searchName: wantedProvider }) :
     _.find(metaProviders, { sourceName: selected.metaProviders });
+
+
+  return selectedProvider || _.find(metaProviders, { isDefault: true }) || null;
 };
 
 export const artistSearch = (terms: string) => async (dispatch, getState: () => RootState) => {
@@ -149,57 +142,17 @@ export const albumSearch = (terms: string) => async (dispatch, getState: () => R
 };
 
 export const trackSearch = (terms: string) => async (dispatch, getState: () => RootState) => {
-  const selectedProvider = getSelectedMetaProvider(getState);
-  const results = await selectedProvider.searchForTracks(terms);
-  dispatch(SearchActions.trackSearchSuccess(results));
-};
-
-export const podcastSearch = (terms: string) => async (dispatch, getState: () => RootState) => {
-  const selectedProvider = getSelectedMetaProvider(getState);
-  const results = await selectedProvider.searchForPodcast(terms);
-  dispatch(SearchActions.podcastSearchSuccess(results));
-};
-
-
-const isAcceptableLastFMThumbnail = (thumbnail: string) =>
-  !(/https?:\/\/lastfm-img\d.akamaized.net\/i\/u\/\d+s\/2a96cbd8b46e442fc41c2b86b821562f\.png/.test(thumbnail));
-
-const getTrackThumbnail = (track: LastfmTrackMatch) => {
-  const image =
-    _.get(
-      track,
-      ['image', 1, '#text'],
-      _.get(
-        track,
-        ['image', 0, '#text'],
-        artPlaceholder
-      )
-    );
-  
-  return !isString(image) ? artPlaceholder : isAcceptableLastFMThumbnail(image) ? image : artPlaceholder;
+  dispatch(SearchActions.trackSearchAction.request());
+  try {
+    const selectedProvider = getSelectedMetaProvider(getState);
+    const results = await selectedProvider.searchForTracks(terms);
+    dispatch(SearchActions.trackSearchAction.success(results));
+  } catch (e) {
+    logger.error(e);
+    dispatch(SearchActions.trackSearchAction.failure());
+  }
 };
 
-export const mapLastFMTrackToInternal = (track: LastfmTrackMatch) => ({
-  ...track,
-  thumbnail: getTrackThumbnail(track)
-});
-
-export function lastFmTrackSearch(terms: string) {
-  return dispatch => {
-    dispatch(SearchActions.lastFmTrackSearchStart(terms));
-    Promise.all([lastfm.searchTracks(terms)])
-      .then(results => Promise.all(results.map(info => info.json())))
-      .then(results => {
-        dispatch(
-          SearchActions.lastFmTrackSearchSuccess(terms, _.get(results[0], 'results.trackmatches.track', []).map(mapLastFMTrackToInternal))
-        );
-      })
-      .catch(error => {
-        logger.error(error);
-      });
-  };
-}
-
 export function youtubePlaylistSearch(terms: string) {
   return dispatch => {
     dispatch(SearchActions.youtubePlaylistSearchStart(terms));
@@ -218,7 +171,13 @@ export function youtubePlaylistSearch(terms: string) {
 export const youtubeLiveStreamSearch = (terms: string) => async (dispatch) => {
   dispatch(SearchActions.youtubeLiveStreamSearchStart(terms));
   try {
-    const results = await rest.Youtube.liveStreamSearch(terms);
+    const results = (await rest.Youtube.liveStreamSearch(terms)).map(el => ({
+      id: el.streams[0].id,
+      title: el.name,
+      artist: getTrackArtist(el),
+      thumb: el.thumbnail,
+      source: SearchResultsSource.Youtube
+    }) satisfies SearchResultsTrack);
     dispatch(SearchActions.youtubeLiveStreamSearchSuccess(terms, results));
   } catch (e) {
     logger.error(e);
@@ -233,8 +192,7 @@ export function unifiedSearch(terms: string, history: History) {
     Promise.all([
       dispatch(albumSearch(terms)),
       dispatch(artistSearch(terms)),
-      dispatch(podcastSearch(terms)),
-      dispatch(lastFmTrackSearch(terms)),
+      dispatch(trackSearch(terms)),
       dispatch(youtubePlaylistSearch(terms)),
       dispatch(youtubeLiveStreamSearch(terms))
     ])
@@ -251,28 +209,28 @@ export function unifiedSearch(terms: string, history: History) {
   };
 }
 
-export const albumInfoSearch = (albumId: string, releaseType: 'master' | 'release' = 'master', release: SearchResultsAlbum) => async (dispatch, getState:() => RootState) => {
-  dispatch(SearchActions.albumInfoStart(albumId));
+export const albumInfoSearch = (release: SearchResultsAlbum) => async (dispatch, getState:() => RootState) => {
+  dispatch(SearchActions.albumInfoStart(release.id));
   try {
     const selectedProvider = getSelectedMetaProvider(getState);
-    const albumDetails = await selectedProvider.fetchAlbumDetails(albumId, releaseType, release?.resourceUrl);
-    dispatch(SearchActions.albumInfoSuccess(albumId, albumDetails));
+    const albumDetails = await selectedProvider.fetchAlbumDetails(release.id, release.type, release?.resourceUrl);
+    dispatch(SearchActions.albumInfoSuccess(release.id, albumDetails));
   } catch (e) {
     logger.error(e);
-    dispatch(SearchActions.albumInfoError(albumId, e));
+    dispatch(SearchActions.albumInfoError(release.id, e));
   }
 };
 
 
-export const artistInfoSearch = (artistId: string, artist: SearchResultsArtist) => async (dispatch, getState: () => RootState) => {
-  dispatch(SearchActions.artistInfoStart(artistId));
+export const artistInfoSearch = (artist: SearchResultsArtist) => async (dispatch, getState: () => RootState) => {
+  dispatch(SearchActions.artistInfoStart(artist.id));
   try {
     const selectedProvider = getSelectedMetaProvider(getState, artist?.source);
-    const artistDetails = await selectedProvider.fetchArtistDetails(artistId);
-    dispatch(SearchActions.artistInfoSuccess(artistId, artistDetails));
+    const artistDetails = await selectedProvider.fetchArtistDetails(artist.id);
+    dispatch(SearchActions.artistInfoSuccess(artist.id, artistDetails));
   } catch (e) {
     logger.error(e);
-    dispatch(SearchActions.artistInfoError(artistId, e));
+    dispatch(SearchActions.artistInfoError(artist.id, e));
   }
 };
 
diff --git a/packages/app/app/components/ArtistView/ArtistHeader/index.tsx b/packages/app/app/components/ArtistView/ArtistHeader/index.tsx
index db341a0845..b4a3327495 100644
--- a/packages/app/app/components/ArtistView/ArtistHeader/index.tsx
+++ b/packages/app/app/components/ArtistView/ArtistHeader/index.tsx
@@ -24,6 +24,9 @@ export const ArtistHeader: React.FC<ArtistHeaderProps> = ({
   addFavoriteArtist
 }) => {
   const { t }= useTranslation('artist');
+
+  const avatar = artist.thumb ?? artist.images?.[1] ?? artPlaceholder;
+
   return <div className={styles.artist_header_overlay}>
     <div className={styles.artist_header_container}>
       {
@@ -31,8 +34,7 @@ export const ArtistHeader: React.FC<ArtistHeaderProps> = ({
         <div
           className={styles.artist_avatar}
           style={{
-            background: `url('${get(artist, 'images[1]', artPlaceholder)
-            }')`,
+            background: `url('${avatar}')`,
             backgroundRepeat: 'noRepeat',
             backgroundPosition: 'center',
             backgroundSize: 'cover'
diff --git a/packages/app/app/components/ArtistView/PopularTracks/index.tsx b/packages/app/app/components/ArtistView/PopularTracks/index.tsx
index 04654fad95..d1cec01e13 100644
--- a/packages/app/app/components/ArtistView/PopularTracks/index.tsx
+++ b/packages/app/app/components/ArtistView/PopularTracks/index.tsx
@@ -11,7 +11,6 @@ import { TextCell } from '@nuclear/ui/lib/components/GridTrackTable/Cells/TextCe
 import { Track } from '@nuclear/ui/lib/types';
 
 import TrackTableContainer from '../../../containers/TrackTableContainer';
-import trackRowStyles from '../../TrackRow/styles.scss';
 import styles from './styles.scss';
 
 type AddAllButtonProps = {
@@ -79,8 +78,7 @@ const PopularTracks: React.FC<PopularTracksProps> = ({
   return (
     !_.isEmpty(tracks) &&
       <div className={cx(
-        styles.popular_tracks_container,
-        trackRowStyles.tracks_container
+        styles.popular_tracks_container
       )}>
         <div className={styles.header}>{t('popular-tracks')}</div>
         <AddAllButton 
diff --git a/packages/app/app/components/ArtistView/index.tsx b/packages/app/app/components/ArtistView/index.tsx
index 4a8e9159b0..51e7d119c6 100644
--- a/packages/app/app/components/ArtistView/index.tsx
+++ b/packages/app/app/components/ArtistView/index.tsx
@@ -22,7 +22,7 @@ type ArtistViewProps = {
   isFavorite: boolean;
   addTrackToQueue: (item: any) => Promise<void>;
   artistInfoSearchByName: (artistName: string) => Promise<void>;
-  albumInfoSearch: (albumId: string, releaseType: ReleaseTypeProps, release: SearchResultsAlbum) => Promise<void>;
+  albumInfoSearch: (release: SearchResultsAlbum) => Promise<void>;
   removeFavoriteArtist: React.MouseEventHandler;
   addFavoriteArtist: React.MouseEventHandler;
 }
@@ -42,7 +42,7 @@ const ArtistView: React.FC<ArtistViewProps> = ({
   const isOnTour = () => artist.onTour || false;
   const areReleasesLoading = () => artist.releasesLoading || isLoading();
   const onAlbumClick = (album) => {
-    albumInfoSearch(album.id, album.type, album);
+    albumInfoSearch(album);
     history.push('/album/' + album.id);
   };
 
diff --git a/packages/app/app/components/LibraryView/index.js b/packages/app/app/components/LibraryView/index.js
index 3d1c87e796..aa23be6aeb 100644
--- a/packages/app/app/components/LibraryView/index.js
+++ b/packages/app/app/components/LibraryView/index.js
@@ -6,7 +6,6 @@ import { LIST_TYPE } from '@nuclear/ui/lib/components/LibraryListTypeToggle';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import EmptyState from './EmptyState';
-import trackRowStyles from '../TrackRow/styles.scss';
 import styles from './index.scss';
 import NoSearchResults from './NoSearchResults';
 import LibrarySimpleList from './LibrarySimpleList';
@@ -89,7 +88,7 @@ const LibraryView = ({
               <EmptyState />
             )
           ) : (
-            <Segment inverted className={trackRowStyles.tracks_container}>
+            <Segment inverted>
               <Dimmer active={pending} loading={pending.toString()} />
 
               {!pending && listType === LIST_TYPE.SIMPLE_LIST && (
diff --git a/packages/app/app/components/SearchResults/AllResults/index.js b/packages/app/app/components/SearchResults/AllResults/index.js
deleted file mode 100644
index 0e7e303966..0000000000
--- a/packages/app/app/components/SearchResults/AllResults/index.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import React from 'react';
-import _ from 'lodash';
-import { Card } from '@nuclear/ui';
-
-import artPlaceholder from '../../../../resources/media/art_placeholder.png';
-
-import PlaylistResults from '../PlaylistResults';
-import TracksResults from '../TracksResults';
-
-import styles from './styles.scss';
-import { withTranslation } from 'react-i18next';
-
-@withTranslation('search')
-class AllResults extends React.Component {
-  constructor(props) {
-    super(props);
-  }
-  renderResults(collection, onClick) {
-    const selectedProvider = _.find(this.props.metaProviders, { sourceName: this.props.selectedPlugins.metaProviders });
-
-    return collection.slice(0, 5).map((el, i) => {
-      const id = _.get(el, `ids.${selectedProvider.searchName}`, el.id);
-
-      return (
-        <Card
-          small
-          header={el.title || el.name}
-          image={
-            el.coverImage ||
-            el.thumb ||
-            el.thumbnail ||
-            artPlaceholder
-          }
-          content={el.artist}
-          onClick={() => onClick(id, el.type, el)}
-          key={'item-' + i}
-        />
-      );
-    });
-  }
-
-  renderTracks(arr = [], limit = 5) {
-    return (<TracksResults
-      clearQueue={this.props.clearQueue}
-      addToQueue={this.props.addToQueue}
-      startPlayback={this.props.startPlayback}
-      selectSong={this.props.selectSong}
-      tracks={arr}
-      limit={limit}
-      streamProviders={this.props.streamProviders}
-    />);
-
-  }
-
-  renderPlaylistSection = () =>
-    <div className={styles.column}>
-      <h3>{this.props.t('playlist', { count: this.props.playlistSearchResults.length })}</h3>
-      <div className={styles.row}>
-        <PlaylistResults
-          playlistSearchStarted={this.props.playlistSearchStarted}
-          playlistSearchResults={this.props.playlistSearchResults}
-          addToQueue={this.props.addToQueue}
-          clearQueue={this.props.clearQueue}
-          startPlayback={this.props.startPlayback}
-          selectSong={this.props.selectSong}
-          streamProviders={this.props.streamProviders}
-        />
-      </div>
-    </div>
-
-  renderSection(title, collection, onClick) {
-    return (<div className={styles.column}>
-      <h3>{title}</h3>
-      <div className={styles.row}>
-        {this.renderResults(
-          collection,
-          onClick
-        )}
-      </div>
-    </div>);
-  }
-
-  renderArtistsSection() {
-    const { t, artistSearchResults, artistInfoSearch } = this.props;
-
-    return this.renderSection(t('artist', { count: artistSearchResults.length }), artistSearchResults, artistInfoSearch);
-  }
-
-  renderAlbumsSection() {
-    const { t, albumSearchResults, albumInfoSearch } = this.props;
-
-    return this.renderSection(t('album', { count: albumSearchResults.length }), albumSearchResults, albumInfoSearch);
-  }
-
-  renderTracksSection() {
-    return (<div className={styles.column}>
-      <h3>{this.props.t('track_plural')}</h3>
-      <div className={styles.row}>
-        {this.renderTracks(this.props.trackSearchResults.info)}
-      </div>
-    </div>);
-  }
-
-  render() {
-    const tracksLength = _.get(this.props.trackSearchResults, ['info', 'length'], 0);
-    const artistsLength = _.get(this.props.artistSearchResults, ['length'], 0);
-    const albumsLength = _.get(this.props.albumSearchResults, ['length'], 0);
-    const playlistsLength = _.get(this.props.playlistSearchResults, ['info', 'length'], 0);
-    if (tracksLength + artistsLength + albumsLength + playlistsLength === 0) {
-      return <div>{this.props.t('empty')}</div>;
-    }
-
-    return (
-      <div className={styles.all_results_container}>
-        {artistsLength > 0 && this.renderArtistsSection()}
-        {albumsLength > 0 && this.renderAlbumsSection()}
-        {tracksLength > 0 && this.renderTracksSection()}
-        {playlistsLength > 0 && this.renderPlaylistSection()}
-      </div>
-    );
-  }
-}
-
-export default AllResults;
diff --git a/packages/app/app/components/SearchResults/AllResults/index.tsx b/packages/app/app/components/SearchResults/AllResults/index.tsx
new file mode 100644
index 0000000000..0828568b45
--- /dev/null
+++ b/packages/app/app/components/SearchResults/AllResults/index.tsx
@@ -0,0 +1,133 @@
+import React, { FC } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'react-redux';
+import { Tab } from 'semantic-ui-react';
+
+import {
+  SearchResultsAlbum,
+  SearchResultsArtist
+} from '@nuclear/core/src/plugins/plugins.types';
+import { Card } from '@nuclear/ui';
+
+import { TracksResults } from '../TracksResults';
+import { searchSelectors } from '../../../selectors/search';
+import { SearchState } from '../../../reducers/search';
+import artPlaceholder from '../../../../resources/media/art_placeholder.png';
+import styles from './styles.scss';
+import parentStyles from '../styles.scss';
+
+
+type SearchCollection = SearchState[
+  | 'artistSearchResults'
+  | 'albumSearchResults'];
+
+type ResultsProps = {
+  collection: SearchCollection;
+  onClick: (
+    item: SearchResultsArtist | SearchResultsAlbum
+  ) => void;
+};
+const Results: FC<ResultsProps> = ({ collection, onClick }) => {
+  return (
+    <>
+      {collection.slice(0, 5).map((item, index) => (
+        <Card
+          header={item.title || item.name}
+          image={item.coverImage || item.thumb || item.thumbnail || artPlaceholder}
+          content={item.artist}
+          onClick={() => onClick(item)}
+          key={'item-' + index} />
+      ))}
+    </>
+  );
+};
+
+type ResultsSectionProps = {
+  title: string;
+  collection: SearchCollection;
+  onClick: (
+    item: SearchResultsArtist | SearchResultsAlbum) => void;
+};
+const ResultsSection: FC<ResultsSectionProps> = ({
+  title,
+  collection,
+  onClick
+}) => {
+  return (
+    <div className={styles.column}>
+      <h3>{title}</h3>
+      <div className={styles.row}>
+        <Results collection={collection} onClick={onClick} />
+      </div>
+    </div>
+  );
+};
+
+type AllResultsProps = {
+  artistInfoSearch?: (item: SearchResultsArtist) => void;
+  albumInfoSearch?: (item: SearchResultsAlbum) => void;
+  loading?: boolean;
+  attached?: boolean;
+};
+
+export const AllResults: FC<AllResultsProps> = ({
+  artistInfoSearch, 
+  albumInfoSearch, 
+  loading = false, 
+  attached = false
+}) => {
+  const { t } = useTranslation('search');
+  const artistSearchResults = useSelector(searchSelectors.artistSearchResults);
+  const albumSearchResults = useSelector(searchSelectors.albumSearchResults);
+  const trackSearchResults = useSelector(searchSelectors.trackSearchResults);
+
+  const tracksLength = trackSearchResults?.length || 0;
+  const artistsLength = artistSearchResults?.length || 0;
+  const albumsLength = albumSearchResults?.length || 0;
+
+  const content = () => {
+    if (artistsLength + albumsLength === 0) {
+      return <div>{t('empty')}</div>;
+    }
+
+    return (
+      <div className={styles.all_results_container}>
+        {artistsLength > 0 && (
+          <ResultsSection
+            title={t('artist', { count: artistSearchResults.length })}
+            collection={artistSearchResults}
+            onClick={artistInfoSearch}
+          />
+        )}
+        {albumsLength > 0 && (
+          <ResultsSection
+            title={t('album', { count: albumSearchResults.length })}
+            collection={albumSearchResults}
+            onClick={albumInfoSearch}
+          />
+        )}
+        {tracksLength > 0 && (
+          <div className={styles.column}>
+            <h3>{t('track_plural')}</h3>
+            <div className={styles.row}>
+              <TracksResults
+                tracks={trackSearchResults}
+                limit={5}
+              />
+            </div>
+          </div>
+        )}
+      </div>
+    );
+  };
+
+  return (
+    <Tab.Pane loading={loading} attached={attached}>
+      <div className={parentStyles.pane_container}>
+        <div className='row'>
+          {content()}
+        </div>
+      </div>
+    </Tab.Pane>
+  );
+};
diff --git a/packages/app/app/components/SearchResults/AllResults/styles.scss b/packages/app/app/components/SearchResults/AllResults/styles.scss
index 356f6f080a..936bade9d7 100644
--- a/packages/app/app/components/SearchResults/AllResults/styles.scss
+++ b/packages/app/app/components/SearchResults/AllResults/styles.scss
@@ -1,22 +1,23 @@
 .all_results_container {
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: space-around;
+  width: 100%;
+
+  .column {
     display: flex;
-    flex-flow: row wrap;
-    justify-content: space-around;
+    flex-flow: column;
     width: 100%;
 
-    .column {
-      display: flex;
-      flex-flow: column;
-      width: 100%;
-
-      h3 {
-        font-variant: small-caps;
-        margin: 1rem;
-      }
+    h3 {
+      font-variant: small-caps;
+      margin: 1rem;
+    }
 
-      .row {
-        display: flex;
-        flex-flow: row wrap;
-      }
+    .row {
+      display: flex;
+      flex-flow: row wrap;
+      flex: 1 1 auto;
     }
+  }
 }
diff --git a/packages/app/app/components/SearchResults/ItemResults.tsx b/packages/app/app/components/SearchResults/ItemResults.tsx
new file mode 100644
index 0000000000..3bcfbaea61
--- /dev/null
+++ b/packages/app/app/components/SearchResults/ItemResults.tsx
@@ -0,0 +1,64 @@
+import React from 'react';
+import { get } from 'lodash';
+import { Tab } from 'semantic-ui-react';
+
+import { 
+  SearchResultsAlbum, 
+  SearchResultsArtist 
+} from '@nuclear/core/src/plugins/plugins.types';
+import { Card } from '@nuclear/ui';
+import parentStyles from './styles.scss';
+
+type ItemResultsProps<T extends SearchResultsAlbum | SearchResultsArtist> = {
+  collection: T[];
+  loading?: boolean;
+  attached?: boolean;
+  selectedProvider?: { searchName: string };
+  onItemClick: (item: T) => void;
+  emptyText: string;
+};
+
+const ItemResults = <T extends SearchResultsAlbum | SearchResultsArtist>({
+  collection,
+  loading = false,
+  attached = false,
+  selectedProvider,
+  onItemClick,
+  emptyText
+}: ItemResultsProps<T>) => {
+  const getItemHeader = (item: T): string => {
+    return (item as SearchResultsAlbum).title || (item as SearchResultsArtist).name;
+  };
+
+  const getItemContent = (item: T): string | undefined => {
+    if ('artist' in item) {
+      return item.artist;
+    }
+    return undefined;
+  };
+
+  return (
+    <Tab.Pane loading={loading} attached={attached}>
+      <div className={parentStyles.pane_container}>
+        {collection.length > 0
+          ? loading
+            ? null
+            : collection.map((el, i) => {
+              const id = get(el, `ids.${selectedProvider?.searchName}`, el.id);
+              return (
+                <Card
+                  key={`title-card-${i}`}
+                  header={getItemHeader(el)}
+                  content={getItemContent(el)}
+                  image={el.coverImage || el.thumb}
+                  onClick={() => onItemClick(el)} 
+                />
+              );
+            })
+          : emptyText}
+      </div>
+    </Tab.Pane>
+  );
+};
+
+export default ItemResults;
diff --git a/packages/app/app/components/SearchResults/PlaylistResults/index.js b/packages/app/app/components/SearchResults/PlaylistResults/index.js
deleted file mode 100644
index 40bdff15dd..0000000000
--- a/packages/app/app/components/SearchResults/PlaylistResults/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import React from 'react';
-
-import TracksResults from '../TracksResults';
-import FontAwesome from 'react-fontawesome';
-import artPlaceholder from '../../../../resources/media/art_placeholder.png';
-import _ from 'lodash';
-import { withTranslation } from 'react-i18next';
-
-@withTranslation('search')
-class PlaylistResults extends React.Component {
-  constructor(props) {
-    super(props);
-  }
-
-  addTrack(track) {
-    if (typeof track !== 'undefined') {
-      this.props.addToQueue({
-        artist: track.artist,
-        name: track.name,
-        thumbnail: track.thumbnail ?? _.get(track, 'image[1][\'#text\']', artPlaceholder)
-      });
-    }
-  }
-  renderAddAllButton(tracks) {
-    return (tracks.length > 0 ? <a
-      key='add-all-tracks-to-queue'
-      href='#'
-      onClick={() => {
-        tracks
-          .map(track => {
-            this.addTrack(track);
-          });
-      }}
-      aria-label={this.props.t('queue-add')}
-    >
-      <FontAwesome name='plus' /> Add all
-    </a> : null
-    );
-  }
-
-  renderLoading() {
-    return (<div>Loading... <FontAwesome name='spinner' pulse /></div>);
-  }
-
-  renderResults = () =>
-    <div>
-      {this.renderAddAllButton(this.props.playlistSearchResults.info)}
-      <TracksResults
-        clearQueue={this.props.clearQueue}
-        startPlayback={this.props.startPlayback}
-        selectSong={this.props.selectSong}
-        addToQueue={this.props.addToQueue}
-        tracks={this.props.playlistSearchResults.info}
-        limit='100'
-        streamProviders={this.props.streamProviders}
-      /></div>
-
-  renderNoResult() {
-    return (<div>{this.props.t('empty')}</div>);
-  }
-  render() {
-    return (
-      this.props.playlistSearchStarted ? ((this.props.playlistSearchStarted.length > 0 && typeof this.props.playlistSearchResults.info === 'undefined') ? this.renderLoading() : this.renderResults()) : this.renderNoResult()
-    );
-  }
-}
-
-export default PlaylistResults;
diff --git a/packages/app/app/components/SearchResults/PlaylistResults/index.tsx b/packages/app/app/components/SearchResults/PlaylistResults/index.tsx
new file mode 100644
index 0000000000..7d766565ef
--- /dev/null
+++ b/packages/app/app/components/SearchResults/PlaylistResults/index.tsx
@@ -0,0 +1,97 @@
+import React, { FC } from 'react';
+import { get } from 'lodash';
+import { useTranslation } from 'react-i18next';
+import { Tab } from 'semantic-ui-react';
+import FontAwesome from 'react-fontawesome';
+
+import { TracksResults } from '../TracksResults';
+import artPlaceholder from '../../../../resources/media/art_placeholder.png';
+import parentStyles from '../styles.scss';
+
+type PlaylistResultsProps = {
+  playlistSearchStarted: boolean | string;
+  playlistSearchResults: any;
+  addToQueue: (track: any) => void;
+  clearQueue: () => void;
+  startPlayback: () => void;
+  selectSong: (track: any) => void;
+  loading?: boolean;
+  attached?: boolean;
+};
+
+const PlaylistResults: FC<PlaylistResultsProps> = ({
+  playlistSearchStarted,
+  playlistSearchResults,
+  addToQueue,
+  loading = false,
+  attached = false
+}) => {
+  const { t } = useTranslation('search');
+
+  const addTrack = (track: any) => {
+    if (typeof track !== 'undefined') {
+      addToQueue({
+        artist: track.artist,
+        name: track.name,
+        thumbnail: track.thumbnail ?? get(track, 'image[1][\'#text\']', artPlaceholder)
+      });
+    }
+  };
+
+  const renderAddAllButton = (tracks: any[]) => {
+    return tracks.length > 0 ? (
+      <a
+        key='add-all-tracks-to-queue'
+        href='#'
+        onClick={() => {
+          tracks.map(track => {
+            addTrack(track);
+          });
+        }}
+        aria-label={t('queue-add')}
+      >
+        <FontAwesome name='plus' /> Add all
+      </a>
+    ) : null;
+  };
+
+  const renderLoading = () => (
+    <div>Loading... <FontAwesome name='spinner' pulse /></div>
+  );
+
+  const renderResults = () => (
+    <div>
+      {renderAddAllButton(playlistSearchResults.info)}
+      <TracksResults
+        tracks={playlistSearchResults.info}
+        limit={100}
+      />
+    </div>
+  );
+
+  const renderNoResult = () => (
+    <div>{t('empty')}</div>
+  );
+
+  const content = () => {
+    if (!playlistSearchStarted) {
+      return renderNoResult();
+    }
+
+    if (typeof playlistSearchStarted === 'string' && playlistSearchStarted.length > 0 && typeof playlistSearchResults.info === 'undefined') {
+      return renderLoading();
+    }
+
+    return renderResults();
+  };
+
+  return (
+    <Tab.Pane loading={loading} attached={attached}>
+      <div className={parentStyles.pane_container}>
+        {content()}
+      </div>
+    </Tab.Pane>
+  );
+};
+
+export default PlaylistResults;
diff --git a/packages/app/app/components/SearchResults/TracksResults/index.js b/packages/app/app/components/SearchResults/TracksResults/index.js
deleted file mode 100644
index 28d8cf1727..0000000000
--- a/packages/app/app/components/SearchResults/TracksResults/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import _ from 'lodash';
-import { Segment } from 'semantic-ui-react';
-import { useTranslation } from 'react-i18next';
-
-import TrackRow from '../../TrackRow';
-
-import trackRowStyles from '../../TrackRow/styles.scss';
-
-const TracksResults = ({ tracks, limit }) => {
-  const { t } = useTranslation('search');
-  const collection = tracks || [];
-
-  if (collection.length === 0) {
-    return t('empty');
-  } else {
-    return (
-      <Segment className={trackRowStyles.tracks_container}>
-        <table>
-          <tbody>
-            {_.take(collection, limit).map((track, index) => {
-              if (
-                track &&
-                _.hasIn(track, 'name') && (_.hasIn(track, 'image') || _.hasIn(track, 'thumbnail')) &&
-                _.hasIn(track, 'artist')
-              ) {
-                const newTrack = _.cloneDeep(track);
-                if (!newTrack.artist.name) {
-                  _.set(newTrack, 'artist.name', newTrack.artist);
-                }
-                return (
-                  <TrackRow
-                    key={'search-result-track-row-' + index}
-                    track={newTrack}
-                    index={'popular-track-' + index}
-                    displayArtist
-                    displayCover
-                  />
-                );
-              }
-            })}
-          </tbody>
-        </table>
-      </Segment>
-    );
-  }
-};
-
-export default TracksResults;
diff --git a/packages/app/app/components/SearchResults/TracksResults/index.tsx b/packages/app/app/components/SearchResults/TracksResults/index.tsx
new file mode 100644
index 0000000000..38d653a3bc
--- /dev/null
+++ b/packages/app/app/components/SearchResults/TracksResults/index.tsx
@@ -0,0 +1,63 @@
+import React, { FC } from 'react';
+import { take } from 'lodash';
+import { useTranslation } from 'react-i18next';
+import { Tab } from 'semantic-ui-react';
+
+import { SearchResultsTrack } from '@nuclear/core/src/plugins/plugins.types';
+import {
+  HEADER_HEIGHT,
+  ITEM_HEIGHT
+} from '@nuclear/ui/lib/components/GridTrackTable';
+import TrackTableContainer from '../../../containers/TrackTableContainer';
+import styles from './styles.scss';
+import parentStyles from '../styles.scss';
+
+type TracksResultsProps = {
+  tracks: SearchResultsTrack[];
+  limit?: number;
+  loading?: boolean;
+  attached?: boolean;
+  asPane?: boolean;
+};
+
+export const TracksResults: FC<TracksResultsProps> = ({ 
+  tracks, 
+  limit,
+  loading = false,
+  attached = false,
+  asPane = false
+}) => {
+  const { t } = useTranslation('search');
+  const collection = tracks || [];
+
+  const height = `${HEADER_HEIGHT + ITEM_HEIGHT * Math.min(collection.length, 5)}px`;
+
+  const content = () => {
+    if (collection.length === 0) {
+      return <div>{t('empty')}</div>;
+    }
+
+    return (
+      <div className={styles.tracks_results_container} style={{ height }}>
+        <TrackTableContainer
+          tracks={take(collection, limit)}
+          displayDeleteButton={false}
+          displayAlbum={false}
+          displayPosition={false}
+        />
+      </div>
+    );
+  };
+
+  if (asPane) {
+    return (
+      <Tab.Pane loading={loading} attached={attached}>
+        <div className={parentStyles.pane_container}>
+          {content()}
+        </div>
+      </Tab.Pane>
+    );
+  }
+
+  return content();
+};
diff --git a/packages/app/app/components/SearchResults/TracksResults/styles.scss b/packages/app/app/components/SearchResults/TracksResults/styles.scss
index aa5d60dcf2..a138a61a22 100644
--- a/packages/app/app/components/SearchResults/TracksResults/styles.scss
+++ b/packages/app/app/components/SearchResults/TracksResults/styles.scss
@@ -1,93 +1,8 @@
-
 @use "sass:color";
-@use '../../../vars';
-
-.all_results_container {
-    display: flex;
-    flex-flow: row wrap;
-    justify-content: space-around;
-    width: 100%;
-
-    .column {
-      display: flex;
-      flex-flow: column;
-      width: 100%;
-
-      h3 {
-        font-variant: small-caps;
-        margin: 1rem;
-      }
-
-      .row {
-        display: flex;
-        flex-flow: row wrap;
-      }
-    }
-}
+@use "../../../vars";
 
-
-.popular_tracks_container {
+.tracks_results_container {
   display: flex;
-  flex: 1 1 auto;
   flex-flow: column;
-
-  margin: 0 0.5rem;
-
-  .header {
-    margin-bottom: 1rem;
-
-    font-size: 16px;
-    font-variant: small-caps;
-  }
-
-  .track_row {
-    display: flex;
-    align-items: center;
-    flex-flow: row;
-
-    transition: vars.$short-duration ease-in-out;
-
-    border-bottom: 1px solid rgba(vars.$background2, 0.2);
-
-    &:hover {
-      background: color.adjust(vars.$background, $lightness: 10%);
-    }
-
-    img {
-      flex: 0 0 auto;
-
-      width: 3rem;
-      height: 3rem;
-    }
-
-    .popular_track_name {
-      flex: 1 1 auto;
-      margin: 0.25rem 0.5rem;
-      text-align: left;
-    }
-
-    .playcount {
-      flex: 1 1 auto;
-      margin: 0.25rem 0.5rem;
-      text-align: right;
-      text-transform: uppercase;
-    }
-  }
-
-  .expand_button {
-    display: flex;
-    justify-content: center;
-    padding: 0.5rem;
-    margin-top: 0.5rem;
-    transition: vars.$short-duration;
-    cursor: pointer;
-
-    &:hover {
-      background: color.adjust(vars.$background, $lightness: 5%);
-    }
-  }
-}
-
-.add_button {
-  text-align: left;
+  flex: 1 1 auto;
 }
diff --git a/packages/app/app/components/SearchResults/index.js b/packages/app/app/components/SearchResults/index.js
deleted file mode 100644
index 9b22444e99..0000000000
--- a/packages/app/app/components/SearchResults/index.js
+++ /dev/null
@@ -1,182 +0,0 @@
-import React from 'react';
-import _ from 'lodash';
-import { Tab } from 'semantic-ui-react';
-import { withTranslation } from 'react-i18next';
-import { Card } from '@nuclear/ui';
-
-import AllResults from './AllResults';
-import TracksResults from './TracksResults';
-import PlaylistResults from './PlaylistResults';
-
-import styles from './styles.scss';
-
-@withTranslation('search')
-class SearchResults extends React.Component {
-  renderAllResultsPane() {
-    return (
-      <Tab.Pane loading={this.props.unifiedSearchStarted} attached={false}>
-        <div className={styles.pane_container}>
-          <div className='row'>
-            <AllResults
-              {...this.props}
-              albumInfoSearch={this.albumInfoSearch.bind(this)}
-              artistInfoSearch={this.artistInfoSearch.bind(this)}
-              podcastInfoSearch={this.podcastInfoSearch.bind(this)}
-            />
-          </div>
-        </div>
-      </Tab.Pane >
-    );
-  }
-
-  renderPane(collection, onClick) {
-    const selectedProvider = _.find(this.props.metaProviders, { sourceName: this.props.selectedPlugins.metaProviders });
-
-    return (
-      <Tab.Pane loading={this.props.unifiedSearchStarted} attached={false}>
-        <div className={styles.pane_container}>
-          {collection.length > 0
-            ? this.props.unifiedSearchStarted
-              ? null
-              : collection.map((el, i) => {
-                const id = _.get(el, `ids.${selectedProvider.searchName}`, el.id);
-                return (
-                  <Card
-                    key={'title-card-' + i}
-                    header={el.title || el.name}
-                    content={el.artist}
-                    image={
-                      el.coverImage ||
-                      el.thumb
-                    }
-                    onClick={() => onClick(id, el.type)}
-                  />
-                );
-              })
-            : this.props.t('empty')}
-        </div>
-      </Tab.Pane>
-    );
-  }
-
-  renderTrackListPane(collection) {
-    if (typeof collection !== 'undefined') {
-
-      return (
-        <Tab.Pane loading={this.props.unifiedSearchStarted} attached={false}>
-          <div className={styles.pane_container}>
-            {collection.length > 0
-              ? this.props.unifiedSearchStarted
-                ? null
-                : <TracksResults tracks={collection} limit='15' />
-              : this.props.t('empty')}
-          </div>
-        </Tab.Pane>
-      );
-    } else {
-      return (
-        <Tab.Pane
-          loading={this.props.unifiedSearchStarted}
-          attached={false}
-        >
-          <div className={styles.pane_container}>{this.props.t('empty')}</div>
-        </Tab.Pane>
-      );
-    }
-  }
-
-  renderPlaylistPane() {
-    return (
-      <Tab.Pane attached={false}>
-        <PlaylistResults
-          playlistSearchStarted={this.props.playlistSearchStarted}
-          playlistSearchResults={this.props.playlistSearchResults}
-          addToQueue={this.props.addToQueue}
-          clearQueue={this.props.clearQueue}
-          startPlayback={this.props.startPlayback}
-          selectSong={this.props.selectSong}
-          streamProviders={this.props.streamProviders}
-        />
-      </Tab.Pane>
-    );
-  }
-
-  panes() {
-    const artistsHasResults = _.get(this.props.artistSearchResults, ['length'], 0) > 0;
-    const albumsHasResults = _.get(this.props.albumSearchResults, ['length'], 0) > 0;
-    const tracksHasResults = _.get(this.props.trackSearchResults, ['info', 'length'], 0) > 0;
-    const playlistsHasResults = _.get(this.props.playlistSearchResults, ['info', 'length'], 0) > 0;
-    const liveStreamsHasResults = _.get(this.props.liveStreamSearchResults, ['info', 'length'], 0) > 0;
-    const podcastsHasResults = _.get(this.props.podcastSearchResults, ['length'], 0) > 0;
-
-    const panes = [
-      {
-        menuItem: this.props.t('all'),
-        render: () => this.renderAllResultsPane()
-      },
-      artistsHasResults && {
-        menuItem: this.props.t('artist_plural'),
-        render: () =>
-          this.renderPane(
-            this.props.artistSearchResults,
-            this.artistInfoSearch.bind(this)
-          )
-      },
-      albumsHasResults && {
-        menuItem: this.props.t('album_plural'),
-        render: () =>
-          this.renderPane(
-            this.props.albumSearchResults,
-            this.albumInfoSearch.bind(this)
-          )
-      },
-      tracksHasResults && {
-        menuItem: this.props.t('track_plural'),
-        render: () => this.renderTrackListPane(this.props.trackSearchResults.info)
-      },
-      playlistsHasResults && {
-        menuItem: this.props.t('playlist'),
-        render: () => this.renderPlaylistPane()
-      },
-      liveStreamsHasResults && {
-        menuItem: this.props.t('live-stream'),
-        render: () => this.renderTrackListPane(this.props.liveStreamSearchResults.info)
-      },
-      podcastsHasResults && {
-        menuItem: this.props.t('podcast'),
-        render: () =>
-          this.renderPane(
-            this.props.podcastSearchResults,
-            this.podcastInfoSearch.bind(this)
-          )
-      }
-    ].filter(pane => !!pane);
-
-    return panes;
-  }
-
-  albumInfoSearch(albumId, releaseType, release) {
-    this.props.albumInfoSearch(albumId, releaseType, release);
-    this.props.history.push('/album/' + albumId);
-  }
-
-  artistInfoSearch(artistId) {
-    this.props.artistInfoSearch(artistId);
-    this.props.history.push('/artist/' + artistId);
-  }
-
-  podcastInfoSearch(podcastId, releaseType, release) {
-    this.props.albumInfoSearch(podcastId, releaseType, release);
-    this.props.history.push('/album/' + podcastId);
-  }
-
-  render() {
-    return (
-      <div>
-        <Tab menu={{ secondary: true, pointing: true }} panes={this.panes()} />
-      </div>
-    );
-  }
-}
-
-export default SearchResults;
diff --git a/packages/app/app/components/SearchResults/index.tsx b/packages/app/app/components/SearchResults/index.tsx
new file mode 100644
index 0000000000..42d8318289
--- /dev/null
+++ b/packages/app/app/components/SearchResults/index.tsx
@@ -0,0 +1,160 @@
+import React, { FC, useMemo } from 'react';
+import { get } from 'lodash';
+import { Tab } from 'semantic-ui-react';
+import { useTranslation } from 'react-i18next';
+import { 
+  SearchResultsAlbum, 
+  SearchResultsArtist 
+} from '@nuclear/core/src/plugins/plugins.types';
+
+import { albumInfoSearch as albumInfoSearchAction, artistInfoSearch as artistInfoSearchAction } from '../../actions/search';
+import {clearQueue as clearQueueAction, selectSong as selectSongAction} from '../../actions/queue';
+import {startPlayback as startPlaybackAction} from '../../actions/player';
+import { AllResults } from './AllResults';
+import { TracksResults } from './TracksResults';
+import PlaylistResults from './PlaylistResults';
+import ItemResults from './ItemResults';
+
+import { useDispatch, useSelector } from 'react-redux';
+import { pluginsSelectors } from '../../selectors/plugins';
+import { useHistory } from 'react-router';
+import { searchSelectors } from '../../selectors/search';
+import { useDispatchedCallback } from '../../hooks/useDispatchedCallback';
+import { addToQueue as addToQueueAction } from '../../actions/queue';
+
+const SearchResults: FC = () => {
+  const { t } = useTranslation('search');
+  const dispatch = useDispatch();
+  const history = useHistory();
+
+  const { metaProviders } = useSelector(pluginsSelectors.plugins);
+  const selectedPlugins = useSelector(pluginsSelectors.selected);
+  const unifiedSearchStarted = useSelector(searchSelectors.unifiedSearchStarted);
+  const playlistSearchStarted = useSelector(searchSelectors.playlistSearchStarted);
+  const playlistSearchResults = useSelector(searchSelectors.playlistSearchResults);
+  const trackSearchResults = useSelector(searchSelectors.trackSearchResults);
+  const albumSearchResults = useSelector(searchSelectors.albumSearchResults);
+  const artistSearchResults = useSelector(searchSelectors.artistSearchResults);
+  const liveStreamSearchResults = useSelector(searchSelectors.liveStreamSearchResults);
+
+  const selectedProvider = useMemo(() => 
+    metaProviders.find(provider => provider.sourceName === selectedPlugins.metaProviders),
+  [metaProviders, selectedPlugins.metaProviders]
+  );
+
+  const albumInfoSearch = (release?: SearchResultsAlbum) => {
+    dispatch(albumInfoSearchAction(release));
+    history.push(`/album/${release?.id}`);
+  };
+
+  const artistInfoSearch = (artist?: SearchResultsArtist) => {
+    dispatch(artistInfoSearchAction(artist));
+    history.push(`/artist/${artist?.id}`);
+  };
+
+  const addToQueue = useDispatchedCallback(addToQueueAction);
+  const clearQueue = useDispatchedCallback(clearQueueAction);
+  const startPlayback = useDispatchedCallback(startPlaybackAction);
+  const selectSong = useDispatchedCallback(selectSongAction);
+
+  const panes = useMemo(() => {
+    const artistsHasResults = artistSearchResults.length > 0;
+    const albumsHasResults = albumSearchResults.length > 0;
+    const tracksHasResults = get(trackSearchResults, ['info', 'length'], trackSearchResults.length) > 0;
+    const playlistsHasResults = get(playlistSearchResults, ['info', 'length'], 0) > 0;
+    const liveStreamsHasResults = get(liveStreamSearchResults, ['info', 'length'], 0) > 0;
+
+    return [
+      {
+        menuItem: t('all'),
+        render: () => (
+          <AllResults
+            loading={unifiedSearchStarted}
+            attached={false}
+            albumInfoSearch={albumInfoSearch}
+            artistInfoSearch={artistInfoSearch}
+          />
+        )
+      },
+      artistsHasResults && {
+        menuItem: t('artist_plural'),
+        render: () => (
+          <ItemResults
+            collection={artistSearchResults}
+            loading={unifiedSearchStarted}
+            attached={false}
+            selectedProvider={selectedProvider}
+            onItemClick={artistInfoSearch}
+            emptyText={t('empty')}
+          />
+        )
+      },
+      albumsHasResults && {
+        menuItem: t('album_plural'),
+        render: () => (
+          <ItemResults
+            collection={albumSearchResults}
+            loading={unifiedSearchStarted}
+            attached={false}
+            selectedProvider={selectedProvider}
+            onItemClick={albumInfoSearch}
+            emptyText={t('empty')}
+          />
+        )
+      },
+      tracksHasResults && {
+        menuItem: t('track_plural'),
+        render: () => (
+          <TracksResults
+            tracks={get(trackSearchResults, 'info', trackSearchResults)}
+            limit={15}
+            loading={unifiedSearchStarted}
+            attached={false}
+            asPane={true}
+          />
+        )
+      },
+      playlistsHasResults && {
+        menuItem: t('playlist'),
+        render: () => (
+          <PlaylistResults
+            playlistSearchStarted={playlistSearchStarted}
+            playlistSearchResults={playlistSearchResults}
+            addToQueue={addToQueue}
+            clearQueue={clearQueue}
+            startPlayback={() => startPlayback(false)}
+            selectSong={selectSong}
+            loading={false}
+            attached={false}
+          />
+        )
+      },
+      liveStreamsHasResults && {
+        menuItem: t('live-stream'),
+        render: () => (
+          <TracksResults
+            tracks={liveStreamSearchResults?.info}
+            limit={15}
+            loading={unifiedSearchStarted}
+            attached={false}
+            asPane={true}
+          />
+        )
+      }
+    ].filter(Boolean);
+  }, [
+    artistSearchResults, albumSearchResults, trackSearchResults, 
+    playlistSearchResults, liveStreamSearchResults,
+    unifiedSearchStarted, selectedProvider, t,
+    albumInfoSearch, artistInfoSearch,
+    playlistSearchStarted, addToQueue, clearQueue, startPlayback, selectSong
+  ]);
+
+  return (
+    <div>
+      <Tab menu={{ secondary: true, pointing: true }} panes={panes} />
+    </div>
+  );
+};
+
+export default SearchResults;
diff --git a/packages/app/app/components/TrackRow/index.js b/packages/app/app/components/TrackRow/index.js
deleted file mode 100644
index 65b2afc6be..0000000000
--- a/packages/app/app/components/TrackRow/index.js
+++ /dev/null
@@ -1,196 +0,0 @@
-import React from 'react';
-import _ from 'lodash';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import PropTypes from 'prop-types';
-import numeral from 'numeral';
-import { Icon } from 'semantic-ui-react';
-import { head } from 'lodash';
-
-import { formatDuration, getTrackArtist, getTrackTitle } from '@nuclear/ui';
-
-import * as QueueActions from '../../actions/queue';
-
-import TrackPopupContainer from '../../containers/TrackPopupContainer';
-import artPlaceholder from '../../../resources/media/art_placeholder.png';
-
-import styles from './styles.scss';
-
-class TrackRow extends React.Component {
-  // this function should be moved onto interface for 'track'
-  renderAlbum(track) {
-    return (
-      <td>
-        {track.album}
-      </td>
-    );
-  }
-
-  renderDuration(track) {
-    if (track.duration === 0) {
-      return <td className={styles.track_duration} />;
-    }
-    return (
-      <td className={styles.track_duration}>
-        {formatDuration(track.duration)}
-      </td>
-    );
-  }
-
-  playTrack() {
-    this.props.actions.playTrack(this.props.streamProviders, {
-      artist: this.props.track.artist.name,
-      name: this.props.track.name,
-      thumbnail: this.getTrackThumbnail(),
-      local: this.props.track.local,
-      stream: head(this.props.track.streams)
-    });
-  }
-
-  getTrackThumbnail() {
-    const thumb = _.get(
-      this.props.track,
-      'thumb',
-      _.get(
-        this.props.track,
-        'thumbnail',
-        _.get(
-          this.props.track,
-          'image[0][#text]',
-          artPlaceholder
-        )
-      )
-    );
-
-    return thumb === '' ? artPlaceholder : thumb;
-  }
-
-  canAddToFavorites() {
-    return _.findIndex(this.props.favoriteTracks, (currentTrack) => {
-      return currentTrack.name === this.props.track.name && currentTrack.artist.name === this.props.track.artist.name;
-    }) < 0;
-  }
-
-  renderTrigger(track) {
-    const {
-      displayCover,
-      displayTrackNumber,
-      displayArtist,
-      displayAlbum,
-      displayDuration,
-      displayPlayCount,
-      withDeleteButton,
-      onDelete
-    } = this.props;
-    return (
-      <tr className={styles.track} onDoubleClick={this.playTrack.bind(this)}>
-        {
-          withDeleteButton &&
-          <td className={styles.track_row_buttons}>
-            <a onClick={onDelete}>
-              <Icon name='close' />
-            </a>
-          </td>
-        }
-        {
-          displayCover &&
-          <td className={styles.track_thumbnail}>
-            <img src={this.getTrackThumbnail()} />
-          </td>
-        }
-        {displayTrackNumber && <td className={styles.track_number}>{track.position}</td>}
-        {displayArtist && <td>{track.artist.name}</td>}
-        <td>{track.name}</td>
-        {displayAlbum && this.renderAlbum(track)}
-        {displayDuration && this.renderDuration(track)}
-        {displayPlayCount && <td>{numeral(track.playcount).format('0,0')}</td>}
-      </tr>
-    );
-  }
-
-  render() {
-
-    const {
-      track,
-      withAddToQueue,
-      withPlayNext,
-      withPlayNow,
-      withAddToFavorites,
-      withAddToPlaylist,
-      withAddToDownloads
-    } = this.props;
-    return (
-      <TrackPopupContainer
-        trigger={this.renderTrigger(track)}
-        track={track}
-        artist={getTrackArtist(track)}
-        title={getTrackTitle(track)}
-        thumb={this.getTrackThumbnail()}
-
-        withAddToQueue={withAddToQueue}
-        withPlayNext={withPlayNext}
-        withPlayNow={withPlayNow}
-        withAddToFavorites={withAddToFavorites && this.canAddToFavorites()}
-        withAddToPlaylist={withAddToPlaylist}
-        withAddToDownloads={withAddToDownloads}
-      />
-    );
-  }
-}
-
-TrackRow.propTypes = {
-  track: PropTypes.object,
-
-  displayCover: PropTypes.bool,
-  displayTrackNumber: PropTypes.bool,
-  displayArtist: PropTypes.bool,
-  displayAlbum: PropTypes.bool,
-  displayDuration: PropTypes.bool,
-  displayPlayCount: PropTypes.bool,
-
-  withAddToQueue: PropTypes.bool,
-  withPlayNext: PropTypes.bool,
-  withPlayNow: PropTypes.bool,
-  withAddToFavorites: PropTypes.bool,
-  withAddToPlaylist: PropTypes.bool,
-  withAddToDownloads: PropTypes.bool,
-  withDeleteButton: PropTypes.bool,
-
-  onDelete: PropTypes.func
-};
-
-TrackRow.defaultProps = {
-  withAddToQueue: true,
-  withPlayNext: true,
-  withPlayNow: true,
-  withAddToFavorites: true,
-  withAddToDownloads: true,
-  withDeleteButton: false
-};
-
-function mapStateToProps(state, { track }) {
-  return {
-    streamProviders: track.local
-      ? state.plugin.plugins.streamProviders.filter(({ sourceName }) => {
-        return sourceName === 'Local';
-      })
-      : state.plugin.plugins.streamProviders,
-    settings: state.settings,
-    favoriteTracks: state.favorites.tracks
-  };
-}
-
-function mapDispatchToProps(dispatch) {
-  return {
-    actions: bindActionCreators(
-      QueueActions,
-      dispatch
-    )
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(TrackRow);
-
diff --git a/packages/app/app/components/TrackRow/styles.scss b/packages/app/app/components/TrackRow/styles.scss
deleted file mode 100644
index 3c6c99d488..0000000000
--- a/packages/app/app/components/TrackRow/styles.scss
+++ /dev/null
@@ -1,92 +0,0 @@
-@use "sass:color";
-@use '../../vars';
-
-.tracks_container {
-  display: flex;
-  flex: 1 1 auto;
-  flex-flow: column;
-
-  margin: 0 0.5rem;
-
-  .header {
-    margin-bottom: 1rem;
-
-    font-size: 16px;
-    font-variant: small-caps;
-  }
-
-  .expand_button {
-    display: flex;
-    justify-content: center;
-    padding: 0.5rem;
-    margin-top: 0.5rem;
-    transition: vars.$short-duration;
-    cursor: pointer;
-
-    &:hover {
-      background: color.adjust(vars.$background, $lightness: 5%);
-    }
-  }
-
-  table {
-    width: 100%;
-  }
-
-  thead {
-    font-variant: all-small-caps;
-    border-bottom: 1px solid vars.$background2;
-    color: rgba(vars.$white, 0.5);
-    font-size: 20px;
-  }
-
-  th {
-    padding: 1rem;
-    text-align: left;
-  }
-}
-
-.add_button {
-  text-align: left;
-}
-
-.track {
-  transition: vars.$short-duration;
-  cursor: pointer;
-
-  &:hover {
-    background: rgba(vars.$background2, 0.25);
-  }
-
-  &:last-child {
-    td {
-      border-bottom: none;
-    }
-  }
-
-  td {
-    padding: 1rem 1rem;
-    border-bottom: 1px solid vars.$background2;
-  }
-
-  .track_number,
-    .track_duration {
-      text-align: center;
-    }
-}
-
-.track_thumbnail {
-  position: relative;
-  box-sizing: content-box;
-  padding: 0 !important;
-
-  img {
-    width: 3em;
-    height: 3em;
-    display: block;
-    object-fit: cover;
-  }
-}
-
-.track_row_buttons {
-  width: 1px;
-}
diff --git a/packages/app/app/containers/AlbumViewContainer/__snapshots__/AlbumViewContainer.test.tsx.snap b/packages/app/app/containers/AlbumViewContainer/__snapshots__/AlbumViewContainer.test.tsx.snap
index e3d17fecb1..25c738cdde 100644
--- a/packages/app/app/containers/AlbumViewContainer/__snapshots__/AlbumViewContainer.test.tsx.snap
+++ b/packages/app/app/containers/AlbumViewContainer/__snapshots__/AlbumViewContainer.test.tsx.snap
@@ -131,7 +131,7 @@ exports[`Album view container should display an album 1`] = `
                 <div
                   class="track_table_header_row"
                   role="row"
-                  style="grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em auto;"
+                  style="grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em auto;"
                 >
                   <div
                     class="track_table_header_cell"
@@ -235,7 +235,7 @@ exports[`Album view container should display an album 1`] = `
                       data-rbd-draggable-id="0"
                       data-testid="track-table-row"
                       role="row"
-                      style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em;"
+                      style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em;"
                       tabindex="0"
                     >
                       <div
@@ -342,7 +342,7 @@ exports[`Album view container should display an album 1`] = `
                       data-rbd-draggable-id="1"
                       data-testid="track-table-row"
                       role="row"
-                      style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em;"
+                      style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em;"
                       tabindex="1"
                     >
                       <div
@@ -449,7 +449,7 @@ exports[`Album view container should display an album 1`] = `
                       data-rbd-draggable-id="2"
                       data-testid="track-table-row"
                       role="row"
-                      style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em;"
+                      style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em;"
                       tabindex="2"
                     >
                       <div
diff --git a/packages/app/app/containers/ArtistViewContainer/__snapshots__/ArtistViewContainer.test.tsx.snap b/packages/app/app/containers/ArtistViewContainer/__snapshots__/ArtistViewContainer.test.tsx.snap
index 44fb3e8f53..f752eb4d13 100644
--- a/packages/app/app/containers/ArtistViewContainer/__snapshots__/ArtistViewContainer.test.tsx.snap
+++ b/packages/app/app/containers/ArtistViewContainer/__snapshots__/ArtistViewContainer.test.tsx.snap
@@ -91,7 +91,7 @@ exports[`Artist view container should display an artist 1`] = `
           class="artist_related_container"
         >
           <div
-            class="popular_tracks_container tracks_container"
+            class="popular_tracks_container"
           >
             <div
               class="header"
@@ -126,7 +126,7 @@ exports[`Artist view container should display an artist 1`] = `
                     <div
                       class="track_table_header_row"
                       role="row"
-                      style="grid-template-columns: 7.5em 3em 3em minmax(8em, 1fr) 1fr auto;"
+                      style="grid-template-columns: 4em 3em 3em minmax(8em, 1fr) 1fr auto;"
                     >
                       <div
                         class="track_table_header_cell"
@@ -221,7 +221,7 @@ exports[`Artist view container should display an artist 1`] = `
                           data-rbd-draggable-id="2"
                           data-testid="track-table-row"
                           role="row"
-                          style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 3em 3em minmax(8em, 1fr) 1fr;"
+                          style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 3em 3em minmax(8em, 1fr) 1fr;"
                           tabindex="2"
                         >
                           <div
@@ -312,7 +312,7 @@ exports[`Artist view container should display an artist 1`] = `
                           data-rbd-draggable-id="1"
                           data-testid="track-table-row"
                           role="row"
-                          style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 3em 3em minmax(8em, 1fr) 1fr;"
+                          style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 4em 3em 3em minmax(8em, 1fr) 1fr;"
                           tabindex="1"
                         >
                           <div
@@ -403,7 +403,7 @@ exports[`Artist view container should display an artist 1`] = `
                           data-rbd-draggable-id="0"
                           data-testid="track-table-row"
                           role="row"
-                          style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 7.5em 3em 3em minmax(8em, 1fr) 1fr;"
+                          style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 4em 3em 3em minmax(8em, 1fr) 1fr;"
                           tabindex="0"
                         >
                           <div
diff --git a/packages/app/app/containers/ArtistViewContainer/hooks.ts b/packages/app/app/containers/ArtistViewContainer/hooks.ts
index 5f1cad9e38..ff4f26e32a 100644
--- a/packages/app/app/containers/ArtistViewContainer/hooks.ts
+++ b/packages/app/app/containers/ArtistViewContainer/hooks.ts
@@ -8,7 +8,7 @@ import { artistInfoSearchByName, albumInfoSearch, artistReleasesSearch } from '.
 import * as FavoritesActions from '../../actions/favorites';
 import { searchSelectors } from '../../selectors/search';
 import { favoritesSelectors } from '../../selectors/favorites';
-import { SearchResultsAlbum } from '@nuclear/core/src/plugins/plugins.types';
+import { AlbumType, SearchResultsAlbum } from '@nuclear/core/src/plugins/plugins.types';
 
 export const useArtistViewProps = () => {
   const dispatch = useDispatch();
@@ -26,8 +26,8 @@ export const useArtistViewProps = () => {
     dispatch(artistInfoSearchByName(artistName, history));
   }, [history, dispatch]);
 
-  const albumInfoSearchCallback = useCallback(async (albumId: string, releaseType: 'master' | 'release', release: SearchResultsAlbum) => {
-    dispatch(albumInfoSearch(albumId, releaseType, release));
+  const albumInfoSearchCallback = useCallback(async (release: SearchResultsAlbum) => {
+    dispatch(albumInfoSearch(release));
   }, [dispatch]);
 
   const favoriteArtists: { id: string }[] = useSelector(favoritesSelectors.artists);
diff --git a/packages/app/app/containers/DashboardContainer/__snapshots__/DashboardContainer.test.tsx.snap b/packages/app/app/containers/DashboardContainer/__snapshots__/DashboardContainer.test.tsx.snap
index 2a5b113a84..96cfcc68bb 100644
--- a/packages/app/app/containers/DashboardContainer/__snapshots__/DashboardContainer.test.tsx.snap
+++ b/packages/app/app/containers/DashboardContainer/__snapshots__/DashboardContainer.test.tsx.snap
@@ -514,7 +514,7 @@ exports[`Dashboard container should display top tracks after going to top tracks
                   <div
                     class="track_table_header_row"
                     role="row"
-                    style="grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em auto;"
+                    style="grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em auto;"
                   >
                     <div
                       class="track_table_header_cell"
@@ -647,7 +647,7 @@ exports[`Dashboard container should display top tracks after going to top tracks
                         data-rbd-draggable-id="0"
                         data-testid="track-table-row"
                         role="row"
-                        style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em;"
+                        style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em;"
                         tabindex="0"
                       >
                         <div
@@ -764,7 +764,7 @@ exports[`Dashboard container should display top tracks after going to top tracks
                         data-rbd-draggable-id="1"
                         data-testid="track-table-row"
                         role="row"
-                        style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em;"
+                        style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em;"
                         tabindex="1"
                       >
                         <div
diff --git a/packages/app/app/containers/DeezerPlaylistAdapter/__snapshots__/DeezerPlaylistAdapter.test.tsx.snap b/packages/app/app/containers/DeezerPlaylistAdapter/__snapshots__/DeezerPlaylistAdapter.test.tsx.snap
index e904158232..a02a732f81 100644
--- a/packages/app/app/containers/DeezerPlaylistAdapter/__snapshots__/DeezerPlaylistAdapter.test.tsx.snap
+++ b/packages/app/app/containers/DeezerPlaylistAdapter/__snapshots__/DeezerPlaylistAdapter.test.tsx.snap
@@ -117,7 +117,7 @@ exports[`Deezer playlist adapter should display a Deezer playlist 1`] = `
               <div
                 class="track_table_header_row"
                 role="row"
-                style="grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em auto;"
+                style="grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em auto;"
               >
                 <div
                   class="track_table_header_cell"
@@ -237,7 +237,7 @@ exports[`Deezer playlist adapter should display a Deezer playlist 1`] = `
                     data-rbd-draggable-id="0"
                     data-testid="track-table-row"
                     role="row"
-                    style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em;"
+                    style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em;"
                     tabindex="0"
                   >
                     <div
@@ -348,7 +348,7 @@ exports[`Deezer playlist adapter should display a Deezer playlist 1`] = `
                     data-rbd-draggable-id="1"
                     data-testid="track-table-row"
                     role="row"
-                    style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em;"
+                    style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em;"
                     tabindex="1"
                   >
                     <div
diff --git a/packages/app/app/containers/ErrorBoundary/index.tsx b/packages/app/app/containers/ErrorBoundary/index.tsx
index f524a649a5..e1aae1527a 100644
--- a/packages/app/app/containers/ErrorBoundary/index.tsx
+++ b/packages/app/app/containers/ErrorBoundary/index.tsx
@@ -16,10 +16,10 @@ type ErrorBoundaryProps = {
 
 class ErrorBoundary extends React.Component<ErrorBoundaryProps> {
   componentDidCatch(error) {
-    logger.error(error.message ? error.message : error);
+    logger.error(String(error));
     this.props.onError(
       'Uncaught error',
-      error.message,
+      error.message || String(error),
       undefined,
       this.props.settings
     );
diff --git a/packages/app/app/containers/FavoritesContainer/__snapshots__/FavoritesContainer.tracks.test.tsx.snap b/packages/app/app/containers/FavoritesContainer/__snapshots__/FavoritesContainer.tracks.test.tsx.snap
index 155f54f584..874f61984f 100644
--- a/packages/app/app/containers/FavoritesContainer/__snapshots__/FavoritesContainer.tracks.test.tsx.snap
+++ b/packages/app/app/containers/FavoritesContainer/__snapshots__/FavoritesContainer.tracks.test.tsx.snap
@@ -229,7 +229,7 @@ exports[`Favorite tracks view container should display favorite tracks 1`] = `
               <div
                 class="track_table_header_row"
                 role="row"
-                style="grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em 3em auto;"
+                style="grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em 3em auto;"
               >
                 <div
                   class="track_table_header_cell"
@@ -347,7 +347,7 @@ exports[`Favorite tracks view container should display favorite tracks 1`] = `
                     data-rbd-draggable-id="1"
                     data-testid="track-table-row"
                     role="row"
-                    style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em 3em;"
+                    style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em 3em;"
                     tabindex="1"
                   >
                     <div
@@ -458,7 +458,7 @@ exports[`Favorite tracks view container should display favorite tracks 1`] = `
                     data-rbd-draggable-id="0"
                     data-testid="track-table-row"
                     role="row"
-                    style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em 3em;"
+                    style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em 3em;"
                     tabindex="0"
                   >
                     <div
diff --git a/packages/app/app/containers/LibraryViewContainer/__snapshots__/LibraryViewContainer.test.tsx.snap b/packages/app/app/containers/LibraryViewContainer/__snapshots__/LibraryViewContainer.test.tsx.snap
index f43a0ff009..d3917a0448 100644
--- a/packages/app/app/containers/LibraryViewContainer/__snapshots__/LibraryViewContainer.test.tsx.snap
+++ b/packages/app/app/containers/LibraryViewContainer/__snapshots__/LibraryViewContainer.test.tsx.snap
@@ -273,7 +273,7 @@ exports[`Library view container should display local library in album grid mode
           </div>
         </div>
         <div
-          class="ui inverted segment tracks_container"
+          class="ui inverted segment"
         >
           <div
             class="ui dimmer"
@@ -546,7 +546,7 @@ exports[`Library view container should display local library in folder tree mode
           </div>
         </div>
         <div
-          class="ui inverted segment tracks_container"
+          class="ui inverted segment"
         >
           <div
             class="ui dimmer"
@@ -806,7 +806,7 @@ exports[`Library view container should display local library in simple list mode
           </div>
         </div>
         <div
-          class="ui inverted segment tracks_container"
+          class="ui inverted segment"
         >
           <div
             class="ui dimmer"
@@ -825,7 +825,7 @@ exports[`Library view container should display local library in simple list mode
                 <div
                   class="track_table_header_row"
                   role="row"
-                  style="grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em 6em 6em auto;"
+                  style="grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em 6em 6em auto;"
                 >
                   <div
                     class="track_table_header_cell"
@@ -962,7 +962,7 @@ exports[`Library view container should display local library in simple list mode
                       data-rbd-draggable-id="0"
                       data-testid="track-table-row"
                       role="row"
-                      style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em 6em 6em;"
+                      style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em 6em 6em;"
                       tabindex="0"
                     >
                       <div
@@ -1070,7 +1070,7 @@ exports[`Library view container should display local library in simple list mode
                       data-rbd-draggable-id="1"
                       data-testid="track-table-row"
                       role="row"
-                      style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em 6em 6em;"
+                      style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em 6em 6em;"
                       tabindex="1"
                     >
                       <div
@@ -1178,7 +1178,7 @@ exports[`Library view container should display local library in simple list mode
                       data-rbd-draggable-id="2"
                       data-testid="track-table-row"
                       role="row"
-                      style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em minmax(8em, 1fr) 6em 6em 6em;"
+                      style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em minmax(8em, 1fr) 6em 6em 6em;"
                       tabindex="2"
                     >
                       <div
diff --git a/packages/app/app/containers/MainContentContainer/index.js b/packages/app/app/containers/MainContentContainer/index.js
index 7cbc38bf2e..08aad28950 100644
--- a/packages/app/app/containers/MainContentContainer/index.js
+++ b/packages/app/app/containers/MainContentContainer/index.js
@@ -17,13 +17,13 @@ import LyricsContainer from '../LyricsContainer';
 import PlaylistViewContainer from '../PlaylistViewContainer';
 import PlaylistsContainer from '../PlaylistsContainer';
 import PluginsContainer from '../PluginsContainer';
-import SearchResultsContainer from '../SearchResultsContainer';
 import SettingsContainer from '../SettingsContainer';
 import TagViewContainer from '../TagViewContainer';
 import VisualizerNode from '../VisualizerContainer/VisualizerNode';
 import DeezerPlaylistAdapter from '../DeezerPlaylistAdapter';
 import { ListeningHistoryContainer } from '../ListeningHistoryContainer';
 import { SpotifyPlaylistAdapter } from '../SpotifyPlaylistAdapter';
+import SearchResults from '../../components/SearchResults';
 
 class MainContentContainer extends React.Component {
   componentDidMount() {
@@ -54,7 +54,7 @@ class MainContentContainer extends React.Component {
               <Route path='/plugins' component={PluginsContainer} />
               <Route path='/settings' component={SettingsContainer} />
               <Route path='/tag/:tagName' component={TagViewContainer} />
-              <Route path='/search' component={SearchResultsContainer} />
+              <Route path='/search' component={SearchResults} />
               <Route path='/lyrics' component={LyricsContainer} />
               <Route path='/equalizer' component={EqualizerViewContainer} />
               <Route path='/visualizer' component={VisualizerNode} />
diff --git a/packages/app/app/containers/PlaylistViewContainer/__snapshots__/PlaylistViewContainer.test.tsx.snap b/packages/app/app/containers/PlaylistViewContainer/__snapshots__/PlaylistViewContainer.test.tsx.snap
index f18beda0d3..1d918b1703 100644
--- a/packages/app/app/containers/PlaylistViewContainer/__snapshots__/PlaylistViewContainer.test.tsx.snap
+++ b/packages/app/app/containers/PlaylistViewContainer/__snapshots__/PlaylistViewContainer.test.tsx.snap
@@ -120,7 +120,7 @@ exports[`Playlist view container should display a playlist 1`] = `
               <div
                 class="track_table_header_row"
                 role="row"
-                style="grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 3em auto;"
+                style="grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 3em auto;"
               >
                 <div
                   class="track_table_header_cell"
@@ -251,7 +251,7 @@ exports[`Playlist view container should display a playlist 1`] = `
                     data-testid="track-table-row"
                     draggable="false"
                     role="button"
-                    style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 3em;"
+                    style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 3em;"
                     tabindex="0"
                   >
                     <div
@@ -381,7 +381,7 @@ exports[`Playlist view container should display a playlist 1`] = `
                     data-testid="track-table-row"
                     draggable="false"
                     role="button"
-                    style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 3em;"
+                    style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 3em;"
                     tabindex="1"
                   >
                     <div
diff --git a/packages/app/app/containers/PlaylistsContainer/PlaylistsContainer.test.tsx b/packages/app/app/containers/PlaylistsContainer/PlaylistsContainer.test.tsx
index dfdfb12bc5..1fa5279b2b 100644
--- a/packages/app/app/containers/PlaylistsContainer/PlaylistsContainer.test.tsx
+++ b/packages/app/app/containers/PlaylistsContainer/PlaylistsContainer.test.tsx
@@ -194,20 +194,6 @@ describe('Playlists container', () => {
     ]);
   });
 
-  it('should get the users playlists on mount if the user is logged in', async () => {
-    const initialState = buildStoreState()
-      .withPlaylists()
-      .withPlugins()
-      .withConnectivity()
-      .withLoggedInUser()
-      .withSettings({
-        nuclearPlaylistsServiceUrl: 'http://playlists.nuclear'
-      })
-      .build();
-    mountComponent(initialState);
-    expect(fetchMock.done());
-  });
-
   it.each([{
     kind: 'undefined',
     filePath: undefined
@@ -232,18 +218,6 @@ describe('Playlists container', () => {
     });
   });
 
-  it('should not get the user\'s playlists on mount if the user is not logged in', async () => {
-    const initialState = buildStoreState()
-      .withPlaylists()
-      .withPlugins()
-      .withConnectivity()
-      .withLoggedInUser()
-      .build();
-    mountComponent(initialState);
-
-    expect(fetchMock.done());
-  });
-
   const mountComponent = (initialStore?: AnyProps, initStore = true) => {
     const initialState = initialStore ||
       buildStoreState()
diff --git a/packages/app/app/containers/PlaylistsContainer/hooks.ts b/packages/app/app/containers/PlaylistsContainer/hooks.ts
index efac3e8dc8..2feeecfcf5 100644
--- a/packages/app/app/containers/PlaylistsContainer/hooks.ts
+++ b/packages/app/app/containers/PlaylistsContainer/hooks.ts
@@ -3,23 +3,9 @@ import { useSelector, useDispatch } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 
 import { playlistsSelectors } from '../../selectors/playlists';
-import { nuclearSelectors } from '../../selectors/nuclear';
 import * as PlaylistActions from '../../actions/playlists';
 import { openLocalFilePicker } from '../../actions/local';
 
-export const useRemotePlaylists = () => {
-  const dispatch = useDispatch();
-  const identityStore = useSelector(nuclearSelectors.identity);
-
-  useEffect(() => {
-    dispatch(PlaylistActions.loadRemotePlaylists(identityStore));
-  }, [dispatch, identityStore]);
-
-  return {
-    remotePlaylists: useSelector(playlistsSelectors.remotePlaylists)
-  };
-};
-
 export const useLocalPlaylists = () => {
   const dispatch = useDispatch();
   useEffect(() => {
@@ -50,13 +36,11 @@ export const usePlaylistsProps = () => {
   );
 
   const { localPlaylists } = useLocalPlaylists();
-  const { remotePlaylists } = useRemotePlaylists();
 
   return {
     isLoading: localPlaylists.isLoading,
     hasError: localPlaylists.hasError,
     playlists: localPlaylists.data,
-    remotePlaylists,
     onImportFromFile,
     onCreate
   };
diff --git a/packages/app/app/containers/SearchBoxContainer/SearchBoxContainer.test.tsx b/packages/app/app/containers/SearchBoxContainer/SearchBoxContainer.test.tsx
index fae086e3f8..54d207410c 100644
--- a/packages/app/app/containers/SearchBoxContainer/SearchBoxContainer.test.tsx
+++ b/packages/app/app/containers/SearchBoxContainer/SearchBoxContainer.test.tsx
@@ -29,10 +29,8 @@ describe('Search box container', () => {
     expect(state.search.searchHistory).toEqual(['test']);
     expect(state.plugin.plugins.metaProviders[0].searchForArtists).toHaveBeenCalledWith('test');
     expect(state.plugin.plugins.metaProviders[0].searchForReleases).toHaveBeenCalledWith('test');
-    expect(state.plugin.plugins.metaProviders[0].searchForPodcast).toHaveBeenCalledWith('test');
+    expect(state.plugin.plugins.metaProviders[0].searchForTracks).toHaveBeenCalledWith('test');
 
-    const lastfmApi = new rest.LastFmApi('test', 'test');
-    expect(lastfmApi.searchTracks).toHaveBeenCalledWith('test');
     expect(rest.Youtube.urlSearch).toHaveBeenCalledWith('test');
     expect(rest.Youtube.liveStreamSearch).toHaveBeenCalledWith('test');
   });
diff --git a/packages/app/app/containers/SearchResultsContainer/index.js b/packages/app/app/containers/SearchResultsContainer/index.js
deleted file mode 100644
index b1f0341e43..0000000000
--- a/packages/app/app/containers/SearchResultsContainer/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { withRouter } from 'react-router-dom';
-import { compose } from 'recompose';
-import * as SearchActions from '../../actions/search';
-import * as QueueActions from '../../actions/queue';
-import * as PlayerActions from '../../actions/player';
-
-import SearchResults from '../../components/SearchResults';
-
-function mapStateToProps(state) {
-  return {
-    artistSearchResults: state.search.artistSearchResults,
-    albumSearchResults: state.search.albumSearchResults,
-    podcastSearchResults: state.search.podcastSearchResults,
-    trackSearchResults: state.search.trackSearchResults,
-    playlistSearchResults: state.search.playlistSearchResults,
-    liveStreamSearchResults: state.search.liveStreamSearchResults,
-    unifiedSearchStarted: state.search.unifiedSearchStarted,
-    playlistSearchStarted: state.search.playlistSearchStarted,
-    liveStreamSearchStarted: state.search.liveStreamSearchStarted,
-    streamProviders: state.plugin.plugins.streamProviders,
-    metaProviders: state.plugin.plugins.metaProviders,
-    selectedPlugins: state.plugin.selected
-  };
-}
-
-const mapDispatchToProps = dispatch => bindActionCreators({
-  albumInfoSearch: SearchActions.albumInfoSearch,
-  artistInfoSearch: SearchActions.artistInfoSearch,
-  podcastInfoSearch: SearchActions.podcastSearch,
-  addToQueue: QueueActions.addToQueue,
-  clearQueue: QueueActions.clearQueue,
-  startPlayback: PlayerActions.startPlayback,
-  selectSong: QueueActions.selectSong
-}, dispatch);
-
-export default compose(
-  withRouter,
-  connect(mapStateToProps, mapDispatchToProps)
-)(SearchResults);
diff --git a/packages/app/app/containers/SpotifyPlaylistAdapter/SpotifyPlaylistAdapter.test.tsx b/packages/app/app/containers/SpotifyPlaylistAdapter/SpotifyPlaylistAdapter.test.tsx
index abda492ca6..d194d9c96c 100644
--- a/packages/app/app/containers/SpotifyPlaylistAdapter/SpotifyPlaylistAdapter.test.tsx
+++ b/packages/app/app/containers/SpotifyPlaylistAdapter/SpotifyPlaylistAdapter.test.tsx
@@ -51,7 +51,7 @@ describe('Spotfiy playlist adapter', () => {
       album: 'Test album',
       artist: 'Test artist',
       duration: 120,
-      thumbnail: 'thumb.jpg',
+      thumbnail: 'cover.jpg',
       stream: null
     }, {
       uuid: '2',
diff --git a/packages/app/app/containers/SpotifyPlaylistAdapter/__snapshots__/SpotifyPlaylistAdapter.test.tsx.snap b/packages/app/app/containers/SpotifyPlaylistAdapter/__snapshots__/SpotifyPlaylistAdapter.test.tsx.snap
index 35343f310d..62a4ec3707 100644
--- a/packages/app/app/containers/SpotifyPlaylistAdapter/__snapshots__/SpotifyPlaylistAdapter.test.tsx.snap
+++ b/packages/app/app/containers/SpotifyPlaylistAdapter/__snapshots__/SpotifyPlaylistAdapter.test.tsx.snap
@@ -18,7 +18,7 @@ exports[`Spotfiy playlist adapter should display a Spotify playlist 1`] = `
           <div>
             <img
               class="playlist_thumbnail"
-              src="thumb.jpg"
+              src="cover.jpg"
             />
           </div>
           <div
@@ -117,7 +117,7 @@ exports[`Spotfiy playlist adapter should display a Spotify playlist 1`] = `
               <div
                 class="track_table_header_row"
                 role="row"
-                style="grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em auto;"
+                style="grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em auto;"
               >
                 <div
                   class="track_table_header_cell"
@@ -250,7 +250,7 @@ exports[`Spotfiy playlist adapter should display a Spotify playlist 1`] = `
                     data-rbd-draggable-id="0"
                     data-testid="track-table-row"
                     role="row"
-                    style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em;"
+                    style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em;"
                     tabindex="0"
                   >
                     <div
@@ -367,7 +367,7 @@ exports[`Spotfiy playlist adapter should display a Spotify playlist 1`] = `
                     data-rbd-draggable-id="1"
                     data-testid="track-table-row"
                     role="row"
-                    style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em;"
+                    style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em;"
                     tabindex="1"
                   >
                     <div
diff --git a/packages/app/app/containers/StreamVerificationContainer/StreamVerificationContainer.test.tsx b/packages/app/app/containers/StreamVerificationContainer/StreamVerificationContainer.test.tsx
index 866e30945f..c63c9aaf92 100644
--- a/packages/app/app/containers/StreamVerificationContainer/StreamVerificationContainer.test.tsx
+++ b/packages/app/app/containers/StreamVerificationContainer/StreamVerificationContainer.test.tsx
@@ -1,12 +1,12 @@
 import { render } from '@testing-library/react';
 import React from 'react';
 import fetchMock from 'fetch-mock';
+import { Nuclear } from '@nuclear/core/src/rest';
 
 import { AnyProps } from '../../../test/testUtils';
 import { StreamVerificationContainer } from '.';
 import { buildStoreState } from '../../../test/storeBuilders';
 import { configureMockStore, TestStoreProvider, setupI18Next } from '../../../test/testUtils';
-import { NuclearStreamMappingsService } from '@nuclear/core/src/rest';
 
 describe('StreamVerificationContainer', () => {
   beforeAll(() => {
@@ -16,7 +16,7 @@ describe('StreamVerificationContainer', () => {
 
   beforeEach(() => {
     fetchMock.reset();
-    NuclearStreamMappingsService.get(process.env.NUCLEAR_VERIFICATION_SERVICE_URL).clearTopStreamCache();
+    Nuclear.NuclearStreamMappingsService.get(process.env.NUCLEAR_VERIFICATION_SERVICE_URL).clearTopStreamCache();
   });
       
   it('renders nothing when nothing\'s playing', () => {
diff --git a/packages/app/app/containers/StreamVerificationContainer/index.tsx b/packages/app/app/containers/StreamVerificationContainer/index.tsx
index ad97002eee..8191bc1b14 100644
--- a/packages/app/app/containers/StreamVerificationContainer/index.tsx
+++ b/packages/app/app/containers/StreamVerificationContainer/index.tsx
@@ -6,7 +6,7 @@ import { logger } from '@nuclear/core';
 
 import { getTrackArtist, StreamVerification } from '@nuclear/ui';
 import { StreamVerificationProps } from '@nuclear/ui/lib/components/StreamVerification';
-import { rest } from '@nuclear/core';
+import { Nuclear } from '@nuclear/core/src/rest';
 
 import { queue as queueSelector } from '../../selectors/queue';
 import { QueueItem } from '../../reducers/queue';
@@ -14,7 +14,6 @@ import { head } from 'lodash';
 import { pluginsSelectors } from '../../selectors/plugins';
 import { settingsSelector } from '../../selectors/settings';
 import { setStringOption } from '../../actions/settings';
-import { isSuccessCacheEntry } from '@nuclear/core/src/rest/Nuclear/StreamMappings';
 
 const WEAK_VERIFICATION_THRESHOLD = 3;
 
@@ -27,7 +26,7 @@ export const StreamVerificationContainer: React.FC = () => {
   const currentTrack: QueueItem = queue.queueItems[queue.currentTrack];
   const [isLoading, setLoading] = useState(false);
   const [verificationStatus, setVerificationStatus] = useState<StreamVerificationProps['status']>('unknown');
-  const StreamMappingsService = rest.NuclearStreamMappingsService.get(process.env.NUCLEAR_VERIFICATION_SERVICE_URL);
+  const StreamMappingsService = Nuclear.NuclearStreamMappingsService.get(process.env.NUCLEAR_VERIFICATION_SERVICE_URL);
 
   useEffect(() => {
     setVerificationStatus('unknown');
@@ -38,7 +37,7 @@ export const StreamVerificationContainer: React.FC = () => {
         selectedStreamProvider,
         settings?.userId
       ).then(topStream => {
-        if (isSuccessCacheEntry(topStream) && topStream.value.stream_id === head(currentTrack.streams)?.id) {
+        if (Nuclear.isSuccessCacheEntry(topStream) && topStream.value.stream_id === head(currentTrack.streams)?.id) {
           if (topStream.value.score === undefined) {
             logger.error(`Failed to verify stream: ${currentTrack.name} by ${getTrackArtist(currentTrack)}`);
             setVerificationStatus('unverified');
diff --git a/packages/app/app/containers/UserPanelContainer/NuclearSignInFormContainer.tsx b/packages/app/app/containers/UserPanelContainer/NuclearSignInFormContainer.tsx
deleted file mode 100644
index 003f23ecad..0000000000
--- a/packages/app/app/containers/UserPanelContainer/NuclearSignInFormContainer.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-/* eslint-disable no-empty */
-import React from 'react';
-import { TFunction, useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
-
-import { rest } from '@nuclear/core';
-import { SignInRequestBody, SignInResponseBody } from '@nuclear/core/src/rest/Nuclear/Identity.types';
-import { ErrorBody } from '@nuclear/core/src/rest/Nuclear/types';
-import { NuclearSignInForm, useForm } from '@nuclear/ui';
-import { FullscreenLayerProps } from '@nuclear/ui/lib/components/FullscreenLayer';
-import { NuclearSignInFormProps } from '@nuclear/ui/lib/forms/NuclearSignInForm';
-
-import { settingsSelector } from '../../selectors/settings';
-import { signInAction } from '../../actions/nuclear/identity';
-
-export type NuclearSignInFormContainerProps = FullscreenLayerProps & Pick<NuclearSignInFormProps, 'onSignUpClick'>;
-
-const initialFields = (t: TFunction<'forms'>) => ({
-  username: {
-    name: 'username',
-    label: t('username-label'),
-    placeholder: t('username-label')
-  },
-  password: {
-    name: 'password',
-    label: t('password-label'),
-    placeholder: t('password-label')
-  }
-});
-
-export const NuclearSignInFormContainer: React.FC<NuclearSignInFormContainerProps> = ({
-  isOpen,
-  onClose,
-  onSignUpClick
-}) => {
-  const { t } = useTranslation('forms', { keyPrefix: 'nuclear-sign-in' });
-
-  const dispatch = useDispatch();
-  const settings = useSelector(settingsSelector);
-
-  const formProps = useForm<SignInRequestBody>({
-    initialFields: initialFields(t),
-    onSubmit: async (values, { setSubmitting, setStatus }) => {
-      setSubmitting(true);
-      setStatus(undefined);
-      dispatch(signInAction.request());
-      const service = new rest.NuclearIdentityService(settings.nuclearIdentityServiceUrl);
-
-      try {
-        const result = await service.signIn(values);
-        if (result.ok) {
-          dispatch(signInAction.success(result.body as SignInResponseBody));
-          onClose();
-        } else {
-          setStatus({
-            type: 'error',
-            content: (result.body as ErrorBody).message
-          });
-          dispatch(signInAction.failure(result.body as ErrorBody));
-        }
-      } catch (e) {
-        setStatus({
-          type: 'error',
-          content: e.message
-        });
-        dispatch(signInAction.failure(e));
-      } finally {
-        setSubmitting(false);
-      }
-    }
-  });
-
-  return <NuclearSignInForm
-    isOpen={isOpen}
-    onClose={onClose}
-    onSignUpClick={onSignUpClick}
-    message={formProps.status}
-    {...formProps}
-
-    header={t('header')}
-    signInButtonLabel={t('sign-in-button')}
-    noAccountLabel={t('no-account-label')}
-    noAccountLinkLabel={t('no-account-link')}
-  />;
-};
diff --git a/packages/app/app/containers/UserPanelContainer/NuclearSignUpFormContainer.tsx b/packages/app/app/containers/UserPanelContainer/NuclearSignUpFormContainer.tsx
deleted file mode 100644
index b1828a8137..0000000000
--- a/packages/app/app/containers/UserPanelContainer/NuclearSignUpFormContainer.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import React from 'react';
-import { TFunction, useTranslation } from 'react-i18next';
-import * as Yup from 'yup';
-import { SignInResponseBody, SignUpRequestBody, SignUpResponseBody } from '@nuclear/core/src/rest/Nuclear/Identity.types';
-import { NuclearSignUpForm, useForm } from '@nuclear/ui';
-import { FullscreenLayerProps } from '@nuclear/ui/lib/components/FullscreenLayer';
-
-import { signInAction, signUpAction } from '../../actions/nuclear/identity';
-import { useDispatch, useSelector } from 'react-redux';
-import { settingsSelector } from '../../selectors/settings';
-import { NuclearIdentityService } from '@nuclear/core/src/rest/Nuclear/Identity';
-import { ErrorBody, isErrorBody } from '@nuclear/core/src/rest/Nuclear/types';
-
-export type NuclearSignUpFormContainerProps = FullscreenLayerProps;
-
-const initialFields = (t: TFunction<'forms'>) => ({
-  username: {
-    name: 'username',
-    label: t('username-label'),
-    placeholder: t('username-label')
-  },
-  email: {
-    name: 'email',
-    label: t('email-label'),
-    placeholder: t('email-label')
-  },
-  password: {
-    name: 'password',
-    label: t('password-label'),
-    placeholder: t('password-label')
-  }
-});
-
-const validationSchema = (t: TFunction<'forms'>) => Yup.object({
-  username: Yup.string().min(4, t('validation.username.length')).required(t('validation.username.required')),
-  email: Yup.string().email(t('validation.email.invalid')),
-  password: Yup.string().min(6, t('validation.password.length')).required(t('validation.password.required'))
-});
-
-export const NuclearSignUpFormContainer: React.FC<NuclearSignUpFormContainerProps> = ({
-  isOpen,
-  onClose
-}) => {
-  const { t } = useTranslation('forms', { keyPrefix: 'nuclear-sign-up' });
-
-  const dispatch = useDispatch();
-  const settings = useSelector(settingsSelector);
-
-  const formProps = useForm<SignUpRequestBody>({
-    initialFields: initialFields(t),
-    validationSchema: validationSchema(t),
-    onSubmit: async (values, { setSubmitting, setStatus, setErrors }) => {
-      setSubmitting(true);
-      dispatch(signUpAction.request());
-      const service = new NuclearIdentityService(settings.nuclearIdentityServiceUrl);
-
-      try {
-        const result = await service.signUp(values);
-        if (result.ok) {
-          dispatch(signUpAction.success(result.body as SignUpResponseBody));
-          const signInResult = await service.signIn(values);
-          dispatch(signInAction.success(signInResult.body as SignInResponseBody));
-          onClose();
-        } else {
-          if (isErrorBody(result.body)) {
-            setErrors(Object.fromEntries(result.body.errors.map((error) => [error.path, error.message])));
-          }
-          dispatch(signUpAction.failure(result.body as ErrorBody));
-        }
-      } catch (e) {
-        setStatus({
-          type: 'error',
-          content: e.message
-        });
-        dispatch(signUpAction.failure(e));
-      } finally {
-        setSubmitting(false);
-      }
-    }
-  });
-
-  return <NuclearSignUpForm
-    isOpen={isOpen}
-    onClose={onClose}
-    message={formProps.status}
-    {...formProps}
-
-    header={t('header')}
-    secondaryHeader={t('secondary-header')}
-    sideParagraph1={t('side-paragraph-1')}
-    sideParagraph2={t('side-paragraph-2')}
-    signUpButtonLabel={t('sign-up-button')}
-  />;
-};
-
diff --git a/packages/app/app/containers/UserPanelContainer/UserPanelContainer.test.tsx b/packages/app/app/containers/UserPanelContainer/UserPanelContainer.test.tsx
deleted file mode 100644
index 0b03dead58..0000000000
--- a/packages/app/app/containers/UserPanelContainer/UserPanelContainer.test.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import React from 'react';
-import { waitFor } from '@testing-library/dom';
-import userEvent from '@testing-library/user-event';
-import { act } from '@testing-library/react';
-
-import { UserPanelContainer } from '.';
-import { buildStoreState } from '../../../test/storeBuilders';
-import { AnyProps, mountComponent, setupI18Next } from '../../../test/testUtils';
-
-describe('User panel container', () => {
-  beforeAll(() => {
-    setupI18Next();
-  });
-
-  beforeEach(() => {
-    jest.useFakeTimers();
-  });
-
-  afterEach(() => {
-    jest.runOnlyPendingTimers();
-    jest.useRealTimers();
-  });
-
-  it('should render the user panel', () => {
-    const { component } = mountUserPanel();
-    expect(component.asFragment()).toMatchSnapshot();
-  });
-
-  it('should render the sign in form', async () => {
-    const { component } = mountUserPanel();
-
-    await waitFor(() => component.getByText(/Sign up \/ Sign in/i).click());
-
-    expect(component.asFragment()).toMatchSnapshot();
-  });
-
-  it('should render the sign up form', async () => {
-    const { component } = mountUserPanel();
-
-    await waitFor(() => component.getByText(/Sign up \/ Sign in/i).click());
-    await waitFor(() => component.getAllByText(/Sign up/i)[1].click());
-    jest.runAllTimers();
-
-    expect(component.container.querySelector('.fullscreen_layer.hidden')).toBeTruthy();
-
-    expect(component.asFragment()).toMatchSnapshot();
-  });
-
-  it('should validate the sign up form', async () => {
-    const { component } = mountUserPanel();
-
-    await waitFor(() => component.getByText(/Sign up \/ Sign in/i).click());
-    await waitFor(() => component.getAllByText(/Sign up/i)[1].click());
-
-    userEvent.type(component.queryAllByPlaceholderText(/username/i)[1], 'abc');
-    userEvent.type(component.getByPlaceholderText(/email/i), 'not.an.email');
-    userEvent.type(component.queryAllByPlaceholderText(/password/i)[1], 'short');
-
-    await act(async () => {
-      await waitFor(() => userEvent.tab());
-    }); // Needed to flush the microtask queue
-    await component.findByText(/Username must be 4 characters or more/i);
-    await component.findByText(/Email must be a valid email/i);
-    await component.findByText(/Password must be 6 characters or more/i);
-
-    expect(component.asFragment()).toMatchSnapshot();
-  });
-
-  const mountUserPanel = (initialStore?: AnyProps) => {
-    return mountComponent(
-      <UserPanelContainer />,
-      ['/'],
-      initialStore,
-      buildStoreState()
-        .build()
-    );
-  };
-});
diff --git a/packages/app/app/containers/UserPanelContainer/__snapshots__/UserPanelContainer.test.tsx.snap b/packages/app/app/containers/UserPanelContainer/__snapshots__/UserPanelContainer.test.tsx.snap
deleted file mode 100644
index 47188778e1..0000000000
--- a/packages/app/app/containers/UserPanelContainer/__snapshots__/UserPanelContainer.test.tsx.snap
+++ /dev/null
@@ -1,534 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`User panel container should render the sign in form 1`] = `
-<DocumentFragment>
-  <section
-    class="nuclear user_panel signed_out"
-  >
-    <button
-      class="ui button nuclear button"
-    >
-      Sign up / Sign in
-    </button>
-  </section>
-  <div
-    class="fade fullscreen_layer animating in visible transition"
-    style="animation-duration: 200ms;"
-  />
-  <div
-    class="fade fullscreen_layer animating in visible transition"
-    style="animation-duration: 200ms;"
-  >
-    <div
-      class="fullscreen_form_container nuclear"
-    >
-      <div
-        class="nuclear box fullscreen_form_box shadow"
-      >
-        <form
-          class="ui form fullscreen_form"
-        >
-          <h1
-            class="ui inverted header form_header"
-          >
-             Sign in
-          </h1>
-          <div
-            class="field nuclear input"
-          >
-            <label>
-              Username
-            </label>
-            <div
-              class="ui input"
-              datatestid="username"
-            >
-              <input
-                name="username"
-                placeholder="Username"
-                type="text"
-                value=""
-              />
-            </div>
-          </div>
-          <div
-            class="field nuclear input"
-          >
-            <label>
-              Password
-            </label>
-            <div
-              class="ui input"
-              datatestid="password"
-            >
-              <input
-                name="password"
-                placeholder="Password"
-                type="password"
-                value=""
-              />
-            </div>
-          </div>
-          <div
-            class="buttons_row"
-          >
-            <span>
-              Don't have an account?
-              <button
-                class="ui pink button nuclear button text"
-                type="button"
-              >
-                Sign up
-              </button>
-            </span>
-            <button
-              class="ui pink button nuclear button"
-              type="submit"
-            >
-              Sign in
-            </button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`User panel container should render the sign up form 1`] = `
-<DocumentFragment>
-  <section
-    class="nuclear user_panel signed_out"
-  >
-    <button
-      class="ui button nuclear button"
-    >
-      Sign up / Sign in
-    </button>
-  </section>
-  <div
-    class="fade fullscreen_layer visible transition"
-    style=""
-  />
-  <div
-    class="fade fullscreen_layer hidden transition"
-    style=""
-  >
-    <div
-      class="fullscreen_form_container nuclear"
-    >
-      <div
-        class="nuclear box fullscreen_form_box shadow"
-      >
-        <form
-          class="ui form fullscreen_form"
-        >
-          <h1
-            class="ui inverted header form_header"
-          >
-             Sign in
-          </h1>
-          <div
-            class="field nuclear input"
-          >
-            <label>
-              Username
-            </label>
-            <div
-              class="ui input"
-              datatestid="username"
-            >
-              <input
-                name="username"
-                placeholder="Username"
-                type="text"
-                value=""
-              />
-            </div>
-          </div>
-          <div
-            class="field nuclear input"
-          >
-            <label>
-              Password
-            </label>
-            <div
-              class="ui input"
-              datatestid="password"
-            >
-              <input
-                name="password"
-                placeholder="Password"
-                type="password"
-                value=""
-              />
-            </div>
-          </div>
-          <div
-            class="buttons_row"
-          >
-            <span>
-              Don't have an account?
-              <button
-                class="ui pink button nuclear button text"
-                type="button"
-              >
-                Sign up
-              </button>
-            </span>
-            <button
-              class="ui pink button nuclear button"
-              type="submit"
-            >
-              Sign in
-            </button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-  <div
-    class="fade fullscreen_layer visible transition"
-    style=""
-  >
-    <div
-      class="fullscreen_form_container nuclear"
-    >
-      <div
-        class="nuclear box fullscreen_form_box shadow"
-      >
-        <div
-          class="nuclear form_side_content"
-        >
-          <img
-            src="test-file-stub"
-          />
-          <div
-            class="ui inverted header nuclear"
-          >
-            Sign up to Nuclear Web Services
-          </div>
-          <p>
-            NWS enables you to backup your playlists online and share them.
-          </p>
-          <p>
-            Providing your email is optional; it will allow you to recover your account if you forget your password.
-          </p>
-        </div>
-        <form
-          class="ui form fullscreen_form"
-        >
-          <h1
-            class="ui inverted header form_header"
-          >
-            Sign up
-          </h1>
-          <div
-            class="field nuclear input"
-          >
-            <label>
-              Username
-            </label>
-            <div
-              class="ui input"
-              datatestid="username"
-            >
-              <input
-                name="username"
-                placeholder="Username"
-                type="text"
-                value=""
-              />
-            </div>
-          </div>
-          <div
-            class="field nuclear input"
-          >
-            <label>
-              Email
-            </label>
-            <div
-              class="ui input"
-              datatestid="email"
-            >
-              <input
-                name="email"
-                placeholder="Email"
-                type="text"
-                value=""
-              />
-            </div>
-          </div>
-          <div
-            class="field nuclear input"
-          >
-            <label>
-              Password
-            </label>
-            <div
-              class="ui input"
-              datatestid="password"
-            >
-              <input
-                name="password"
-                placeholder="Password"
-                type="password"
-                value=""
-              />
-            </div>
-          </div>
-          <div
-            class="buttons_row"
-          >
-            <span />
-            <button
-              class="ui pink button nuclear button"
-              type="submit"
-            >
-              Sign up
-            </button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`User panel container should render the user panel 1`] = `
-<DocumentFragment>
-  <section
-    class="nuclear user_panel signed_out"
-  >
-    <button
-      class="ui button nuclear button"
-    >
-      Sign up / Sign in
-    </button>
-  </section>
-</DocumentFragment>
-`;
-
-exports[`User panel container should validate the sign up form 1`] = `
-<DocumentFragment>
-  <section
-    class="nuclear user_panel signed_out"
-  >
-    <button
-      class="ui button nuclear button"
-    >
-      Sign up / Sign in
-    </button>
-  </section>
-  <div
-    class="fade fullscreen_layer animating in visible transition"
-    style="animation-duration: 200ms;"
-  />
-  <div
-    class="fade fullscreen_layer animating out visible transition"
-    style="animation-duration: 200ms;"
-  >
-    <div
-      class="fullscreen_form_container nuclear"
-    >
-      <div
-        class="nuclear box fullscreen_form_box shadow"
-      >
-        <form
-          class="ui form fullscreen_form"
-        >
-          <h1
-            class="ui inverted header form_header"
-          >
-             Sign in
-          </h1>
-          <div
-            class="field nuclear input"
-          >
-            <label>
-              Username
-            </label>
-            <div
-              class="ui input"
-              datatestid="username"
-            >
-              <input
-                name="username"
-                placeholder="Username"
-                type="text"
-                value=""
-              />
-            </div>
-          </div>
-          <div
-            class="field nuclear input"
-          >
-            <label>
-              Password
-            </label>
-            <div
-              class="ui input"
-              datatestid="password"
-            >
-              <input
-                name="password"
-                placeholder="Password"
-                type="password"
-                value=""
-              />
-            </div>
-          </div>
-          <div
-            class="buttons_row"
-          >
-            <span>
-              Don't have an account?
-              <button
-                class="ui pink button nuclear button text"
-                type="button"
-              >
-                Sign up
-              </button>
-            </span>
-            <button
-              class="ui pink button nuclear button"
-              type="submit"
-            >
-              Sign in
-            </button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-  <div
-    class="fade fullscreen_layer animating in visible transition"
-    style="animation-duration: 200ms;"
-  >
-    <div
-      class="fullscreen_form_container nuclear"
-    >
-      <div
-        class="nuclear box fullscreen_form_box shadow"
-      >
-        <div
-          class="nuclear form_side_content"
-        >
-          <img
-            src="test-file-stub"
-          />
-          <div
-            class="ui inverted header nuclear"
-          >
-            Sign up to Nuclear Web Services
-          </div>
-          <p>
-            NWS enables you to backup your playlists online and share them.
-          </p>
-          <p>
-            Providing your email is optional; it will allow you to recover your account if you forget your password.
-          </p>
-        </div>
-        <form
-          class="ui form fullscreen_form"
-        >
-          <h1
-            class="ui inverted header form_header"
-          >
-            Sign up
-          </h1>
-          <div
-            class="error field nuclear input"
-          >
-            <label>
-              Username
-            </label>
-            <div
-              aria-atomic="true"
-              class="ui pointing below prompt label"
-              role="alert"
-            >
-              Username must be 4 characters or more
-            </div>
-            <div
-              class="ui input"
-              datatestid="username"
-            >
-              <input
-                aria-invalid="true"
-                name="username"
-                placeholder="Username"
-                type="text"
-                value="abc"
-              />
-            </div>
-          </div>
-          <div
-            class="error field nuclear input"
-          >
-            <label>
-              Email
-            </label>
-            <div
-              aria-atomic="true"
-              class="ui pointing below prompt label"
-              role="alert"
-            >
-              Email must be a valid email
-            </div>
-            <div
-              class="ui input"
-              datatestid="email"
-            >
-              <input
-                aria-invalid="true"
-                name="email"
-                placeholder="Email"
-                type="text"
-                value="not.an.email"
-              />
-            </div>
-          </div>
-          <div
-            class="error field nuclear input"
-          >
-            <label>
-              Password
-            </label>
-            <div
-              aria-atomic="true"
-              class="ui pointing below prompt label"
-              role="alert"
-            >
-              Password must be 6 characters or more
-            </div>
-            <div
-              class="ui input"
-              datatestid="password"
-            >
-              <input
-                aria-invalid="true"
-                name="password"
-                placeholder="Password"
-                type="password"
-                value="short"
-              />
-            </div>
-          </div>
-          <div
-            class="buttons_row"
-          >
-            <span />
-            <button
-              class="ui pink button nuclear button"
-              type="submit"
-            >
-              Sign up
-            </button>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
diff --git a/packages/app/app/containers/UserPanelContainer/index.tsx b/packages/app/app/containers/UserPanelContainer/index.tsx
deleted file mode 100644
index 7ce67d2278..0000000000
--- a/packages/app/app/containers/UserPanelContainer/index.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
-import { noop } from 'lodash';
-
-import { UserPanel, FullscreenLayer  } from '@nuclear/ui';
-
-import { NuclearSignInFormContainer } from './NuclearSignInFormContainer';
-import { NuclearSignUpFormContainer } from './NuclearSignUpFormContainer';
-import { nuclearSelectors } from '../../selectors/nuclear';
-import { signOutAction } from '../../actions/nuclear/identity';
-
-export const UserPanelContainer: React.FC = () => {
-  const { t } = useTranslation('app');
-  const dispatch = useDispatch();
-
-  const [isSignUpFormOpen, setSignUpFormOpen] = useState(false);
-  const [isSignInFormOpen, setSignInFormOpen] = useState(false);
-
-  const identity = useSelector(nuclearSelectors.identity);
-
-  return <>
-    <UserPanel
-      user={identity.signedInUser}
-      actionsTooltipContent={t('user-panel.actions-tooltip')}
-      signUpButtonLabel={t('user-panel.sign-up')}
-      onSettingsClick={() => { }}
-      onSignUpClick={() => setSignInFormOpen(true)}
-      options={[{
-        text: t('user-panel.sign-out'),
-        value: 'sign-out',
-        onClick: () => dispatch(signOutAction())
-      }]}
-    />
-    <FullscreenLayer 
-      isOpen={isSignInFormOpen || isSignUpFormOpen}
-      onClose={noop}
-    />
-    <NuclearSignInFormContainer
-      isOpen={isSignInFormOpen}
-      onClose={() => setSignInFormOpen(false)}
-      onSignUpClick={() => {
-        setSignInFormOpen(false);
-        setSignUpFormOpen(true);
-      }}
-    />
-    <NuclearSignUpFormContainer
-      isOpen={isSignUpFormOpen}
-      onClose={() => setSignUpFormOpen(false)}
-    />
-  </>;
-};
diff --git a/packages/app/app/reducers/index.ts b/packages/app/app/reducers/index.ts
index 1a7345f805..5d0d593fbc 100644
--- a/packages/app/app/reducers/index.ts
+++ b/packages/app/app/reducers/index.ts
@@ -20,7 +20,6 @@ import TagReducer from './tag';
 import ToastsReducer from './toasts';
 import { reducer as LocalLibraryReducer } from './local';
 import { reducer as MastodonReducer } from './mastodon';
-import { reducer as NuclearReducer } from './nuclear';
 
 const rootReducer = combineReducers({
   connectivity: ConnectivityReducer,
@@ -33,7 +32,6 @@ const rootReducer = combineReducers({
   local: LocalLibraryReducer,
   lyrics: LyricsReducer,
   mastodon: MastodonReducer,
-  nuclear: NuclearReducer,
   player: PlayerReducer,
   playlists: PlaylistsReducer,
   plugin: PluginsReducer,
diff --git a/packages/app/app/reducers/nuclear/identity.ts b/packages/app/app/reducers/nuclear/identity.ts
deleted file mode 100644
index b293312aa2..0000000000
--- a/packages/app/app/reducers/nuclear/identity.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { UserAccountState } from '@nuclear/core/src/rest/Nuclear/Identity.types';
-import produce from 'immer';
-import { pick } from 'lodash';
-import { ActionType, createReducer } from 'typesafe-actions';
-import { NuclearIdentity } from '../../actions/actionTypes';
-
-import * as actions from '../../actions/nuclear/identity';
-
-export class IdentityStore {
-  token: null | string;
-  signedInUser: null | {
-    id: string;
-    username: string;
-    displayName: string;
-    accountState: UserAccountState;
-  };
-}
-
-const defaultState = { ...new IdentityStore() };
-
-export type IdentityAction = ActionType<typeof actions>;
-
-export const reducer = createReducer<IdentityStore, IdentityAction>(
-  defaultState,
-  {
-    [NuclearIdentity.SIGN_IN_SUCCESS]: (state, action) =>
-      produce(state, (draft) => {
-        draft.token = action.payload.token;
-        draft.signedInUser = pick(action.payload.user, [
-          'id',
-          'username',
-          'displayName',
-          'accountState'
-        ]);
-      }),
-    [NuclearIdentity.SIGN_OUT]: (state) =>
-      produce(state, (draft) => {
-        draft.token = null;
-        draft.signedInUser = null;
-      })
-  }
-);
diff --git a/packages/app/app/reducers/nuclear/index.ts b/packages/app/app/reducers/nuclear/index.ts
deleted file mode 100644
index cc98c6e981..0000000000
--- a/packages/app/app/reducers/nuclear/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { combineReducers } from 'redux';
-
-import { reducer as identity } from './identity';
-
-export const reducer = combineReducers({
-  identity
-});
diff --git a/packages/app/app/reducers/playlists.ts b/packages/app/app/reducers/playlists.ts
index d71c991158..eb5242ad31 100644
--- a/packages/app/app/reducers/playlists.ts
+++ b/packages/app/app/reducers/playlists.ts
@@ -9,7 +9,6 @@ import { Loadable } from './types';
 
 export class PlaylistsStore {
   localPlaylists: Loadable<Playlist[]> = {...startingStateMeta};
-  remotePlaylists: Loadable<Playlist[]> = {...startingStateMeta};
 }
 
 const defaultState = { ...new PlaylistsStore() };
diff --git a/packages/app/app/reducers/search.ts b/packages/app/app/reducers/search.ts
index 92e7e78cdf..beddd39f2b 100644
--- a/packages/app/app/reducers/search.ts
+++ b/packages/app/app/reducers/search.ts
@@ -1,6 +1,4 @@
-import { Artist } from '@nuclear/core';
-import { AlbumDetails, ArtistDetails, SearchResultsAlbum, SearchResultsPodcast } from '@nuclear/core/src/plugins/plugins.types';
-import { LastfmTrackMatchInternal } from '@nuclear/core/src/rest/Lastfm.types';
+import { AlbumDetails, ArtistDetails, SearchResultsAlbum, SearchResultsArtist, SearchResultsTrack } from '@nuclear/core/src/plugins/plugins.types';
 import { YoutubeResult } from '@nuclear/core/src/rest/Youtube';
 import { ActionType, getType } from 'typesafe-actions';
 import { SearchActions } from '../actions/search';
@@ -15,29 +13,29 @@ export type ArtistDetailsState = Partial<ArtistDetails> & {
 
 export type AlbumDetailsState = Partial<AlbumDetails> & {loading?: boolean, error?: boolean}
 
-type SearchState = {
-  artistSearchResults: Artist[]
-  albumSearchResults: SearchResultsAlbum[]
-  podcastSearchResults: SearchResultsPodcast[]
-  trackSearchResults: string | { id: string, info: LastfmTrackMatchInternal[] } | undefined[]
-  playlistSearchResults: { id:string, info: YoutubeResult[] } | undefined[]
-  liveStreamSearchResults: { id:string, info: YoutubeResult[] } | undefined[]
-  albumDetails:{[key: string]:  AlbumDetailsState }
-  artistDetails: {[key: string]: ArtistDetailsState }
-  searchHistory: string[]
-  unifiedSearchStarted: boolean
-  playlistSearchStarted: boolean | string
-  liveStreamSearchStarted: boolean | string
-  isFocused: boolean
+export type SearchState = {
+  artistSearchResults: SearchResultsArtist[];
+  albumSearchResults: SearchResultsAlbum[];
+  trackSearchResults: SearchResultsTrack[];
+  trackSearchState: { isReady: boolean; isLoading: boolean; hasError: boolean; };
+  playlistSearchResults: { id:string, info: YoutubeResult[] } | undefined;
+  liveStreamSearchResults: { id:string, info: SearchResultsTrack[] } | undefined;
+  albumDetails:{[key: string]:  AlbumDetailsState };
+  artistDetails: {[key: string]: ArtistDetailsState };
+  searchHistory: string[];
+  unifiedSearchStarted: boolean;
+  playlistSearchStarted: boolean | string;
+  liveStreamSearchStarted: boolean | string;
+  isFocused: boolean;
 }
 
 const initialState: SearchState = {
   artistSearchResults: [],
   albumSearchResults: [],
-  podcastSearchResults: [],
   trackSearchResults: [],
-  playlistSearchResults: [],
-  liveStreamSearchResults: [],
+  trackSearchState: { isReady: false, isLoading: false, hasError: false },
+  playlistSearchResults: undefined,
+  liveStreamSearchResults: undefined,
   albumDetails: {},
   artistDetails: {},
   searchHistory: [],
@@ -73,12 +71,7 @@ export default function SearchReducer(state = initialState, action: SearchReduce
   case getType(SearchActions.artistSearchSuccess):
     return {
       ...state,
-      artistSearchResults: action.payload.map(artist => Artist.fromSearchResultData(artist))
-    };
-  case getType(SearchActions.podcastSearchSuccess):
-    return {
-      ...state,
-      podcastSearchResults: action.payload
+      artistSearchResults: action.payload
     };
   case getType(SearchActions.albumInfoStart):
     return {
@@ -180,21 +173,31 @@ export default function SearchReducer(state = initialState, action: SearchReduce
         }
       }
     };
-  case getType(SearchActions.lastFmTrackSearchStart):
+  case getType(SearchActions.trackSearchAction.request):
     return {
       ...state,
-      trackSearchResults: action.payload
+      trackSearchState: {
+        isReady: false,
+        isLoading: true,
+        hasError: false
+      },
+      trackSearchResults: []
     };
-  case getType(SearchActions.lastFmTrackSearchSuccess):
+  case getType(SearchActions.trackSearchAction.success):
     return {
       ...state,
+      trackSearchState: {
+        isReady: true,
+        isLoading: false,
+        hasError: false
+      },
       trackSearchResults: action.payload
     };
   case getType(SearchActions.youtubePlaylistSearchStart):
     return {
       ...state,
       playlistSearchStarted: action.payload,
-      playlistSearchResults: []
+      playlistSearchResults: undefined
     };
   case getType(SearchActions.youtubePlaylistSearchSuccess):
     return {
@@ -205,7 +208,7 @@ export default function SearchReducer(state = initialState, action: SearchReduce
     return {
       ...state,
       liveStreamSearchStarted: action.payload,
-      liveStreamSearchResults: []
+      liveStreamSearchResults: undefined
     };
   case getType(SearchActions.youtubeLiveStreamSearchSuccess):
     return {
@@ -215,7 +218,7 @@ export default function SearchReducer(state = initialState, action: SearchReduce
   case getType(SearchActions.youtubeLiveStreamSearchError):
     return {
       ...state,
-      liveStreamSearchResults: []
+      liveStreamSearchResults: undefined
     };
   case getType(SearchActions.setSearchDropdownVisibility):
     return {
diff --git a/packages/app/app/selectors/nuclear.ts b/packages/app/app/selectors/nuclear.ts
deleted file mode 100644
index a5e8ce32eb..0000000000
--- a/packages/app/app/selectors/nuclear.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { createStateSelectors } from './helpers';
-
-export const nuclearSelectors = createStateSelectors('nuclear', ['identity']);
diff --git a/packages/app/app/selectors/playlists.ts b/packages/app/app/selectors/playlists.ts
index 47a4450f30..3f37950153 100644
--- a/packages/app/app/selectors/playlists.ts
+++ b/packages/app/app/selectors/playlists.ts
@@ -3,7 +3,6 @@ import { createStateSelectors } from './helpers';
 export const playlistsSelectors = createStateSelectors(
   'playlists',
   [
-    'localPlaylists',
-    'remotePlaylists'
+    'localPlaylists'
   ]
 );
diff --git a/packages/app/app/selectors/search.ts b/packages/app/app/selectors/search.ts
index 9e56dda743..33ddb99817 100644
--- a/packages/app/app/selectors/search.ts
+++ b/packages/app/app/selectors/search.ts
@@ -6,7 +6,13 @@ export const searchSelectors = createStateSelectors(
     'albumDetails',
     'artistDetails', 
     'searchHistory',
+    'playlistSearchStarted',
     'unifiedSearchStarted',
-    'isFocused'
+    'isFocused',
+    'trackSearchResults',
+    'artistSearchResults',
+    'albumSearchResults',
+    'playlistSearchResults',
+    'liveStreamSearchResults'
   ]
 );
diff --git a/packages/app/test/storeBuilders.ts b/packages/app/test/storeBuilders.ts
index d1095c4391..ac3aef2874 100644
--- a/packages/app/test/storeBuilders.ts
+++ b/packages/app/test/storeBuilders.ts
@@ -1,5 +1,4 @@
 import Sound from 'react-hifi';
-import { UserAccountState } from '@nuclear/core/src/rest/Nuclear/Identity.types';
 import { DownloadStatus } from '@nuclear/ui/lib/types';
 
 import { RootState } from '../app/reducers';
@@ -21,10 +20,10 @@ export const buildStoreState = () => {
     search: {
       artistSearchResults: [],
       albumSearchResults: [],
-      podcastSearchResults: [],
       trackSearchResults: [],
-      playlistSearchResults: [],
-      liveStreamSearchResults: [],
+      trackSearchState: { isReady: false, isLoading: false, hasError: false },
+      playlistSearchResults: undefined,
+      liveStreamSearchResults: undefined,
       albumDetails: {},
       artistDetails: {},
       searchHistory: [],
@@ -43,8 +42,7 @@ export const buildStoreState = () => {
       userPlugins: {}
     },
     playlists: {
-      localPlaylists: { ...startingStateMeta },
-      remotePlaylists: { ...startingStateMeta }
+      localPlaylists: { ...startingStateMeta }
     },
     player: {
       playbackStatus: Sound.status.PAUSED,
@@ -76,12 +74,6 @@ export const buildStoreState = () => {
       queueItems: [],
       currentTrack: 0
     },
-    nuclear: {
-      identity: {
-        token: null,
-        signedInUser: null
-      }
-    },
     settings: {}
   };
 
@@ -300,7 +292,7 @@ export const buildStoreState = () => {
                 searchName: 'Test Metadata Provider',
                 searchForArtists: jest.fn().mockResolvedValue([]),
                 searchForReleases: jest.fn().mockResolvedValue([]),
-                searchForPodcast: jest.fn().mockResolvedValue([]),
+                searchForTracks: jest.fn().mockResolvedValue([]),
                 fetchArtistDetailsByName: jest.fn(artistName => {
                   switch (artistName) {
                   case 'artist-similar-1':
@@ -360,7 +352,6 @@ export const buildStoreState = () => {
       state = {
         ...state,
         playlists: {
-          remotePlaylists: { ...startingStateMeta },
           localPlaylists: {
             isLoading: isLoading || false,
             hasError: false,
@@ -772,46 +763,28 @@ export const buildStoreState = () => {
         ...state.search,
         artistSearchResults: [
           {
-            uuid: 'test-uuid',
+            id: 'test-artist-id',
             name: 'Test Artist',
             coverImage: 'https://test-cover-url',
-            thumbnail: 'https://test-thumb-url',
-            cleanName: () => { },
-            addSearchResultData: () => { }
+            thumb: 'https://test-thumb-url',
+            source: SearchResultsSource.Discogs
           }
         ],
         liveStreamSearchResults: {
           id: 'test',
           info: [
             {
-              streams: [{
-                source: 'Test LiveStream Provider',
-                id: '_CuklIb9d3fI'
-              }],
-              name: 'Test LiveStream',
-              thumbnail: 'https://test-thumb-url',
-              artist: {
-                name: 'Test artist'
-              }
+              id: '1',
+              title: 'Test LiveStream',
+              thumb: 'https://test-thumb-url',
+              artist: 'Test artist',
+              source: SearchResultsSource.Youtube
             }
           ]
         }
       };
       return this as StoreStateBuilder;
     },
-    withLoggedInUser() {
-      state.nuclear.identity = {
-        ...state.nuclear.identity,
-        token: 'auth-token',
-        signedInUser: {
-          id: '1',
-          username: 'nukeop',
-          displayName: 'nukeop',
-          accountState: UserAccountState.UNCONFIRMED
-        }
-      };
-      return this as StoreStateBuilder;
-    },
     withLocal(tracks?: LocalLibraryState['tracks']) {
       state = {
         ...state,
diff --git a/packages/core/src/helpers/playlist/spotify.ts b/packages/core/src/helpers/playlist/spotify.ts
deleted file mode 100644
index 64c42ef676..0000000000
--- a/packages/core/src/helpers/playlist/spotify.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-/* eslint-disable node/no-extraneous-require */
-/* eslint-disable @typescript-eslint/no-var-requires */
-type SpotifyTrack = {
-  index: number;
-  id?: string;
-  thumbnail: string;
-  title: string;
-  album: string;
-  duration: string;
-  artist: string;
-  otherArtists?: string[];
-}
-
-type SpotifyPlaylist = {
-  name: string;
-  totalTracks: number;
-  source: 'Spotify';
-  tracks: SpotifyTrack[];
-}
-
-export default (async function () {
-  const { ipcRenderer } = window.require('electron');
-
-  function getPlaylistGeneralInfo() {
-    const tracklistContainer = document.querySelector('div[data-testid="playlist-tracklist"]');
-    const totalTracks = parseInt(
-      tracklistContainer.getAttribute('aria-rowcount')
-    ) - 1;
-    const name = tracklistContainer.getAttribute('aria-label');
-
-    return {
-      name,
-      totalTracks,
-      tracks: [],
-      source: 'Spotify' as const
-    };
-  }
-
-
-  function getScrollBar() {
-    const scrollBar = document.querySelector(
-      'div.os-scrollbar:nth-child(4) > div:nth-child(1) > div:nth-child(1)'
-    );
-    const scrollBarBoundingBox = scrollBar.getBoundingClientRect();
-
-    return scrollBarBoundingBox;
-  }
-
-  function getTracksFromDOM(processedIndex) {
-    const cookieBanner = document.getElementById('onetrust-banner-sdk');
-
-    if (cookieBanner) {
-      cookieBanner.style.setProperty('display', 'none', 'important');
-    }
-    
-    const nodeTracks = document.querySelector('div[data-testid="playlist-tracklist"] div[data-testid="top-sentinel"] + div').childNodes as NodeListOf<Element>;
-    const tracks = [];
-
-    for (let i = 0; i < nodeTracks.length; i += 1) {
-      if (nodeTracks[i]) {
-        const index = parseInt(nodeTracks[i].getAttribute('aria-rowindex'));
-
-        if (index > processedIndex) {
-          nodeTracks[i].scrollIntoView();
-          const nodeDetails = nodeTracks[i].childNodes[0] as HTMLElement;
-          const track: SpotifyTrack = {
-            index: 0,
-            thumbnail: '',
-            title: '',
-            album: '',
-            duration: '',
-            artist: ''
-          };
-          track.index = index;
-          track.thumbnail = nodeDetails
-            .querySelector('div[aria-colindex="2"]')
-            .querySelector('img')
-            ?.getAttribute('src');
-
-          const titleAndArtist = nodeDetails
-            .querySelector<HTMLElement>('div[aria-colindex="2"]')
-            .innerText.split('\n');
-          const artistArray = titleAndArtist[titleAndArtist.length - 1].split(', ');
-
-          track.title = titleAndArtist[0];
-          track.album = nodeDetails.querySelector<HTMLElement>('div[aria-colindex="3"]').innerText;
-          track.duration = nodeDetails.innerText.split('\n').pop();
-          track.artist = artistArray[0];
-          track.otherArtists = artistArray.slice(1);
-
-          tracks.push(track);
-        }
-      }
-    }
-
-    return tracks;
-  }
-
-  const wait = async (time) => {
-    return await new Promise((resolve) => {
-      setTimeout(() => {
-        resolve('done');
-      }, time);
-    });
-  };
-
-  async function extractPlaylist(): Promise<SpotifyPlaylist> {
-    const playlist = getPlaylistGeneralInfo();
-    
-    ipcRenderer.sendToHost('import-spotify-playlist-metadata', playlist);
-
-    const scrollBar = getScrollBar();
-    const scrollHeight = scrollBar.height;
-
-    let processedIndex = 0;
-    const extractedTracks = [];
-    const x = scrollBar.x + scrollBar.width / 2;
-    let y = scrollBar.y;
-
-    const scrollBarElement = document.querySelectorAll('.os-scrollbar-track')[1];
-
-    while (processedIndex < playlist.totalTracks) {
-      ipcRenderer.sendToHost('import-spotify-playlist-progress', processedIndex);
-      const newTracks = getTracksFromDOM(processedIndex);
-      if (newTracks.length) {
-        processedIndex = newTracks[newTracks.length - 1].index;
-        extractedTracks.push(...newTracks);
-      }
-
-      const evt = new MouseEvent('mousedown', {
-        bubbles: true,
-        cancelable: true,
-        view: window,
-        detail: 0,
-        screenX: 0,
-        screenY: 0,
-        clientX: x,
-        clientY: y,
-        ctrlKey: false,
-        altKey: false,
-        shiftKey: false,
-        metaKey: false,
-        button: 0,
-        relatedTarget: null
-      });
-      scrollBarElement.dispatchEvent(evt);
-      y += scrollHeight;
-
-      await wait(500);
-    }
-
-    playlist.tracks = extractedTracks;
-    return playlist;
-  }
-
-  const playlists = await extractPlaylist();
-
-  ipcRenderer.sendToHost('import-spotify-playlist-success', playlists);
-});
diff --git a/packages/core/src/logger/nuclear-logger.ts b/packages/core/src/logger/nuclear-logger.ts
index 3e3cc2a37d..f181712730 100644
--- a/packages/core/src/logger/nuclear-logger.ts
+++ b/packages/core/src/logger/nuclear-logger.ts
@@ -8,12 +8,14 @@ const isRenderer = process.type === 'renderer';
 const isDevelopment = process.env.NODE_ENV === 'development';
 
 const logChannel = '__ELECTRON_NUCLEAR_LOGGER_LOG__';
+const debugChannel = '__ELECTRON_NUCLEAR_LOGGER_DEBUG__';
 const warnChannel = '__ELECTRON_NUCLEAR_LOGGER_WARN__';
 const errorChannel = '__ELECTRON_NUCLEAR_LOGGER_ERROR__';
 const updateChannel = '__ELECTRON_NUCLEAR_LOGGER_UPDATE__';
 const defaultsNameSpace = '__ELECTRON_NUCLEAR_LOGGER_DEFAULTS__';
 
 const logLevels = {
+  debug: -1,
   info: 0,
   warn: 1,
   error: 2
@@ -44,13 +46,14 @@ if (isMain) {
 let isConsoleHooked = false;
 const _console: Partial<Console> = {};
 
-const hookableMethods = ['log', 'warn', 'error', 'time', 'timeEnd'];
+const hookableMethods = ['log', 'debug', 'warn', 'error', 'time', 'timeEnd'];
 
 let longestNameLength = 0;
 
 const terminalColors = {
   reset: '\x1b[0m',
   dim: '\x1b[2m',
+  cyan: '\x1b[36m',
   red: '\x1b[31m',
   yellow: '\x1b[33m'
 };
@@ -116,6 +119,25 @@ class NuclearLogger {
     this.console.log(...args);
   }
 
+  debug(...args: LogArgs): void {
+    if (logLevels[this.options.logLevel] > logLevels.debug) {
+      return;
+    }
+
+    if (isRenderer) {
+      ipcRenderer.send(debugChannel, args);
+    } else if (this.#name) {
+      args.unshift(`${this.#getPrefix()} ${terminalColors.cyan}`);
+      args.push(terminalColors.reset);
+    }
+
+    if (this.options.ignore && this.options.ignore.test(args.join(' '))) {
+      return;
+    }
+
+    this.console.log(...args);
+  }
+
   warn(...args: LogArgs): void {
     if (logLevels[this.options.logLevel] > logLevels.warn) {
       return;
@@ -286,7 +308,8 @@ class NuclearLogger {
 }
 
 const logger = new NuclearLogger({
-  name: isMain ? 'main' : undefined
+  name: isMain ? 'main' : undefined,
+  logLevel: isDevelopment ? 'debug' : 'info'
 });
 
 if (isMain) {
@@ -304,6 +327,17 @@ if (isMain) {
     });
   }
 
+  if (ipcMain.listenerCount(debugChannel) === 0) {
+    ipcMain.on(debugChannel, (event: IpcMainEvent, data: LogArgs) => {
+      BrowserWindow.getAllWindows()
+        .filter(win => win.webContents.id !== event.sender.id)
+        .forEach(win => {
+          win.webContents.send(debugChannel, data);
+        });
+      rendererLogger.debug(...data);
+    });
+  }
+
   if (ipcMain.listenerCount(warnChannel) === 0) {
     ipcMain.on(warnChannel, (event: IpcMainEvent, data: LogArgs) => {
       BrowserWindow.getAllWindows()
@@ -335,6 +369,12 @@ if (isMain) {
     }
   });
 
+  ipcRenderer.on(debugChannel, (_event: IpcRendererEvent, data: LogArgs) => {
+    if (!isLoggingInProgress) {
+      logger.debug(...data);
+    }
+  });
+
   ipcRenderer.on(warnChannel, (_event: IpcRendererEvent, data: LogArgs) => {
     if (!isLoggingInProgress) {
       logger.warn(...data);
@@ -348,6 +388,7 @@ if (isMain) {
   });
 
   const originalLog = logger.log.bind(logger);
+  const originalDebug = logger.debug.bind(logger);
   const originalWarn = logger.warn.bind(logger);
   const originalError = logger.error.bind(logger);
 
@@ -357,6 +398,12 @@ if (isMain) {
     isLoggingInProgress = false;
   };
 
+  logger.debug = (...args: LogArgs) => {
+    isLoggingInProgress = true;
+    originalDebug(...args);
+    isLoggingInProgress = false;
+  };
+
   logger.warn = (...args: LogArgs) => {
     isLoggingInProgress = true;
     originalWarn(...args);
diff --git a/packages/core/src/plugins/meta/discogs.ts b/packages/core/src/plugins/meta/discogs.ts
index 12707a3fa5..7369595d79 100644
--- a/packages/core/src/plugins/meta/discogs.ts
+++ b/packages/core/src/plugins/meta/discogs.ts
@@ -248,7 +248,7 @@ class DiscogsMetaProvider extends MetaProvider {
     )).json();
     return this.discogsReleaseInfoToGeneric(
       albumData,
-      albumType === 'master' ? AlbumType.master : AlbumType.release
+      albumType === 'master' ? 'master' : 'release'
     );
   }
 }
diff --git a/packages/core/src/plugins/meta/index.ts b/packages/core/src/plugins/meta/index.ts
index 159223e86e..b80a8b3755 100644
--- a/packages/core/src/plugins/meta/index.ts
+++ b/packages/core/src/plugins/meta/index.ts
@@ -2,7 +2,6 @@ export { default as AudiusMetaProvider } from './audius';
 export { default as DiscogsMetaProvider } from './discogs';
 export { default as MusicbrainzMetaProvider } from './musicbrainz';
 export { default as BandcampMetaProvider } from './bandcamp';
-export { default as iTunesPodcastMetaProvider } from './itunespodcast';
 export { default as iTunesMusicMetaProvider } from './itunesmusic';
-export { SpotifyMetaProvider } from './spotify';
-export {SoundcloudMetaProvider} from './SoundcloudPlugin';
+export { SoundcloudMetaProvider } from './SoundcloudPlugin';
+export { SoytifyMetaProvider } from './soytify/soytify';
diff --git a/packages/core/src/plugins/meta/itunespodcast.test.ts b/packages/core/src/plugins/meta/itunespodcast.test.ts
deleted file mode 100644
index 760339edff..0000000000
--- a/packages/core/src/plugins/meta/itunespodcast.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import iTunesPodcastMetaProvider from './itunespodcast';
-import * as iTunesMocks from './metaMocks/iTunesPodcastMocks';
-import { Track } from '../..';
-
-describe('iTunes podcast metaprovider tests', () => {
-  it('search for podcasts', async () => {
-    iTunesMocks.mockPodcastResult();
-    const itunesMeta = new iTunesPodcastMetaProvider();
-    const response = await itunesMeta.searchForPodcast('Programming Throwdown');
-    expect(fetch).toHaveBeenCalledTimes(1);
-    expect(response).toEqual([
-      {
-        'id': 427166321,
-        'coverImage': 'https://is3-ssl.mzstatic.com/image/thumb/Podcasts125/v4/83/e8/a9/83e8a9d5-df87-b19d-7050-55e4ce4df89d/mza_13511678666604160959.jpg/600x600bb.jpg',
-        'thumb': 'https://is3-ssl.mzstatic.com/image/thumb/Podcasts125/v4/83/e8/a9/83e8a9d5-df87-b19d-7050-55e4ce4df89d/mza_13511678666604160959.jpg/600x600bb.jpg',
-        'title': 'Programming Throwdown',
-        'author': 'Patrick Wheeler and Jason Gauci',
-        'type': 'podcast',
-        'source': 'iTunesPodcast'
-      }
-    ]);
-  });
-
-  it('search for podcasts details', async () => {
-    iTunesMocks.mockPodcastEpisodesResult();
-    const itunesMeta = new iTunesPodcastMetaProvider();
-    const response = await itunesMeta.fetchAlbumDetails('Programming Throwdown');
-    expect(fetch).toHaveBeenCalledTimes(1);
-    const track = new Track ({
-      'artist': 'Programming Throwdown', 
-      'duration': 4554, 
-      'position': 1, 
-      'thumbnail': 'https://is3-ssl.mzstatic.com/image/thumb/Podcasts125/v4/83/e8/a9/83e8a9d5-df87-b19d-7050-55e4ce4df89d/mza_13511678666604160959.jpg/60x60bb.jpg', 
-      'title': 'Route Planning with Parker Woodward'
-    });
-    track.uuid = '';
-    response.tracklist[0].uuid = '';
-    expect(response).toEqual({ 
-      'artist': 'Programming Throwdown', 
-      'coverImage': 'https://is3-ssl.mzstatic.com/image/thumb/Podcasts125/v4/83/e8/a9/83e8a9d5-df87-b19d-7050-55e4ce4df89d/mza_13511678666604160959.jpg/600x600bb.jpg', 
-      'id': 427166321,
-      'thumb': 'https://is3-ssl.mzstatic.com/image/thumb/Podcasts125/v4/83/e8/a9/83e8a9d5-df87-b19d-7050-55e4ce4df89d/mza_13511678666604160959.jpg/600x600bb.jpg', 
-      'title': 'Programming Throwdown',
-      'tracklist': [track], 
-      'type': 'master', 
-      'year': '2021-07-07T17:08:00Z'
-    });
-  });
-});
diff --git a/packages/core/src/plugins/meta/itunespodcast.ts b/packages/core/src/plugins/meta/itunespodcast.ts
deleted file mode 100644
index 6315abf443..0000000000
--- a/packages/core/src/plugins/meta/itunespodcast.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import _ from 'lodash';
-
-import MetaProvider from '../metaProvider';
-import * as iTunes from '../../rest/iTunes';
-import { 
-  SearchResultsArtist, 
-  SearchResultsAlbum, 
-  SearchResultsTrack, 
-  SearchResultsPodcast,
-  ArtistDetails, 
-  AlbumDetails,
-  SearchResultsSource, 
-  AlbumType
-} from '../plugins.types';
-import LastFmApi from '../../rest/Lastfm';
-import Track from '../../structs/Track';
-
-class iTunesPodcastMetaProvider extends MetaProvider {
-  lastfm: LastFmApi;
-  constructor() {
-    super();
-    this.name = 'iTunesPodcast Meta Provider';
-    this.sourceName = 'iTunesPodcast Meta Provider';
-    this.description = 'Metadata provider that uses iTunes as a source.';
-    this.searchName = 'iTunesPodcast';
-    this.image = null;
-    this.lastfm = new LastFmApi(process.env.LAST_FM_API_KEY, process.env.LASTFM_API_SECRET);
-  }
-
-  async searchForReleases(): Promise<SearchResultsAlbum[]> {
-    return Promise.resolve([]);
-  }
-
-  async searchForPodcast(query: string): Promise<SearchResultsPodcast[]> {
-    const podcastInfo = (await ((await iTunes.podcastSearch(query, '50')).json()));
-    return podcastInfo.results.map(podcast => ({
-      id: podcast.collectionId,
-      coverImage: podcast.artworkUrl600,
-      thumb: podcast.artworkUrl600,
-      title: podcast.collectionName,
-      author: podcast.artistName,
-      type: 'podcast',
-      source: SearchResultsSource.iTunesPodcast
-    }));
-  }
-
-  async fetchAlbumDetails(podcastId: string): Promise<AlbumDetails> {
-    const podcastInfo = (await ((await iTunes.getPodcastEpisodes(podcastId, '50')).json())).results;
-
-    return Promise.resolve({
-      id: podcastInfo[0].collectionId,
-      artist: podcastInfo[0].collectionName,
-      title: podcastInfo[0].collectionName,
-      thumb: podcastInfo[0].artworkUrl600,
-      coverImage: podcastInfo[0].artworkUrl600,
-      year: podcastInfo[0].releaseDate,
-      type: AlbumType.master,
-      tracklist: _.map(podcastInfo.slice(1), (episode, index) => new Track ({
-        artist: episode.collectionName,
-        title: episode.trackName,
-        duration: Math.ceil(episode.trackTimeMillis/1000),
-        thumbnail: episode.artworkUrl60,
-        position: index + 1
-      }))
-    });    
-  }
-
-  searchForArtists(): Promise<Array<SearchResultsArtist>> {
-    return Promise.resolve([]);
-  }
-
-  searchForTracks(): Promise<SearchResultsTrack[]> {
-    throw new Error('Method not implemented.');
-  }
-
-  searchAll(): Promise<{artists: SearchResultsArtist[]; releases: SearchResultsAlbum[]; tracks: SearchResultsTrack[];}> {
-    throw new Error('Method not implemented.');
-  }
-
-  fetchArtistDetails(): Promise<ArtistDetails> {
-    throw new Error('Method not implemented.');
-  }
-
-  fetchArtistDetailsByName(): Promise<ArtistDetails> {
-    throw new Error('Method not implemented.');
-  }
-
-  fetchArtistAlbums(): Promise<SearchResultsAlbum[]> {
-    throw new Error('Method not implemented.');
-  }
-
-  fetchAlbumDetailsByName(): Promise<AlbumDetails> {
-    throw new Error('Method not implemented.');
-  }
-}
-
-export default iTunesPodcastMetaProvider;
diff --git a/packages/core/src/plugins/meta/musicbrainz.ts b/packages/core/src/plugins/meta/musicbrainz.ts
index bf9dde615f..254f51a0c1 100644
--- a/packages/core/src/plugins/meta/musicbrainz.ts
+++ b/packages/core/src/plugins/meta/musicbrainz.ts
@@ -131,7 +131,6 @@ class MusicbrainzMetaProvider extends MetaProvider {
     const releaseDetails = await getReleaseDetails(headRelease.id);
     const cover = await getCoverForRelease(releaseDetails.id);
     const artistName = _.get(releaseDetails, 'artist-credit[0].name');
-
     return Promise.resolve({
       id: releaseDetails.id, 
       artist: artistName,
@@ -140,7 +139,7 @@ class MusicbrainzMetaProvider extends MetaProvider {
       coverImage: cover.url,
       year: releaseDetails.date,
       genres: _.map(releaseDetails.genres, 'name'),
-      type: AlbumType.release,
+      type: 'release',
       tracklist: _.flatMap(releaseDetails.media, medium => _.map(medium.tracks, track => {
         const newtrack = new Track();
         newtrack.ids[SearchResultsSource.Musicbrainz] = track.id;
diff --git a/packages/core/src/plugins/meta/soytify/soytify.ts b/packages/core/src/plugins/meta/soytify/soytify.ts
new file mode 100644
index 0000000000..d7f184c3f4
--- /dev/null
+++ b/packages/core/src/plugins/meta/soytify/soytify.ts
@@ -0,0 +1,86 @@
+import _ from 'lodash';
+import { SoytifyClientProvider } from '../../../rest/soytify/soytify-partners-api';
+import MetaProvider from '../../metaProvider';
+import {
+  SearchResultsAlbum,
+  SearchResultsTrack,
+  SearchResultsArtist,
+  ArtistDetails,
+  AlbumDetails,
+  AlbumType
+} from '../../plugins.types';
+const SOYTIFY_NAME = atob('U3BvdGlmeQ==');
+
+export class SoytifyMetaProvider extends MetaProvider {
+  constructor() {
+    super();
+    this.name = SOYTIFY_NAME + ' Meta Provider';
+    this.searchName = SOYTIFY_NAME;
+    this.sourceName = SOYTIFY_NAME + ' Metadata Provider';
+    this.description =
+      'Metadata provider that uses ' + SOYTIFY_NAME + ' as a source.';
+    this.image = null;
+    this.isDefault = true;
+  }
+
+  async searchForArtists(query: string): Promise<Array<SearchResultsArtist>> {
+    const client = await SoytifyClientProvider.get();
+    const artists = await client.searchArtists(query);
+    return artists;
+  }
+
+  async searchForReleases(query: string): Promise<Array<SearchResultsAlbum>> {
+    const client = await SoytifyClientProvider.get();
+    return client.searchReleases(query);
+  }
+
+  async searchForTracks(query: string): Promise<Array<SearchResultsTrack>> {
+    const client = await SoytifyClientProvider.get();
+    return client.searchTracks(query);
+  }
+
+  async searchAll(query: string): Promise<{
+    artists: Array<SearchResultsArtist>;
+    releases: Array<SearchResultsAlbum>;
+    tracks: Array<SearchResultsTrack>;
+  }> {
+    const client = await SoytifyClientProvider.get();
+    return await client.searchAll(query);
+  }
+
+  async fetchArtistDetails(artistId: string): Promise<ArtistDetails> {
+    const client = await SoytifyClientProvider.get();
+    return client.fetchArtistDetails(artistId);
+  }
+
+  async fetchArtistDetailsByName(artistName: string): Promise<ArtistDetails> {
+    const artistSearch = await this.searchForArtists(artistName);
+    if (artistSearch.length === 0) {
+      throw new Error('Artist not found');
+    }
+    return this.fetchArtistDetails(artistSearch[0].id);
+  }
+
+  async fetchArtistAlbums(
+    artistId: string
+  ): Promise<Array<SearchResultsAlbum>> {
+    const client = await SoytifyClientProvider.get();
+    return await client.fetchArtistAlbums(artistId);
+  }
+
+  async fetchAlbumDetails(albumId: string, albumType?: AlbumType): Promise<AlbumDetails> {
+    const client = await SoytifyClientProvider.get();
+    return await client.fetchAlbumDetails(albumId, albumType);
+  }
+
+  async fetchAlbumDetailsByName(
+    albumName: string,
+    albumType?: AlbumType
+  ): Promise<AlbumDetails> {
+    const albumSearch = await this.searchForReleases(albumName);
+    if (albumSearch.length === 0) {
+      throw new Error('Album not found');
+    }
+    return this.fetchAlbumDetails(albumSearch[0].id, albumType);
+  }
+}
diff --git a/packages/core/src/plugins/meta/spotify.test.ts b/packages/core/src/plugins/meta/spotify.test.ts
deleted file mode 100644
index d4c788e0f6..0000000000
--- a/packages/core/src/plugins/meta/spotify.test.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-import fetchMock from 'fetch-mock';
-
-import { SpotifyMock } from '../../../test/spotify-mock';
-import { SpotifyMetaProvider } from './spotify';
-
-describe('SpotifyMetaProvider', () => {
-  const provider = new SpotifyMetaProvider();
-
-  afterEach(() => {
-    fetchMock.reset();
-  });
-
-  it('searches for arists', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withSearchArtists('test artist', [{
-      id: 'test-id-1',
-      name: 'test artist 1',
-      images: []
-    }, {
-      id: 'test-id-2',
-      name: 'test artist 2',
-      images: [{
-        height: 300,
-        width: 300,
-        url: 'test-url.com'
-      }]
-    }]);
-    const result = await provider.searchForArtists('test artist');
-
-    expect(result).toEqual([{
-      id: 'test-id-1',
-      coverImage: undefined,
-      thumb: undefined,
-      name: 'test artist 1',
-      source: 'Spotify'
-    }, {
-      id: 'test-id-2',
-      coverImage: 'test-url.com',
-      thumb: 'test-url.com',
-      name: 'test artist 2',
-      source: 'Spotify'
-    }]);
-  });
-
-  it('searches for albums', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withSearchReleases('test album', [{
-      id: 'album-id',
-      album_type: 'album',
-      total_tracks: 10,
-      href: 'album-href',
-      images: [{
-        height: 300,
-        width: 300, 
-        url: 'thumbnail.jpg'
-      }, {
-        height: 600,
-        width: 600,
-        url: 'image.jpg'
-      }, {
-        height: 1000,
-        width: 1000,
-        url: 'large.jpg'
-      }],
-      name: 'test album',
-      release_date: '2020-01',
-      artists: [{ name: 'test artist' }]
-    }]);
-    const result = await provider.searchForReleases('test album');
-    
-    expect(result).toEqual([{
-      id: 'album-id',
-      thumb: 'thumbnail.jpg',
-      coverImage: 'large.jpg',
-      images: ['thumbnail.jpg', 'image.jpg', 'large.jpg'],
-      title: 'test album',
-      artist: 'test artist',
-      resourceUrl: 'album-href',
-      year: '2020-01',
-      source: 'Spotify'
-    }]);
-  });
-
-  it('searches for tracks', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withSearchTracks('test track', [{
-      id: 'track-id',
-      name: 'test track',
-      href: 'track-href',
-      album: {
-        id: 'album-id',
-        name: 'test album',
-        images: [{
-          height: 300,
-          width: 300,
-          url: 'thumbnail.jpg'
-        }]
-      },
-      artists: [{ name: 'test artist' }],
-      popularity: 50,
-      track_number: 1,
-      duration_ms: 1000
-    }]);
-    const result = await provider.searchForTracks('test track');
-    
-    expect(result).toEqual([{
-      id: 'track-id',
-      title: 'test track',
-      artist: 'test artist',
-      source: 'Spotify',
-      thumb: 'thumbnail.jpg'
-    }]);
-  });
-
-  it('fetches artist details', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withGetArtistDetails('test-id', {
-      id: 'test-id',
-      name: 'test artist',
-      images: [{
-        height: 300,
-        width: 300,
-        url: 'thumbnail.jpg'
-      }, {
-        height: 600,
-        width: 600,
-        url: 'image.jpg'
-      }, {
-        height: 1000,
-        width: 1000,
-        url: 'large.jpg'
-      }],
-      genres: ['pop'],
-      popularity: 50
-    });
-    SpotifyMock.withGetArtistTopTracks('test-id', [{
-      id: 'track-id',
-      name: 'test track',
-      href: 'track-href',
-      album: {
-        id: 'album-id',
-        name: 'test album',
-        images: []
-      },
-      artists: [{ name: 'test artist' }],
-      popularity: 100,
-      track_number: 1,
-      duration_ms: 1000
-    }, {
-      id: 'track-id-2',
-      name: 'test track 2',
-      href: 'track-href-2',
-      album: {
-        id: 'album-id',
-        name: 'test album',
-        images: []
-      },
-      artists: [{ name: 'test artist' }],
-      popularity: 100,
-      track_number: 2,
-      duration_ms: 1000
-    }]);
-    SpotifyMock.withGetSimilarArtists('test-id', [{
-      id: 'similar-id',
-      name: 'similar artist 1',
-      images: []
-    }, {
-      id: 'similar-id-2',
-      name: 'similar artist 2',
-      images: []
-    }]);
-    const result = await provider.fetchArtistDetails('test-id');
-
-    expect(result).toEqual({
-      id: 'test-id',
-      name: 'test artist',
-      coverImage: 'large.jpg',
-      thumb: 'thumbnail.jpg',
-      source: 'Spotify',
-      images: ['thumbnail.jpg', 'image.jpg', 'large.jpg'],
-      topTracks: [{
-        title: 'test track',
-        artist: { name: 'test artist' },
-        thumb: undefined,
-        playcount: 100,
-        listeners: 100
-      }, {
-        title: 'test track 2',
-        artist: {name: 'test artist'},
-        thumb: undefined,
-        playcount: 100,
-        listeners: 100
-      }],
-      similar: [{
-        name: 'similar artist 1',
-        thumbnail: undefined
-      }, {
-        name: 'similar artist 2',
-        thumbnail: undefined
-      }]
-    });
-  });
-
-  it('fetches artist details by name', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withGetTopArtist('test artist', {
-      id: 'test-id',
-      name: 'test artist',
-      images: [{
-        height: 300,
-        width: 300,
-        url: 'thumbnail.jpg'
-      }, {
-        height: 600,
-        width: 600,
-        url: 'image.jpg'
-      }, {
-        height: 1000,
-        width: 1000,
-        url: 'large.jpg'
-      }]
-    });
-    SpotifyMock.withGetArtistTopTracks('test-id', [{
-      id: 'track-id',
-      name: 'test track',
-      href: 'track-href',
-      album: {
-        id: 'album-id',
-        name: 'test album',
-        images: []
-      },
-      artists: [{ name: 'test artist' }],
-      popularity: 100,
-      track_number: 1,
-      duration_ms: 1000
-    }, {
-      id: 'track-id-2',
-      name: 'test track 2',
-      href: 'track-href-2',
-      album: {
-        id: 'album-id',
-        name: 'test album',
-        images: []
-      },
-      artists: [{ name: 'test artist' }],
-      popularity: 100,
-      track_number: 2,
-      duration_ms: 1000
-    }]);
-    SpotifyMock.withGetSimilarArtists('test-id', [{
-      id: 'similar-id',
-      name: 'similar artist 1',
-      images: []
-    }, {
-      id: 'similar-id-2',
-      name: 'similar artist 2',
-      images: []
-    }]);
-    const result = await provider.fetchArtistDetailsByName('test artist');
-    
-    expect(result).toEqual({
-      id: 'test-id',
-      name: 'test artist',
-      coverImage: 'large.jpg',
-      thumb: 'thumbnail.jpg',
-      source: 'Spotify',
-      images: ['thumbnail.jpg', 'image.jpg', 'large.jpg'],
-      topTracks: [{
-        title: 'test track',
-        artist: { name: 'test artist' },
-        thumb: undefined,
-        playcount: 100,
-        listeners: 100
-      }, {
-        title: 'test track 2',
-        artist: {name: 'test artist'},
-        thumb: undefined,
-        playcount: 100,
-        listeners: 100
-      }],
-      similar: [{
-        name: 'similar artist 1',
-        thumbnail: undefined
-      }, {
-        name: 'similar artist 2',
-        thumbnail: undefined
-      }]
-    });
-  });
-
-  it('fetches artist\'s albums', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withGetArtistsAlbums('test-id', [{
-      id: 'album-id',
-      album_type: 'album',
-      total_tracks: 10,
-      href: 'album-href',
-      images: [{
-        height: 300,
-        width: 300,
-        url: 'thumbnail.jpg'
-      }, {
-        height: 600,
-        width: 600,
-        url: 'image.jpg'
-      }, {
-        height: 1000,
-        width: 1000,
-        url: 'large.jpg'
-      }],
-      name: 'test album',
-      release_date: '2020-01',
-      artists: [{ name: 'test artist' }]
-    }]);
-    const result = await provider.fetchArtistAlbums('test-id');
-    
-    expect(result).toEqual([{
-      id: 'album-id',
-      thumb: 'thumbnail.jpg',
-      coverImage: 'large.jpg',
-      images: ['thumbnail.jpg', 'image.jpg', 'large.jpg'],
-      title: 'test album',
-      artist: 'test artist',
-      resourceUrl: 'album-href',
-      year: '2020-01',
-      source: 'Spotify'
-    }]);
-  });
-
-  it('fetches album details', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withGetAlbum('test-id', {
-      id: 'test-id',
-      artists: [{name: 'test artist'}],
-      name: 'test album',
-      images: [
-        { url: 'thumbnail.jpg', height: 300, width: 300 }, 
-        { url: 'image.jpg', height: 600, width: 600 },
-        { url: 'large.jpg', height: 1000, width: 1000 }
-      ],
-      genres: ['pop'],
-      release_date: '2020-01',
-      album_type: 'album',
-      tracks: {
-        href: 'tracks-href',
-        limit: 10,
-        next: null,
-        offset: 0,
-        previous: null,
-        total: 2,
-        items: [{
-          id: 'track-id',
-          href: 'track-href',
-          track_number: 1,
-          name: 'test track',
-          artists: [{ name: 'test artist' }],
-          duration_ms: 1000,
-          disc_number: 0,
-          type: 'track'
-        }]
-      },
-      href: 'album-href'
-    });
-    const result = await provider.fetchAlbumDetails('test-id', 'master');
-    
-    expect(result).toEqual({
-      id: 'test-id',
-      artist: 'test artist',
-      title: 'test album',
-      thumb: 'thumbnail.jpg',
-      coverImage: 'large.jpg',
-      images: ['thumbnail.jpg', 'image.jpg', 'large.jpg'],
-      genres: ['pop'],
-      year: '2020-01',
-      tracklist: [{
-        ids: {},
-        uuid: expect.any(String),
-        position: 1,
-        name: 'test track',
-        title: 'test track',
-        artist: 'test artist',
-        duration: 1,
-        discNumber: 0,
-        thumbnail: 'thumbnail.jpg'
-      }]
-    });
-  });
-});
diff --git a/packages/core/src/plugins/meta/spotify.ts b/packages/core/src/plugins/meta/spotify.ts
deleted file mode 100644
index e958ec8ff7..0000000000
--- a/packages/core/src/plugins/meta/spotify.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import { SpotifyArtist, SpotifyClientProvider, SpotifySimplifiedAlbum, SpotifyTrack, getImageSet } from '../../rest/Spotify';
-import Track from '../../structs/Track';
-import MetaProvider from '../metaProvider';
-import { SearchResultsArtist, SearchResultsAlbum, SearchResultsTrack, ArtistDetails, AlbumDetails, SearchResultsSource, ArtistTopTrack, SimilarArtist } from '../plugins.types';
-
-export class SpotifyMetaProvider extends MetaProvider {
-  constructor() {
-    super();
-    this.name = 'Spotify Meta Provider';
-    this.searchName = 'Spotify';
-    this.sourceName = 'Spotify Metadata Provider';
-    this.description = 'Metadata provider that uses Spotify as a source.';
-    this.image = null;
-    this.isDefault = true;
-  }
-
-  async searchForArtists(query: string, limit=10): Promise<SearchResultsArtist[]> {
-    const client = await SpotifyClientProvider.get();
-    const results = await client.searchArtists(query, limit);
-
-    return results.map(this.mapSpotifyArtist);
-  }
-
-  mapSpotifyArtist(spotifyArtist: SpotifyArtist): SearchResultsArtist {
-    const { thumb, coverImage } = getImageSet(spotifyArtist.images);
-    return {
-      id: spotifyArtist.id,
-      coverImage,
-      thumb,
-      name: spotifyArtist.name,
-      source: SearchResultsSource.Spotify
-    };
-  }
-
-  async searchForReleases(query: string): Promise<SearchResultsAlbum[]> {
-    const client = await SpotifyClientProvider.get();
-    const results = await client.searchReleases(query);
-
-    return results.map(this.mapSpotifyRelease);
-  }
-
-  mapSpotifyRelease(spotifyRelease: SpotifySimplifiedAlbum): SearchResultsAlbum {
-    const { thumb, coverImage } = getImageSet(spotifyRelease.images);
-    return {
-      id: spotifyRelease.id,
-      thumb,
-      coverImage,
-      images: spotifyRelease.images.map(image => image.url),
-      title: spotifyRelease.name,
-      artist: spotifyRelease.artists[0].name,
-      resourceUrl: spotifyRelease.href,
-      year: spotifyRelease.release_date,
-      source: SearchResultsSource.Spotify
-    };
-  }
-
-  async searchForTracks(query: string): Promise<SearchResultsTrack[]> {
-    const client = await SpotifyClientProvider.get();
-    const results = await client.searchTracks(query);
-
-    return results.map(this.mapSpotifyTrack);
-  }
-
-  mapSpotifyTrack(spotifyTrack: SpotifyTrack): SearchResultsTrack {
-    const { thumb } = getImageSet(spotifyTrack.album.images);
-    return {
-      id: spotifyTrack.id,
-      title: spotifyTrack.name,
-      artist: spotifyTrack.artists[0].name,
-      discNumber: spotifyTrack.disc_number,
-      source: SearchResultsSource.Spotify,
-      thumb
-    };
-  }
-
-  async searchAll(query: string): Promise<{ artists: SearchResultsArtist[]; releases: SearchResultsAlbum[]; tracks: SearchResultsTrack[]; }> {
-    const client = await SpotifyClientProvider.get();
-    const results = await client.searchAll(query);
-
-    return {
-      artists: results.artists.map(this.mapSpotifyArtist),
-      releases: results.releases.map(this.mapSpotifyRelease),
-      tracks: results.tracks.map(this.mapSpotifyTrack)
-    };
-  }
-
-  async fetchArtistDetails(artistId: string): Promise<ArtistDetails> {
-    const client = await SpotifyClientProvider.get();
-    const result = await client.getArtistDetails(artistId);
-    const topTracks = await client.getArtistTopTracks(artistId);
-    const similarArtists = await client.getSimilarArtists(artistId);
-
-    return {
-      ...this.mapSpotifyArtistDetails(result),
-      topTracks: topTracks.map(this.mapSpotifyTopTrack),
-      similar: similarArtists.map(this.mapSpotifySimilarArtist)
-    };
-  }
-
-  mapSpotifyArtistDetails(spotifyArtist: SpotifyArtist): ArtistDetails {
-    const { thumb, coverImage } = getImageSet(spotifyArtist.images);
-
-    return {
-      id: spotifyArtist.id,
-      name: spotifyArtist.name,
-      coverImage,
-      thumb,
-      source: SearchResultsSource.Spotify,
-      images: spotifyArtist.images.map(image => image.url),
-      topTracks: [],
-      similar: []
-    };
-  }
-
-  mapSpotifyTopTrack(spotifyTrack: SpotifyTrack): ArtistTopTrack {
-    const { thumb } = getImageSet(spotifyTrack.album.images);
-    return {
-      artist: {name: spotifyTrack.artists[0].name},
-      title: spotifyTrack.name,
-      thumb,
-      playcount: spotifyTrack.popularity,
-      listeners: spotifyTrack.popularity
-    };
-  }
-
-  mapSpotifySimilarArtist(spotifyArtist: SpotifyArtist): SimilarArtist {
-    const { thumb } = getImageSet(spotifyArtist.images);
-    return {
-      name: spotifyArtist.name,
-      thumbnail: thumb
-    };
-  }
-
-  async fetchArtistDetailsByName(artistName: string): Promise<ArtistDetails> {
-    const client = await SpotifyClientProvider.get();
-    const result = await client.getTopArtist(artistName);
-    const topTracks = await client.getArtistTopTracks(result.id);
-    const similarArtists = await client.getSimilarArtists(result.id);
-
-    return {
-      ...this.mapSpotifyArtistDetails(result),
-      topTracks: topTracks.map(this.mapSpotifyTopTrack),
-      similar: similarArtists.map(this.mapSpotifySimilarArtist)
-    };
-  }
-
-  async fetchArtistAlbums(artistId: string): Promise<SearchResultsAlbum[]> {
-    const client = await SpotifyClientProvider.get();
-    const results = await client.getArtistsAlbums(artistId);
-
-    return results.map(this.mapSpotifyRelease);
-  }
-
-  async fetchAlbumDetails(albumId: string, albumType: 'master' | 'release', resourceUrl?: string): Promise<AlbumDetails> {
-    const client = await SpotifyClientProvider.get();
-    const result = await client.getAlbum(albumId);
-
-    const { thumb, coverImage } = getImageSet(result.images);
-
-    return {
-      id: result.id,
-      artist: result.artists[0].name,
-      title: result.name,
-      coverImage,
-      thumb,
-      images: result.images.map(image => image.url),
-      genres: result.genres,
-      year: result.release_date,
-      tracklist: result.tracks.items.map(track => new Track({
-        title: track.name,
-        artist: result.artists[0].name,
-        duration: track.duration_ms/1000,
-        discNumber: track.disc_number,
-        position: track.track_number,
-        thumbnail: thumb
-      }))
-    };
-  }
-
-  async fetchAlbumDetailsByName(albumName: string, albumType?: 'master' | 'release', artist?: string): Promise<AlbumDetails> {
-    const client = await SpotifyClientProvider.get();
-    const result = await client.getTopAlbum(`${albumName} ${artist}`);
-
-    return this.fetchAlbumDetails(result.id, albumType);
-  }
-
-}
-
diff --git a/packages/core/src/plugins/metaProvider.ts b/packages/core/src/plugins/metaProvider.ts
index 05484a57cd..f69c140e72 100644
--- a/packages/core/src/plugins/metaProvider.ts
+++ b/packages/core/src/plugins/metaProvider.ts
@@ -3,9 +3,9 @@ import {
   SearchResultsArtist,
   SearchResultsAlbum,
   SearchResultsTrack,
-  SearchResultsPodcast,
   ArtistDetails,
-  AlbumDetails
+  AlbumDetails,
+  AlbumType
 } from './plugins.types';
 
 abstract class MetaProvider extends Plugin {
@@ -28,18 +28,13 @@ abstract class MetaProvider extends Plugin {
 
   abstract fetchAlbumDetails(
     albumId: string, 
-    albumType: ('master' | 'release'),
+    albumType: AlbumType,
     resourceUrl?: string): Promise<AlbumDetails>;
   abstract fetchAlbumDetailsByName(
     albumName: string,
-    albumType?: ('master' | 'release'),
+    albumType?: AlbumType,
     artist?: string
   ): Promise<AlbumDetails>;
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  searchForPodcast(query: string): Promise<Array<SearchResultsPodcast>> {
-    return Promise.resolve([]);
-  }
 }
 
 export default MetaProvider;
diff --git a/packages/core/src/plugins/plugins.types.ts b/packages/core/src/plugins/plugins.types.ts
index bbe43d973f..b7a1406dca 100644
--- a/packages/core/src/plugins/plugins.types.ts
+++ b/packages/core/src/plugins/plugins.types.ts
@@ -1,3 +1,4 @@
+import { ReleaseType as SoytifyReleaseType } from '../rest/soytify/Soytify.types';
 import Track from '../structs/Track';
 
 export enum SearchResultsSource {
@@ -5,16 +6,11 @@ export enum SearchResultsSource {
     Discogs = 'Discogs',
     Musicbrainz = 'Musicbrainz',
     Bandcamp = 'Bandcamp',
-    iTunesPodcast = 'iTunesPodcast',
     iTunesMusic = 'iTunesMusic',
     Spotify = 'Spotify',
+    Soytify = 'Soytify',
     Soundcloud = 'Soundcloud',
-}
-
-export enum AlbumType {
-    master = 'master',
-    release = 'release',
-    unknown = 'unknown'
+    Youtube = 'Youtube',
 }
 
 export type SearchResultsArtist = {
@@ -26,6 +22,8 @@ export type SearchResultsArtist = {
     source: SearchResultsSource;
 }
 
+export type AlbumType = 'master' | 'release' | 'unknown' | SoytifyReleaseType;
+
 export type SearchResultsAlbum = {
     id: string;
     coverImage?: string;
@@ -35,7 +33,7 @@ export type SearchResultsAlbum = {
     title: string;
     artist: string;
     resourceUrl?: string;
-    type?: string;
+    type?: AlbumType;
     tracklist?: {
         uuid: string;
         artist: string;
@@ -61,9 +59,9 @@ export type SearchResultsTrack = {
     id: string;
     title: string;
     artist: string;
-    source: SearchResultsSource;
     thumb?: string;
     discNumber?: number | string;
+    source: SearchResultsSource;
 }
 
 export type ArtistTopTrack = {
diff --git a/packages/core/src/plugins/stream/iTunesPodcastPlugin.ts b/packages/core/src/plugins/stream/iTunesPodcastPlugin.ts
deleted file mode 100644
index 4a3382d5e9..0000000000
--- a/packages/core/src/plugins/stream/iTunesPodcastPlugin.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { logger } from '../../';
-import _ from 'lodash';
-
-import { StreamData, StreamQuery } from '../plugins.types';
-import StreamProviderPlugin from '../streamProvider';
-import * as iTunes from '../../rest/iTunes';
-
-class iTunesPodcastPlugin extends StreamProviderPlugin {
-  constructor() {
-    super();
-    this.name = 'iTunes Podcast Plugin';
-    this.sourceName = 'iTunes';
-    this.description = 'Allows Nuclear to find podcast streams on iTunes';
-    this.image = null;
-  }
-
-  resultToStream(result): StreamData {
-    return {
-      source: this.sourceName,
-      id: result.trackId,
-      stream: result.episodeUrl,
-      duration: result.trackTimeMillis / 1000,
-      title: result.trackName,
-      thumbnail: result.artworkUrl600,
-      originalUrl: result.trackViewUrl
-    };
-  }
-
-  async findPodcastId(podcast: string): Promise<string> {
-    try {
-      const results = await(await iTunes.podcastSearch(podcast, '50')).json();
-      const infoPodcast = _.find(results.results, result => result && result.collectionName === podcast);
-      return infoPodcast.collectionId;
-    } catch (err) {
-      logger.error(`Error while looking up podcast for ${podcast} on iTunes`);
-      logger.error(err);
-    }
-  }
-
-  async search(query: StreamQuery): Promise<undefined | StreamData[]> {
-    const podcast = query.artist;
-    const episode = query.track;
-    const podcastId = await this.findPodcastId(podcast);
-
-    try {
-      const results = await(await iTunes.getPodcastEpisodes(podcastId, '50')).json();
-      const infoEpisode = _.find(results.results, result => 
-        result && 
-          result.trackName === episode && 
-          result.wrapperType === 'podcastEpisode');
-      return infoEpisode ? [this.resultToStream(infoEpisode)] : null;
-    } catch (err) {
-      logger.error(`Error while looking up podcast for ${podcast} on iTunes`);
-      logger.error(err);
-    }
-  }
-
-  async getStreamForId(): Promise<undefined | StreamData> {
-    return undefined;
-  }
-}
-
-export default iTunesPodcastPlugin;
diff --git a/packages/core/src/plugins/stream/index.ts b/packages/core/src/plugins/stream/index.ts
index 3def28254d..f99ad54ef6 100644
--- a/packages/core/src/plugins/stream/index.ts
+++ b/packages/core/src/plugins/stream/index.ts
@@ -4,4 +4,3 @@ export { default as InvidiousPlugin } from './InvidiousPlugin';
 export { default as YoutubePlugin } from './YoutubePlugin';
 export { default as SoundcloudPlugin } from './SoundcloudPlugin';
 export { default as JamendoPlugin } from './JamendoPlugin';
-export { default as iTunesPodcastPlugin } from './iTunesPodcastPlugin';
diff --git a/packages/core/src/rest/Discogs.types.ts b/packages/core/src/rest/Discogs.types.ts
index 660e1dfa80..20d3660298 100644
--- a/packages/core/src/rest/Discogs.types.ts
+++ b/packages/core/src/rest/Discogs.types.ts
@@ -1,3 +1,5 @@
+import { AlbumType, SearchResultsAlbum } from '../plugins/plugins.types';
+
 export type DiscogsImage = {
   height: number;
   width: number;
@@ -43,7 +45,7 @@ export type DiscogsArtistReleaseSearchResult = {
   title: string;
   thumb: string;
   resource_url: string;
-  type: string;
+  type: AlbumType;
   year: number;
 }
 
diff --git a/packages/core/src/rest/Nuclear/Identity.ts b/packages/core/src/rest/Nuclear/Identity.ts
deleted file mode 100644
index e59dc5a3a3..0000000000
--- a/packages/core/src/rest/Nuclear/Identity.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { NuclearService } from './NuclearService';
-import { SignInRequestBody, SignInResponseBody, SignUpRequestBody, SignUpResponseBody } from './Identity.types';
-import { ErrorBody } from './types';
-
-export class NuclearIdentityService extends NuclearService {
-  
-  signUp(body: SignUpRequestBody) {
-    return this.getJson<SignUpResponseBody, ErrorBody>(fetch(`${this.baseUrl}/signup`, {
-      method: 'POST',
-      headers: this.getHeaders(),
-      body: JSON.stringify(this.prepareBody(body))
-    }));
-  }
-
-  signIn(body: SignInRequestBody) {
-    return this.getJson<SignInResponseBody, ErrorBody>(fetch(`${this.baseUrl}/signin`, {
-      method: 'POST',
-      headers: this.getHeaders(),
-      body: JSON.stringify(this.prepareBody(body))
-    }));
-  }
-}
diff --git a/packages/core/src/rest/Nuclear/Identity.types.ts b/packages/core/src/rest/Nuclear/Identity.types.ts
deleted file mode 100644
index 3920fbea93..0000000000
--- a/packages/core/src/rest/Nuclear/Identity.types.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-export enum UserAccountState {
-  UNCONFIRMED = 'UNCONFIRMED',
-  CONFIRMED = 'CONFIRMED',
-  DISABLED = 'DISABLED',
-}
-
-export type SignUpRequestBody = {
-  username: string;
-  email?: string;
-  password: string;
-};
-
-export type SignUpResponseBody = {
-  id: string;
-  username: string;
-  displayName: string;
-  email: string | null;
-  accountState: UserAccountState;
-  createdAt: string;
-  updatedAt: string;
-};
-
-export type SignInRequestBody = {
-  username: string;
-  password: string;
-};
-
-export type SignInResponseBody = {
-  expiresIn: number;
-  token: string;
-  user: SignUpResponseBody;
-};
diff --git a/packages/core/src/rest/Nuclear/Playlists.ts b/packages/core/src/rest/Nuclear/Playlists.ts
deleted file mode 100644
index b43aaaa05b..0000000000
--- a/packages/core/src/rest/Nuclear/Playlists.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { NuclearService } from './NuclearService';
-import { GetPlaylistsByUserIdResponseBody, PostPlaylistRequestBody, PostPlaylistResponseBody } from './Playlists.types';
-import { ErrorBody } from './types';
-
-export class NuclearPlaylistsService extends NuclearService {
-  getPlaylistsByUserId(token: string, id: string) {
-    return this.getJson<GetPlaylistsByUserIdResponseBody, ErrorBody>(
-      fetch(`${this.baseUrl}/users/${id}/playlists`, {
-        headers: {
-          ...this.getHeaders(),
-          Authorization: `Bearer ${token}`
-        }
-      })
-    );
-  }
-
-  postPlaylist(token: string, body: PostPlaylistRequestBody) {
-    return this.getJson<PostPlaylistResponseBody, ErrorBody>(
-      fetch(`${this.baseUrl}/playlists`, {
-        method: 'POST',
-        headers: {
-          ...this.getHeaders(),
-          Authorization: `Bearer ${token}`
-        },
-        body: JSON.stringify(this.prepareBody(body))
-      })
-    );
-  }
-}
diff --git a/packages/core/src/rest/Nuclear/Playlists.types.ts b/packages/core/src/rest/Nuclear/Playlists.types.ts
deleted file mode 100644
index 26d345384c..0000000000
--- a/packages/core/src/rest/Nuclear/Playlists.types.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-export type ApiTrack = {
-  id: string;
-  name: string;
-  artistId: string;
-  addedBy: string;
-};
-
-export type ApiPlaylist = {
-  id: string;
-  author: string;
-  name: string;
-  tracks: ApiTrack[];
-  private: boolean;
-};
-
-export type GetPlaylistsByUserIdResponseBody = ApiPlaylist[];
-
-export type PostPlaylistRequestBody = {
-  name: string;
-  tracks: {
-    name: string;
-    artist: string;
-  }[];
-  private: boolean;
-};
-
-export type PostPlaylistResponseBody = ApiPlaylist & {
-  tracks: ApiTrack[];
-  createdAt: string;
-  updatedAt: string;
-};
-
-export type PutPlaylistRequestBody = PostPlaylistRequestBody;
diff --git a/packages/core/src/rest/Spotify.test.ts b/packages/core/src/rest/Spotify.test.ts
index eccc481430..f443521edb 100644
--- a/packages/core/src/rest/Spotify.test.ts
+++ b/packages/core/src/rest/Spotify.test.ts
@@ -16,152 +16,6 @@ describe('Spotify tests', () => {
     expect(client.token).toEqual('my-spotify-token');
   });
 
-  it('searches artists', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withSearchArtists('test artist', [{
-      name: 'test artist 1',
-      images: []
-    }, {
-      name: 'test artist 2',
-      images: [{
-        height: 300,
-        width: 300,
-        url: 'test-url.com'
-      }]
-    }]);
-    const result = await (await SpotifyClientProvider.get()).searchArtists('test artist');
-
-    expect(result).toEqual([{
-      name: 'test artist 1',
-      images: []
-    }, {
-      name: 'test artist 2',
-      images: [{
-        height: 300,
-        width: 300,
-        url: 'test-url.com'
-      }]
-    }]);
-  });
-
-  it('searches albums', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withSearchReleases('test album', [{
-      id: 'album-id',
-      album_type: 'album',
-      total_tracks: 10,
-      href: 'album-href',
-      images: [],
-      name: 'test album',
-      release_date: '2020-01-01',
-      artists: [{ name: 'test artist' }]
-    }]);
-    const result = await (await SpotifyClientProvider.get()).searchReleases('test album');
-
-    expect(result).toEqual([{
-      id: 'album-id',
-      album_type: 'album',
-      total_tracks: 10,
-      href: 'album-href',
-      images: [],
-      name: 'test album',
-      release_date: '2020-01-01',
-      artists: [{ name: 'test artist' }]
-    }]);
-  });
-
-  it('searches tracks', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withSearchTracks('test track', [{
-      id: 'track-id',
-      name: 'test track',
-      href: 'track-href',
-      album: {
-        id: 'album-id',
-        name: 'test album',
-        images: []
-      },
-      artists: [{ name: 'test artist' }],
-      popularity: 100,
-      track_number: 1
-    }]);
-    const result = await (await SpotifyClientProvider.get()).searchTracks('test track');
-
-    expect(result).toEqual([{
-      id: 'track-id',
-      name: 'test track',
-      href: 'track-href',
-      album: {
-        id: 'album-id',
-        name: 'test album',
-        images: []
-      },
-      artists: [{ name: 'test artist' }],
-      popularity: 100,
-      track_number: 1
-    }]);
-  });
-
-  it('searches all', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withSearchAll('test', [{
-      name: 'test artist',
-      images: []
-    }], [{
-      id: 'album-id',
-      album_type: 'album',
-      total_tracks: 10,
-      href: 'album-href',
-      images: [],
-      name: 'test album',
-      release_date: '2020-01-01',
-      artists: [{ name: 'test artist' }]
-    }], [{
-      id: 'track-id',
-      name: 'test track',
-      href: 'track-href',
-      album: {
-        id: 'album-id',
-        name: 'test album',
-        images: []
-      },
-      artists: [{ name: 'test artist' }],
-      popularity: 100,
-      track_number: 1
-    }]);
-    const result = await (await SpotifyClientProvider.get()).searchAll('test');
-
-    expect(result).toEqual({
-      artists: [{
-        name: 'test artist',
-        images: []
-      }],
-      releases: [{
-        id: 'album-id',
-        album_type: 'album',
-        total_tracks: 10,
-        href: 'album-href',
-        images: [],
-        name: 'test album',
-        release_date: '2020-01-01',
-        artists: [{ name: 'test artist' }]
-      }],
-      tracks: [{
-        id: 'track-id',
-        name: 'test track',
-        href: 'track-href',
-        album: {
-          id: 'album-id',
-          name: 'test album',
-          images: []
-        },
-        artists: [{ name: 'test artist' }],
-        popularity: 100,
-        track_number: 1
-      }]
-    });
-  });
-
   it('gets artist details', async () => {
     SpotifyMock.withAccessToken();
     SpotifyMock.withGetArtistDetails('artist-id', {
@@ -214,46 +68,6 @@ describe('Spotify tests', () => {
     }]);
   });
 
-  it('gets similar artists', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withGetSimilarArtists('artist-id', [{
-      name: 'test artist',
-      images: []
-    }]);
-    const result = await (await SpotifyClientProvider.get()).getSimilarArtists('artist-id');
-
-    expect(result).toEqual([{
-      name: 'test artist',
-      images: []
-    }]);
-  });
-
-  it('gets artist\'s albums', async () => {
-    SpotifyMock.withAccessToken();
-    SpotifyMock.withGetArtistsAlbums('artist-id', [{
-      id: 'album-id',
-      album_type: 'album',
-      total_tracks: 10,
-      href: 'album-href',
-      images: [],
-      name: 'test album',
-      release_date: '2020-01-01',
-      artists: [{ name: 'test artist' }]
-    }]);
-    const result = await (await SpotifyClientProvider.get()).getArtistsAlbums('artist-id');
-
-    expect(result).toEqual([{
-      id: 'album-id',
-      album_type: 'album',
-      total_tracks: 10,
-      href: 'album-href',
-      images: [],
-      name: 'test album',
-      release_date: '2020-01-01',
-      artists: [{ name: 'test artist' }]
-    }]);
-  });
-
   it('gets an album', async () => {
     SpotifyMock.withAccessToken();
     SpotifyMock.withGetAlbum('album-id', {
diff --git a/packages/core/src/rest/Spotify.ts b/packages/core/src/rest/Spotify.ts
index 188fa037c9..bfa0720433 100644
--- a/packages/core/src/rest/Spotify.ts
+++ b/packages/core/src/rest/Spotify.ts
@@ -1,6 +1,7 @@
-import { logger } from '../../';
+import { getImageSet, logger } from '../../';
 import { PlaylistTrack } from '../helpers';
 import * as crypto from 'crypto';
+import { Album, Artist, SoytifySearchV2Response } from './soytify/Soytify.types';
 
 const SPOTIFY_API_OPEN_URL = 'https://open.spotify.com';
 const SPOTIFY_API_URL = 'https://api.spotify.com/v1';
@@ -170,7 +171,7 @@ class SpotifyClient {
       const totpToken = this.totp.generate(serverTime);
       
       const tokenResponse = await fetch(
-        `${SPOTIFY_API_OPEN_URL}/get_access_token?reason=init&productType=web-player&totp=${totpToken}&totpVer=${this.totp.getVersion()}&ts=${serverTime}`
+        `${SPOTIFY_API_OPEN_URL}/get_access_token?reason=init&productType=web-player&totp=${totpToken}&totpVer=${this.totp.getVersion()}&sTime=${serverTime}&cTime=${Date.now()}&buildVer=web-player_2025-05-12_1747082920646_8ab14aa&buildDate=2025-05-12&totpServer=010137`
       );
       
       if (!tokenResponse.ok) {
@@ -201,32 +202,21 @@ class SpotifyClient {
     }
   }
 
-  async searchArtists(query: string, limit=10): Promise<SpotifyArtist[]> {
-    const data = await this.get(`${SPOTIFY_API_URL}/search?type=artist&q=${query}&decorate_restrictions=false&include_external=audio&limit=${limit}`);
-
-    return data.artists.items;
-  }
-
-  async searchReleases(query: string, limit=10): Promise<SpotifySimplifiedAlbum[]> {
-    const data = await this.get(`${SPOTIFY_API_URL}/search?type=album&q=${query}&decorate_restrictions=false&include_external=audio&limit=${limit}`);
-
-    return data.albums.items;
-  }
-
-  async searchTracks(query: string, limit=20): Promise<SpotifyTrack[]> {
-    const data = await this.get(`${SPOTIFY_API_URL}/search?type=track&q=${query}&decorate_restrictions=false&include_external=audio&limit=${limit}`);
-
-    return data.tracks.items;
-  }
-
-  async searchAll(query: string): Promise<{ artists: SpotifyArtist[]; releases: SpotifySimplifiedAlbum[]; tracks: SpotifyTrack[]; }> {
-    const data = await this.get(`${SPOTIFY_API_URL}/search?q=${query}&type=artist,album,track&decorate_restrictions=false&include_external=audio`);
-
-    return {
-      artists: data.artists.items,
-      releases: data.albums.items,
-      tracks: data.tracks.items
-    };
+  async post(url: string, body?: any) {
+    const result = await fetch(url, {
+      method: 'POST',
+      headers: {  
+        Authorization: `Bearer ${this._token}`,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(body)
+    });
+    if (result.ok) {
+      return result.json();
+    } else if (result.status === 401) {
+      await this.refreshToken();
+      return this.post(url, body);
+    }
   }
 
   async getArtistDetails(id: string): Promise<SpotifyFullArtist> {
@@ -241,28 +231,8 @@ class SpotifyClient {
     return data.tracks;
   }
 
-  async getSimilarArtists(id: string): Promise<SpotifyFullArtist[]> {
-    const data = await this.get(`${SPOTIFY_API_URL}/artists/${id}/related-artists`);
-
-    return data.artists;
-  }
-
-  async getArtistsAlbums(id: string): Promise<SpotifySimplifiedAlbum[]> {
-    let albums: SpotifySimplifiedAlbum[] = [];
-    let data: SpotifyPaginatedResponse<SpotifySimplifiedAlbum> = await this.get(`${SPOTIFY_API_URL}/artists/${id}/albums?include_groups=album`);
-    albums = data.items;
-
-    while (data.next && data.items?.length >= data.limit) {
-      const nextData: SpotifyPaginatedResponse<SpotifySimplifiedAlbum> = await this.get(data.next);
-      albums = [...albums, ...nextData.items];
-      data = nextData;
-    }
-
-    return albums;
-  }
-
   async getTopArtist(query: string): Promise<SpotifyFullArtist> {
-    const data = await this.get(`${SPOTIFY_API_URL}/search?type=artist&q=${query}&decorate_restrictions=false&best_match=true&include_external=audio&limit=1`);
+    const data = await this.get(`${SPOTIFY_API_URL}/search?type=artist&q=${query}&best_match=true&limit=1`);
 
     return data.best_match.items[0];
   }
@@ -274,7 +244,7 @@ class SpotifyClient {
   }
 
   async getTopAlbum(query: string): Promise<SpotifyFullAlbum> {
-    const data = await this.get(`${SPOTIFY_API_URL}/search?type=album&q=${query}&decorate_restrictions=false&best_match=true&include_external=audio&limit=1`);
+    const data = await this.get(`${SPOTIFY_API_URL}/search?type=album&q=${query}&best_match=true&limit=1`);
 
     return data.best_match.items[0];
   }
@@ -297,20 +267,6 @@ class SpotifyClient {
   }
 }
 
-export const getImageSet = (images: SpotifyImage[]): { thumb?: string; coverImage?: string; } => {
-  const isNotEmpty = images.length > 0;
-  const largestImage = isNotEmpty && images.reduce((prev, current) => {
-    return (prev.height * prev.width) > (current.height * current.width) ? prev : current;
-  });
-  const thumbnail = isNotEmpty && images.find(image => image.height < 400 && image.width < 400);
-
-  return {
-    thumb: thumbnail?.url,
-    coverImage: largestImage?.url
-  };
-};
-
-
 export const mapSpotifyTrack = (track: SpotifyTrack): PlaylistTrack | null => {
   const { thumb } = getImageSet(track.album?.images ?? []);
   try {
diff --git a/packages/core/src/rest/Youtube.ts b/packages/core/src/rest/Youtube.ts
index ab48c71ec7..5d72703e0a 100644
--- a/packages/core/src/rest/Youtube.ts
+++ b/packages/core/src/rest/Youtube.ts
@@ -1,4 +1,5 @@
-import { logger } from '../../';
+import { logger } from '../..';
+import { getLargestThumbnail } from '../util';
 import ytdl from '@nuclearplayer/ytdl-core';
 import ytpl from '@distube/ytpl';
 
@@ -189,12 +190,3 @@ function videoToStreamData(video: Video, source: string): StreamData {
     }
   };
 }
-
-const getLargestThumbnail = (thumbnails: ytdl.thumbnail[]): string => {
-  const isNotEmpty = thumbnails.length > 0;
-  const largestThumbnail = isNotEmpty && thumbnails.reduce((prev, current) => {
-    return (prev.height * prev.width) > (current.height * current.width) ? prev : current;
-  });
-
-  return largestThumbnail?.url;
-};
diff --git a/packages/core/src/rest/cache/CacheDecorator.ts b/packages/core/src/rest/cache/CacheDecorator.ts
new file mode 100644
index 0000000000..b463178c3a
--- /dev/null
+++ b/packages/core/src/rest/cache/CacheDecorator.ts
@@ -0,0 +1,82 @@
+import { CacheManager, CacheOptions } from './CacheManager';
+import { logger } from '../../';
+
+export function cacheable(options: CacheOptions = {}) {
+  return function <T extends (...args: unknown[]) => Promise<unknown>>(
+    target: unknown,
+    propertyKey: string,
+    descriptor: TypedPropertyDescriptor<T>
+  ) {
+    const originalMethod = descriptor.value;
+    if (!originalMethod) {
+      throw new Error(`Method ${propertyKey} not found`);
+    }
+    
+    const ttl = options.ttl ?? 60 * 60 * 1000;
+
+    descriptor.value = async function (this: { _cacheManager?: CacheManager }, ...args: unknown[]) {
+      const cacheManager: CacheManager = this._cacheManager || new CacheManager();
+      
+      const key = options.keyGenerator 
+        ? options.keyGenerator(propertyKey, args)
+        : `${propertyKey}:${JSON.stringify(args)}`;
+
+      const cachedResult = cacheManager.get(key, ttl);
+      if (cachedResult !== null) {
+        logger.debug(`Cache hit for ${propertyKey}:`, key);
+        return cachedResult;
+      }
+
+      try {
+        const result = await originalMethod.apply(this, args);
+        
+        const shouldCache = options.shouldCache 
+          ? options.shouldCache(propertyKey, args, result)
+          : true;
+
+        if (shouldCache) {
+          cacheManager.set(key, result);
+          logger.debug(`Cache miss, stored result for ${propertyKey}:`, key);
+        }
+
+        return result;
+      } catch (error) {
+        logger.error(`Error in cached method ${propertyKey}:`, error);
+        throw error;
+      }
+    } as T;
+
+    return descriptor;
+  };
+}
+
+export function withCache<T extends new (...args: any[]) => object>(
+  constructor: T,
+  options: CacheOptions = {}
+): T {
+  return class extends constructor {
+    public _cacheManager: CacheManager;
+
+    constructor(...args: any[]) {
+      super(...args);
+      this._cacheManager = new CacheManager(options.ttl);
+      
+      // Set up periodic cleanup
+      setInterval(() => {
+        this._cacheManager.cleanup();
+      }, 5 * 60 * 1000); // Cleanup every 5 minutes
+    }
+
+    getCacheStats() {
+      return this._cacheManager.getStats();
+    }
+
+    clearCache() {
+      this._cacheManager.clear();
+    }
+
+    deleteCacheEntry(key: string) {
+      return this._cacheManager.delete(key);
+    }
+  } as T;
+}
diff --git a/packages/core/src/rest/cache/CacheManager.ts b/packages/core/src/rest/cache/CacheManager.ts
new file mode 100644
index 0000000000..a327ec619b
--- /dev/null
+++ b/packages/core/src/rest/cache/CacheManager.ts
@@ -0,0 +1,105 @@
+import { logger } from '../../';
+
+export interface CacheEntry<T> {
+  data: T;
+  timestamp: number;
+}
+
+export interface CacheOptions {
+  ttl?: number;
+  keyGenerator?: (methodName: string, args: unknown[]) => string;
+  shouldCache?: (methodName: string, args: unknown[], result: unknown) => boolean;
+}
+
+export class CacheManager {
+  private cache = new Map<string, CacheEntry<unknown>>();
+  private defaultTTL: number;
+
+  constructor(defaultTTL = 60 * 60 * 1000) { // 1 hour default
+    this.defaultTTL = defaultTTL;
+  }
+
+  private generateKey(methodName: string, args: unknown[]): string {
+    try {
+      return `${methodName}:${JSON.stringify(args)}`;
+    } catch (error) {
+      // Fallback for non-serializable arguments
+      return `${methodName}:${args.map(arg => String(arg)).join(',')}`;
+    }
+  }
+
+  private isExpired(entry: CacheEntry<unknown>, ttl: number): boolean {
+    return Date.now() - entry.timestamp > ttl;
+  }
+
+  get<T>(key: string, ttl = this.defaultTTL): T | null {
+    const entry = this.cache.get(key);
+    
+    if (!entry) {
+      return null;
+    }
+
+    if (this.isExpired(entry, ttl)) {
+      this.cache.delete(key);
+      return null;
+    }
+
+    return entry.data as T;
+  }
+
+  set<T>(key: string, data: T): void {
+    this.cache.set(key, {
+      data,
+      timestamp: Date.now()
+    });
+  }
+
+  delete(key: string): boolean {
+    return this.cache.delete(key);
+  }
+
+  clear(): void {
+    this.cache.clear();
+  }
+
+  cleanup(ttl = this.defaultTTL): void {
+    const now = Date.now();
+    const keysToDelete: string[] = [];
+
+    this.cache.forEach((entry, key) => {
+      if (now - entry.timestamp > ttl) {
+        keysToDelete.push(key);
+      }
+    });
+
+    keysToDelete.forEach(key => this.cache.delete(key));
+    
+    if (keysToDelete.length > 0) {
+      logger.log(`Cache cleanup: removed ${keysToDelete.length} expired entries`);
+    }
+  }
+
+  size(): number {
+    return this.cache.size;
+  }
+
+  getStats(): { size: number; oldestEntry: number | null; newestEntry: number | null } {
+    let oldest: number | null = null;
+    let newest: number | null = null;
+
+    this.cache.forEach(entry => {
+      if (oldest === null || entry.timestamp < oldest) {
+        oldest = entry.timestamp;
+      }
+      if (newest === null || entry.timestamp > newest) {
+        newest = entry.timestamp;
+      }
+    });
+
+    return {
+      size: this.cache.size,
+      oldestEntry: oldest,
+      newestEntry: newest
+    };
+  }
+}
diff --git a/packages/core/src/rest/cache/index.ts b/packages/core/src/rest/cache/index.ts
new file mode 100644
index 0000000000..ac93ca0723
--- /dev/null
+++ b/packages/core/src/rest/cache/index.ts
@@ -0,0 +1,2 @@
+export { CacheManager, CacheEntry, CacheOptions } from './CacheManager';
+export { cacheable, withCache } from './CacheDecorator';
diff --git a/packages/core/src/rest/index.ts b/packages/core/src/rest/index.ts
index 9f3eb2a726..8cf680f5bb 100644
--- a/packages/core/src/rest/index.ts
+++ b/packages/core/src/rest/index.ts
@@ -27,11 +27,4 @@ export { iTunes };
 import * as Spotify from './Spotify';
 export { Spotify };
 
-import { NuclearPlaylistsService } from './Nuclear/Playlists';
-export { NuclearPlaylistsService };
-
-import { NuclearIdentityService } from './Nuclear/Identity';
-export { NuclearIdentityService };
-
-import { NuclearStreamMappingsService } from './Nuclear/StreamMappings';
-export { NuclearStreamMappingsService };
+export * as Nuclear from './nuclear';
diff --git a/packages/core/src/rest/Nuclear/NuclearService.ts b/packages/core/src/rest/nuclear/NuclearService.ts
similarity index 100%
rename from packages/core/src/rest/Nuclear/NuclearService.ts
rename to packages/core/src/rest/nuclear/NuclearService.ts
diff --git a/packages/core/src/rest/Nuclear/NuclearSupabaseService.ts b/packages/core/src/rest/nuclear/NuclearSupabaseService.ts
similarity index 100%
rename from packages/core/src/rest/Nuclear/NuclearSupabaseService.ts
rename to packages/core/src/rest/nuclear/NuclearSupabaseService.ts
diff --git a/packages/core/src/rest/Nuclear/StreamMappings.ts b/packages/core/src/rest/nuclear/StreamMappings.ts
similarity index 99%
rename from packages/core/src/rest/Nuclear/StreamMappings.ts
rename to packages/core/src/rest/nuclear/StreamMappings.ts
index fff028dfa7..9698956ac0 100644
--- a/packages/core/src/rest/Nuclear/StreamMappings.ts
+++ b/packages/core/src/rest/nuclear/StreamMappings.ts
@@ -1,4 +1,3 @@
-import { has } from 'lodash';
 import { NuclearService } from './NuclearService';
 
 type StreamMapping = {
diff --git a/packages/core/src/rest/nuclear/index.ts b/packages/core/src/rest/nuclear/index.ts
new file mode 100644
index 0000000000..0db29b7cc8
--- /dev/null
+++ b/packages/core/src/rest/nuclear/index.ts
@@ -0,0 +1,5 @@
+export { NuclearService } from './NuclearService';
+export { NuclearSupabaseService } from './NuclearSupabaseService';
+export { NuclearStreamMappingsService, isSuccessCacheEntry, isErrorCacheEntry } from './StreamMappings';
+export type { TopStream } from './StreamMappings';
+export * from './types';
diff --git a/packages/core/src/rest/Nuclear/types.ts b/packages/core/src/rest/nuclear/types.ts
similarity index 100%
rename from packages/core/src/rest/Nuclear/types.ts
rename to packages/core/src/rest/nuclear/types.ts
diff --git a/packages/core/src/rest/soytify/Soytify.types.ts b/packages/core/src/rest/soytify/Soytify.types.ts
new file mode 100644
index 0000000000..4c179b9eb2
--- /dev/null
+++ b/packages/core/src/rest/soytify/Soytify.types.ts
@@ -0,0 +1,467 @@
+// Query parameters
+export type OperationName =
+  | 'searchDesktop'
+  | 'searchArtists'
+  | 'searchAlbums'
+  | 'searchTracks'
+  | 'searchPlaylists'
+  | 'queryArtistOverview'
+  | 'queryArtistDiscographyAll'
+  | 'getAlbum';
+
+// Helper Types & Common Interfaces
+export interface AlbumCoverArt {
+  extractedColors: ExtractedColors;
+  sources: CoverArtSource[];
+}
+export interface AlbumDate {
+  year: number;
+}
+export interface AlbumOfTrack {
+  coverArt: AlbumCoverArt;
+  id: string;
+  name: string;
+  uri: string;
+}
+export interface ArtistProfile {
+  name: string;
+  verified?: boolean;
+}
+export interface ArtistSimplified {
+  profile: {
+    name: string;
+  };
+  uri: string;
+  visuals?: ArtistVisuals;
+}
+export interface ArtistVisuals {
+  avatarImage: AvatarImage | null;
+  gallery?: Gallery;
+}
+export interface AssociationsV3 {
+  audioAssociations: { totalCount: number };
+  videoAssociations: { totalCount: number };
+}
+export interface AvatarImage {
+  extractedColors: ExtractedColors;
+  sources: CoverArtSource[];
+}
+export interface ChipOrderItem {
+  typeName: ChipOrderTypeName;
+}
+export type ChipOrderTypeName =
+  | 'TRACKS'
+  | 'ARTISTS'
+  | 'PLAYLISTS'
+  | 'ALBUMS'
+  | 'PODCASTS'
+  | 'EPISODES'
+  | 'USERS'
+  | 'AUDIOBOOKS'
+  | 'AUTHORS'
+  | 'GENRES';
+export interface ConcertLocation {
+  city: string;
+  name: string;
+}
+export interface ContentRating {
+  label: 'NONE' | 'EXPLICIT';
+}
+export interface Copyright {
+  items: CopyrightItem[];
+}
+export interface CopyrightItem {
+  text: string;
+  type: 'C' | 'P';
+}
+export interface CoverArtSource {
+  height: number | null;
+  url: string;
+  width: number | null;
+}
+export interface Duration {
+  totalMilliseconds: number;
+}
+export interface EpisodeCoverArt {
+  extractedColors: ExtractedColors;
+  sources: CoverArtSource[];
+}
+export interface EpisodeRestrictions {
+  paywallContent: boolean;
+}
+export interface ExtractedColorItem {
+  hex: string;
+  isFallback: boolean;
+}
+export interface ExtractedColors {
+  colorDark: ExtractedColorItem;
+}
+export interface FullDate {
+  day: number;
+  month: number;
+  precision: 'DAY' | 'MONTH' | 'YEAR';
+  year: number;
+  isoString?: string;
+}
+export interface PlayedState {
+  playPositionMilliseconds: number;
+  state: 'NOT_STARTED';
+}
+export interface Playability {
+  playable: boolean;
+  reason: 'PLAYABLE';
+}
+export interface PlaylistAttribute {
+  key: string;
+  value: string;
+}
+export type PlaylistFormat =
+  | ''
+  | 'editorial'
+  | 'artistsets'
+  | 'inspiredby-mix'
+  | 'format-shows-shuffle';
+export interface PlaylistImageItem {
+  extractedColors: ExtractedColors;
+  sources: CoverArtSource[];
+}
+export interface PlaylistImages {
+  items: PlaylistImageItem[];
+}
+export interface PodcastCoverArt {
+  sources: CoverArtSource[];
+  extractedColors?: ExtractedColors;
+}
+export interface PodcastPublisher {
+  name: string;
+}
+export interface PodcastTopics {
+  items: PodcastTopic[];
+}
+export interface PreReleaseContent {
+  artists: {
+    items: ArtistResponseWrapper[];
+  };
+  coverArt: AlbumCoverArt;
+  name: string;
+  type: 'ALBUM' | 'EP';
+  uri: string;
+}
+export interface ReleaseDate {
+  isoString: string;
+  precision: 'MINUTE';
+}
+export type ReleaseType = 'ALBUM' | 'SINGLE' | 'EP' | 'COMPILATION';
+export interface SharingInfo {
+  shareId: string;
+  shareUrl: string;
+}
+export interface TracksSummary {
+  totalCount: number;
+}
+export interface UserAvatar {
+  sources: CoverArtSource[];
+  extractedColors?: ExtractedColors;
+}
+
+// __typename Interfaces
+export interface Album {
+  __typename: 'Album';
+  artists: {
+    items: ArtistSimplified[];
+  };
+  coverArt: AlbumCoverArt;
+  date: AlbumDate;
+  name: string;
+  playability: Playability;
+  type: ReleaseType;
+  uri: string;
+}
+
+export interface AlbumUnion {
+  __typename: 'AlbumUnion';
+  copyright: Copyright;
+  date: FullDate;
+  label: string;
+  name: string;
+  playability: Playability;
+  type: ReleaseType;
+  artists: PaginatedResponse<ArtistSimplified>;
+  coverArt: AlbumCoverArt;
+  discs: PaginatedResponse<{ number: number; tracks: { totalCount: number } }>;
+  tracksV2: PaginatedResponse<{ track: Track; }>;
+  uri: string;
+}
+
+export interface Artist {
+  __typename: 'Artist';
+  id: string;
+  uri: string;
+  profile: ArtistProfile;
+  headerImage: {
+    data: {
+      sources: CoverArtSource[]
+    };
+  } | null;
+  visuals?: ArtistVisuals;
+  goods: Goods;
+  discography: Discography;
+  preRelease: PreReleaseResponseWrapper | null;
+  relatedContent: RelatedContent;
+  sharingInfo: SharingInfo;
+  stats: ArtistStats;
+}
+export interface ConcertItem {
+  __typename: 'ConcertV2';
+  festival: boolean;
+  location: ConcertLocation;
+  startDateIsoString: string;
+  title: string;
+  uri: string;
+}
+export interface Episode {
+  __typename: 'Episode';
+  contentRating: ContentRating;
+  coverArt: EpisodeCoverArt;
+  description: string;
+  duration: Duration;
+  mediaTypes: ('AUDIO' | 'VIDEO')[];
+  name: string;
+  playability: Playability;
+  playedState: PlayedState;
+  podcastV2: PodcastResponseWrapper;
+  releaseDate: ReleaseDate;
+  restrictions: EpisodeRestrictions;
+  uri: string;
+}
+export interface NotFound {
+  __typename: 'NotFound';
+}
+export interface Playlist {
+  __typename: 'Playlist';
+  attributes: PlaylistAttribute[];
+  description: string;
+  format: PlaylistFormat;
+  images: PlaylistImages;
+  name: string;
+  ownerV2: UserResponseWrapper;
+  uri: string;
+}
+export interface Podcast {
+  __typename: 'Podcast';
+  coverArt: PodcastCoverArt;
+  mediaType: 'MIXED' | 'AUDIO';
+  name: string;
+  publisher: PodcastPublisher;
+  topics?: PodcastTopics;
+  uri: string;
+}
+export interface PodcastTopic {
+  __typename: 'PodcastTopic';
+  title: string;
+  uri: string;
+}
+export interface PreRelease {
+  __typename: 'PreRelease';
+  preReleaseContent: PreReleaseContent;
+  preSaved: boolean;
+  releaseDate: ReleaseDate;
+  timezone: string;
+  uri: string;
+}
+export interface Track {
+  __typename: 'Track';
+  albumOfTrack: AlbumOfTrack;
+  artists: {
+    items: ArtistSimplified[];
+  };
+  associationsV3: AssociationsV3;
+  contentRating: ContentRating;
+  duration: Duration;
+  discNumber: number;
+  id: string;
+  trackMediaType: 'UNKNOWN';
+  name: string;
+  playability: Playability;
+  playcount: string;
+  trackNumber: number;
+  uri: string;
+}
+export interface User {
+  __typename: 'User';
+  avatar: UserAvatar | null;
+  name: string;
+  uri: string;
+  username: string;
+  id?: string;
+  displayName?: string;
+}
+
+// Wrapper Interfaces
+export interface AlbumResponseWrapper {
+  __typename: 'AlbumResponseWrapper';
+  data: Album;
+}
+export interface ArtistResponseWrapper {
+  __typename: 'ArtistResponseWrapper';
+  data: Artist;
+}
+export interface EpisodeResponseWrapper {
+  __typename: 'EpisodeResponseWrapper';
+  data: Episode;
+}
+export interface PlaylistResponseWrapper {
+  __typename: 'PlaylistResponseWrapper';
+  data: Playlist;
+}
+export interface PodcastResponseWrapper {
+  __typename: 'PodcastResponseWrapper';
+  data: Podcast;
+}
+export interface PreReleaseResponseWrapper {
+  __typename: 'PreReleaseResponseWrapper';
+  data: PreRelease;
+}
+export interface TrackResponseWrapper {
+  __typename: 'TrackResponseWrapper';
+  data: Track | NotFound;
+}
+export interface UserResponseWrapper {
+  __typename: 'UserResponseWrapper';
+  data: User;
+}
+
+// Page & Section Interfaces
+export interface AlbumOrPrereleasePage {
+  __typename: 'AlbumOrPrereleasePage';
+  items: (AlbumResponseWrapper | PreReleaseResponseWrapper)[];
+  totalCount: number;
+}
+
+export interface ArtistStats {
+  followers: number;
+  monthlyListeners: number;
+  worldRank: number;
+}
+export interface ArtistTopTrack {
+  track: {
+    albumOfTrack: AlbumOfTrack;
+    artists: {
+      items: ArtistSimplified[];
+    };
+    associationsV3: AssociationsV3;
+    contentRating: ContentRating;
+    discNumber: number;
+    duration: Duration;
+    id: string;
+    name: string;
+    playability: Playability;
+    playcount: string;
+    uri: string;
+  };
+}
+export interface ChipOrder {
+  items: ChipOrderItem[];
+}
+export interface Discography {
+  all?: PaginatedResponse<{ releases: PaginatedResponse<ReleaseItem> }>;
+  albums: ReleaseSection;
+  compilations: ReleaseSection;
+  latest: ReleaseItem;
+  popularReleasesAlbums: ReleaseSection;
+  singles: ReleaseSection;
+  topTracks: TopTracksSection;
+}
+export interface Gallery {
+  items: GalleryImageItem[];
+}
+export interface GalleryImageItem {
+  sources: CoverArtSource[];
+}
+export interface Goods {
+  concerts: PaginatedResponse<ConcertItem>;
+}
+export interface PaginatedResponse<T> {
+  items: T[];
+  totalCount: number;
+}
+export type RelatedArtistsSection = PaginatedResponse<Artist>;
+export interface RelatedContent {
+  relatedArtists: RelatedArtistsSection;
+}
+export interface ReleaseItem {
+  copyright: Copyright;
+  coverArt: AlbumCoverArt;
+  date: FullDate;
+  id: string;
+  label: string;
+  name: string;
+  playability: Playability;
+  sharingInfo: SharingInfo;
+  tracks: TracksSummary;
+  type: ReleaseType;
+  uri: string;
+}
+export type ReleaseSection = PaginatedResponse<ReleaseItem>;
+export interface SearchResultItemWrapper<T> {
+  item: T;
+}
+export interface SearchV2 {
+  albumsV2: AlbumOrPrereleasePage;
+  artists: PaginatedResponse<ArtistResponseWrapper>;
+  chipOrder: ChipOrder;
+  episodes: PaginatedResponse<EpisodeResponseWrapper>;
+  playlists: PaginatedResponse<PlaylistResponseWrapper>;
+  podcasts: PaginatedResponse<PodcastResponseWrapper>;
+  topResultsV2: TopResultsV2;
+  tracksV2: PaginatedResponse<SearchResultItemWrapper<TrackResponseWrapper>>;
+  users: PaginatedResponse<UserResponseWrapper>;
+}
+export interface TopResultsV2 {
+  featured: PlaylistResponseWrapper[];
+  itemsV2: SearchResultItemWrapper<
+    TrackResponseWrapper | ArtistResponseWrapper | PlaylistResponseWrapper
+  >[];
+}
+export interface TopTracksSection {
+  items: ArtistTopTrack[];
+}
+
+// Response objects
+export interface SoytifyArtistOverviewResponse {
+  data: {
+    artistUnion: Artist;
+  };
+  extensions: {
+    requestIds: {
+      [key: string]: {
+        [key: string]: string;
+      };
+    };
+  };
+}
+export interface SoytifySearchV2Response {
+  data: {
+    searchV2: SearchV2;
+  };
+  extensions: {
+    requestIds: {
+      [key: string]: {
+        [key: string]: string;
+      };
+    };
+  };
+}
+
+export interface SoytifyGetAlbumResponse {
+  data: {
+    albumUnion: AlbumUnion;
+  };
+  extensions: {
+    requestIds: {
+      [key: string]: {
+        [key: string]: string;
+      };
+    };
+  };
+}
diff --git a/packages/core/src/rest/soytify/soytify-mappers.ts b/packages/core/src/rest/soytify/soytify-mappers.ts
new file mode 100644
index 0000000000..ad47e748f1
--- /dev/null
+++ b/packages/core/src/rest/soytify/soytify-mappers.ts
@@ -0,0 +1,107 @@
+import { Album, AlbumResponseWrapper, AlbumUnion, Artist, ArtistResponseWrapper, ReleaseItem, SearchResultItemWrapper, Track, TrackResponseWrapper } from './Soytify.types';
+import { getImageSet, getLargestThumbnail, getThumbnailSizedImage } from '../../util';
+import { AlbumDetails, ArtistDetails, SearchResultsAlbum, SearchResultsArtist, SearchResultsSource, SearchResultsTrack } from '../../plugins/plugins.types';
+import NuclearTrack from '../../structs/Track';
+
+export const mapSoytifyArtistSearchResult = (artistSearchResult: ArtistResponseWrapper): SearchResultsArtist => {
+  const data = artistSearchResult.data;
+  const imageSet = getImageSet(data.visuals.avatarImage?.sources);
+        
+  return {
+    id: data.uri,
+    name: data.profile.name,
+    source: SearchResultsSource.Soytify,
+    ...imageSet
+  };
+};
+
+export const mapSoytifyReleaseItem = (releaseItem: ReleaseItem, artist: Artist): SearchResultsAlbum => {
+  const imageSet = getImageSet(releaseItem.coverArt?.sources);
+  const mapped = {
+    id: releaseItem.uri,
+    ...imageSet,
+    images: releaseItem.coverArt?.sources.map((source) => source.url) ?? [],
+    title: releaseItem.name,
+    artist: artist.profile.name,
+    resourceUrl: releaseItem.uri,
+    type: releaseItem.type,
+    year: releaseItem.date.year.toString(),
+    source: SearchResultsSource.Soytify
+  };
+
+  return mapped;
+};
+
+export const mapSoytifyReleaseSearchResult = (releaseSearchResult: AlbumResponseWrapper): SearchResultsAlbum => {
+  const data = releaseSearchResult.data as Album;
+  const imageSet = getImageSet(data.coverArt?.sources);
+  return {
+    id: data.uri,
+    ...imageSet,
+    images: data.coverArt?.sources.map((source) => source.url) ?? [],
+    title: data.name,
+    artist: data.artists?.items[0].profile.name ?? 'Unknown',
+    resourceUrl: data.uri,
+    type: data.type,
+    source: SearchResultsSource.Soytify
+  };
+};
+
+export const mapSoytifyTrackSearchResult = (trackSearchResult: SearchResultItemWrapper<TrackResponseWrapper>): SearchResultsTrack => {
+  const data = trackSearchResult.item.data as Track;
+
+  const thumb = getThumbnailSizedImage(data.albumOfTrack.coverArt?.sources);
+  return {
+    id: data.uri,
+    title: data.name,
+    artist: data.artists.items[0].profile.name,
+    thumb,
+    source: SearchResultsSource.Soytify
+  };
+};
+
+export const mapSoytifyAlbumDetails = (album: AlbumUnion): AlbumDetails => {
+  const imageSet = getImageSet(album.coverArt?.sources);
+  return {
+    id: album.uri,
+    artist: album.artists.items[0].profile.name,
+    title: album.name,
+    year: album.date.year?.toString(),
+    type: album.type,
+    resourceUrl: album.uri,
+    tracklist: album.tracksV2.items.map(trackObj => mapSoytifyAlbumTrack(trackObj.track)),
+    ...imageSet
+  };
+};
+
+export const mapSoytifyAlbumTrack = (track: Track): NuclearTrack => new NuclearTrack({
+  ids: { [SearchResultsSource.Soytify]: track.uri },
+  artist: track.artists.items[0].profile.name,
+  title: track.name,
+  duration: Math.round(track.duration.totalMilliseconds / 1000),
+  position: track.trackNumber,
+  discNumber: track.discNumber,
+  playcount: track.playcount
+});
+
+export const mapSoytifyArtistDetails = (artist: Artist): ArtistDetails => {
+  return {
+    id: artist.uri,
+    name: artist.profile.name,
+    coverImage: getLargestThumbnail(artist.headerImage?.data.sources),
+    thumb: getThumbnailSizedImage(artist.visuals.avatarImage.sources),
+    images: artist.visuals.gallery.items.map(item => getLargestThumbnail(item.sources)),
+    topTracks: artist.discography.topTracks?.items.map(({ track }) => ({
+      artist: { name: track.artists.items[0].profile.name },
+      title: track.name,
+      thumb: getThumbnailSizedImage(track.albumOfTrack.coverArt?.sources),
+      playcount: parseInt(track.playcount),
+      listeners: parseInt(track.playcount)
+    })) ?? [],
+    similar: artist.relatedContent.relatedArtists.items.map(artist => ({
+      name: artist.profile.name,
+      thumbnail: getThumbnailSizedImage(artist.visuals.avatarImage?.sources)
+    })),
+    source: SearchResultsSource.Soytify
+  };
+};
diff --git a/packages/core/src/rest/soytify/soytify-partners-api.ts b/packages/core/src/rest/soytify/soytify-partners-api.ts
new file mode 100644
index 0000000000..d9d9c71b87
--- /dev/null
+++ b/packages/core/src/rest/soytify/soytify-partners-api.ts
@@ -0,0 +1,252 @@
+import { logger } from '../../';
+import { TOTP } from './soytify-totp';
+import { OperationName, SoytifyArtistOverviewResponse, SoytifyGetAlbumResponse, SoytifySearchV2Response } from './Soytify.types';
+import {
+  mapSoytifyAlbumDetails,
+  mapSoytifyArtistDetails,
+  mapSoytifyArtistSearchResult,
+  mapSoytifyReleaseItem,
+  mapSoytifyReleaseSearchResult,
+  mapSoytifyTrackSearchResult
+} from './soytify-mappers';
+import { AlbumType, ArtistDetails } from '../../plugins/plugins.types';
+import { cacheable, withCache } from '../cache';
+
+const SOYTIFY_API_OPEN_URL = 'https://open.' + atob('c3BvdGlmeQ==') + '.com/api';
+const SOYTIFY_BASE_URL =
+  'https://api-partner.' + atob('c3BvdGlmeQ==') + '.com/pathfinder/v2/query';
+
+const OPERATION_HASHES: Record<OperationName, string> = {
+  searchDesktop:
+    'd9f785900f0710b31c07818d617f4f7600c1e21217e80f5b043d1e78d74e6026',
+  searchArtists:
+    '0e6f9020a66fe15b93b3bb5c7e6484d1d8cb3775963996eaede72bac4d97e909',
+  searchAlbums:
+    'a71d2c993fc98e1c880093738a55a38b57e69cc4ce5a8c113e6c5920f9513ee2',
+  searchTracks:
+    'bc1ca2fcd0ba1013a0fc88e6cc4f190af501851e3dafd3e1ef85840297694428',
+  searchPlaylists:
+    'fc3a690182167dbad20ac7a03f842b97be4e9737710600874cb903f30112ad58',
+  queryArtistOverview:
+    '1ac33ddab5d39a3a9c27802774e6d78b9405cc188c6f75aed007df2a32737c72',
+  queryArtistDiscographyAll: '5e07d323febb57b4a56a42abbf781490e58764aa45feb6e3dc0591564fc56599',
+  getAlbum: '97dd13a1f28c80d66115a13697a7ffd94fe3bebdb94da42159456e1d82bfee76'
+};
+
+class SoytifyClientBase {
+  private _token: string | undefined;
+  private totp: TOTP;
+
+  constructor() {
+    this.totp = new TOTP();
+  }
+
+  get token() {
+    return this._token;
+  }
+
+  async init() {
+    return this.refreshToken();
+  }
+
+  async refreshToken() {
+    try {
+      const serverTimeResponse = await fetch(
+        `${SOYTIFY_API_OPEN_URL}/server-time`
+      );
+      if (!serverTimeResponse.ok) {
+        throw new Error(
+          `Failed to get server time: ${serverTimeResponse.status}`
+        );
+      }
+
+      const serverTimeData = await serverTimeResponse.json();
+      const serverTime = 1000 * serverTimeData.serverTime;
+
+      const totpToken = this.totp.generate(serverTime);
+
+      const tokenResponse = await fetch(
+        `${SOYTIFY_API_OPEN_URL}/token?reason=init&productType=web-player&totp=${totpToken}&totpVer=${this.totp.getVersion()}&sTime=${serverTime}&cTime=${Date.now()}&buildVer=web-player_2025-05-12_1747082920646_8ab14aa&buildDate=2025-05-12&totpServer=010137`
+      );
+
+      if (!tokenResponse.ok) {
+        throw new Error(`Failed to get access token: ${tokenResponse.status}`);
+      }
+
+      const tokenData = await tokenResponse.json();
+      this._token = tokenData.accessToken;
+    } catch (error) {
+      logger.error('Failed to refresh Spotify token:', error);
+      const tokenData = await (
+        await fetch(
+          `${SOYTIFY_API_OPEN_URL}/token?reason=transport&productType=web_player`
+        )
+      ).json();
+      this._token = tokenData.accessToken;
+    }
+  }
+
+  async post(url: string, body?: Record<string, unknown>) {
+    const result = await fetch(url, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${this._token}`,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(body)
+    });
+    if (result.ok) {
+      return result.json();
+    } else if (result.status === 401) {
+      await this.refreshToken();
+      return this.post(url, body);
+    } else {
+      const body = await result.json();
+      throw new Error(body);
+    }
+  }
+
+  @cacheable({ ttl: 60 * 60 * 1000 }) // 1 hour cache
+  async runQuery<Response>({
+    operationName,
+    args
+  }: {
+    operationName: OperationName;
+    args: Record<string, string | number | boolean>;
+  }): Promise<Response> {
+    const data: Response = await this.post(SOYTIFY_BASE_URL, {
+      operationName,
+      variables: {
+        ...args
+      },
+      extensions: {
+        persistedQuery: {
+          version: 1,
+          sha256Hash: OPERATION_HASHES[operationName]
+        }
+      }
+    });
+
+    return data;
+  }
+
+  @cacheable({ ttl: 60 * 60 * 1000 })
+  async searchQuery({
+    operationName,
+    searchTerm
+  }: {
+    operationName: OperationName;
+    searchTerm: string;
+  }): Promise<SoytifySearchV2Response> {
+    const data = await this.runQuery<SoytifySearchV2Response>({
+      operationName,
+      args: {
+        searchTerm,
+        limit: 30,
+        offset: 0,
+        numberOfTopResults: 30,
+        includeAudiobooks: false,
+        includeArtistHasConcertsField: true,
+        includePreReleases: true,
+        includeLocalConcertsField: true
+      }
+    });
+
+    return data;
+  }
+
+  @cacheable({ ttl: 60 * 60 * 1000 })
+  async searchArtists(searchTerm: string) {
+    const artists = await this.searchQuery({
+      operationName: 'searchArtists',
+      searchTerm
+    });
+    return artists.data.searchV2.artists.items.map(
+      mapSoytifyArtistSearchResult
+    );
+  }
+
+  @cacheable({ ttl: 60 * 60 * 1000 })
+  async searchReleases(searchTerm: string) {
+    const releases = await this.searchQuery({
+      operationName: 'searchAlbums',
+      searchTerm
+    });
+    return releases.data.searchV2.albumsV2.items.map(
+      mapSoytifyReleaseSearchResult
+    );
+  }
+
+  @cacheable({ ttl: 60 * 60 * 1000 })
+  async searchTracks(searchTerm: string) {
+    const tracks = await this.searchQuery({
+      operationName: 'searchTracks',
+      searchTerm
+    });
+    return tracks.data.searchV2.tracksV2.items.filter(wrapper => wrapper.item.data.__typename !== 'NotFound').map(mapSoytifyTrackSearchResult);
+  }
+
+  @cacheable({ ttl: 60 * 60 * 1000 })
+  async searchAll(searchTerm: string) {
+    const {
+      data: { searchV2 }
+    } = await this.searchQuery({ operationName: 'searchDesktop', searchTerm });
+
+    return {
+      artists: searchV2.artists.items.map(mapSoytifyArtistSearchResult),
+      releases: searchV2.albumsV2.items.map(mapSoytifyReleaseSearchResult),
+      tracks: searchV2.tracksV2.items.filter(wrapper => wrapper.item.data.__typename !== 'NotFound').map(mapSoytifyTrackSearchResult)
+    };
+  }
+
+  @cacheable({ ttl: 60 * 60 * 1000 })
+  async fetchArtistOverview(artistId: string): Promise<SoytifyArtistOverviewResponse> {
+    return this.runQuery<SoytifyArtistOverviewResponse>({
+      operationName: 'queryArtistOverview',
+      args: { uri: artistId, locale: '' }
+    });
+  }
+
+  async fetchArtistDetails(artistId: string): Promise<ArtistDetails> {
+    const { data: { artistUnion: artist } } = await this.fetchArtistOverview(artistId);
+
+
+    return mapSoytifyArtistDetails(artist);
+  }
+
+  async fetchArtistAlbums(artistId: string) {
+    const { data: { artistUnion: artistOverview } } = await this.runQuery<SoytifyArtistOverviewResponse>({
+      operationName: 'queryArtistOverview',
+      args: { uri: artistId, locale: '' }
+    });
+    const { data: { artistUnion: artistWithDiscography } } = await this.runQuery<SoytifyArtistOverviewResponse>({
+      operationName: 'queryArtistDiscographyAll',
+      args: { uri: artistId, order: 'DATE_DESC', limit: 50, offset: 0 }
+    });
+
+    return artistWithDiscography.discography.all.items.map(releaseItem => mapSoytifyReleaseItem(releaseItem.releases.items[0], artistOverview));
+  }
+
+  async fetchAlbumDetails(albumId: string, albumType: AlbumType) {
+    const { data } = await this.runQuery<SoytifyGetAlbumResponse>({
+      operationName: 'getAlbum',
+      args: { uri: albumId, type: albumType, limit: 50, offset: 0, locale: '' }
+    });
+
+    return mapSoytifyAlbumDetails(data.albumUnion);
+  }
+}
+
+export const SoytifyClient = withCache(SoytifyClientBase, { ttl: 60 * 60 * 1000 });
+
+export class SoytifyClientProvider {
+  private static instance: InstanceType<typeof SoytifyClient>;
+
+  static async get() {
+    if (!this.instance) {
+      this.instance = new SoytifyClient();
+      await this.instance.init();
+    }
+    return this.instance;
+  }
+}
diff --git a/packages/core/src/rest/soytify/soytify-totp.ts b/packages/core/src/rest/soytify/soytify-totp.ts
new file mode 100644
index 0000000000..4ffc9ee80f
--- /dev/null
+++ b/packages/core/src/rest/soytify/soytify-totp.ts
@@ -0,0 +1,42 @@
+import * as crypto from 'crypto';
+
+export class TOTP {
+  private secret: Buffer;
+  private version: number;
+  private period: number;
+  private digits: number;
+
+  constructor() {
+    this.secret = Buffer.from('5507145853487499592248630329347');
+    this.version = 5;
+    this.period = 30;
+    this.digits = 6;
+  }
+
+  generate(timestamp: number): string {
+    const counter = Math.floor(timestamp / 1000 / this.period);
+    
+    const counterBuffer = Buffer.alloc(8);
+    const high = Math.floor(counter / 0x100000000);
+    const low = counter >>> 0;
+    counterBuffer.writeUInt32BE(high, 0);
+    counterBuffer.writeUInt32BE(low, 4);
+    
+    const hmac = crypto.createHmac('sha1', this.secret);
+    hmac.update(counterBuffer);
+    const hmacResult = hmac.digest();
+    
+    const offset = hmacResult[hmacResult.length - 1] & 0x0f;
+    const binary = 
+      ((hmacResult[offset] & 0x7f) << 24) |
+      ((hmacResult[offset + 1] & 0xff) << 16) |
+      ((hmacResult[offset + 2] & 0xff) << 8) |
+      (hmacResult[offset + 3] & 0xff);
+    
+    return (binary % Math.pow(10, this.digits)).toString().padStart(this.digits, '0');
+  }
+  
+  getVersion(): number {
+    return this.version;
+  }
+}
diff --git a/packages/core/src/rest/soytify/soytify.test.ts b/packages/core/src/rest/soytify/soytify.test.ts
new file mode 100644
index 0000000000..e463ffc9bd
--- /dev/null
+++ b/packages/core/src/rest/soytify/soytify.test.ts
@@ -0,0 +1,30 @@
+/* eslint-disable no-console */
+import { SoytifyClient } from './soytify-partners-api';
+
+// These tests don't mock the API calls.
+// The purpose is to be able to conveniently, manually test the API.
+xdescribe('soytify test', () => {
+  it('searchArtists', async () => {
+    const client= new SoytifyClient();
+    const data = await client.searchArtists('rush');
+    console.log(JSON.stringify(data, null, 2));
+  });
+
+  it('searchTracks', async () => {
+    const client= new SoytifyClient();
+    const data = await client.searchTracks('rush');
+    console.log(JSON.stringify(data, null, 2));
+  });
+
+  it('searchAll', async () => {
+    const client= new SoytifyClient();
+    const data = await client.searchAll('rush');
+    console.log(JSON.stringify(data, null, 2));
+  });
+
+  it('fetchArtistDetails', async () => {
+    const client= new SoytifyClient();
+    const data = await client.fetchArtistDetails('spotify:artist:2Hkut4rAAyrQxRdof7FVJq');
+    console.log(JSON.stringify(data, null, 2));
+  });
+});
diff --git a/packages/core/src/util/index.ts b/packages/core/src/util/index.ts
index e7edc53e74..f9f66ed754 100644
--- a/packages/core/src/util/index.ts
+++ b/packages/core/src/util/index.ts
@@ -1,3 +1,84 @@
+import { isEmpty } from 'lodash';
+
 export function isValidPort(value): boolean {
   return typeof value === 'number' && value > 1024 && value < 49151;
 }
+
+type Thumbnail = {
+  height?: number;
+  width?: number;
+  maxHeight?: number;
+  maxWidth?: number;
+  url: string;
+};
+
+const getImageDimensions = (image: Thumbnail) => ({
+  height: image.height || image.maxHeight,
+  width: image.width || image.maxWidth
+});
+
+export const getLargestThumbnail = (thumbnails: Thumbnail[] | null): string => {
+  if (!thumbnails || isEmpty(thumbnails)) {
+    return undefined;
+  }
+
+  // If objects don't have width/height, just pick the first one
+  const hasValidDimensions = thumbnails?.some((thumb) => {
+    const { height, width } = getImageDimensions(thumb);
+    return height && width;
+  });
+
+  if (!hasValidDimensions) {
+    return thumbnails[0]?.url;
+  }
+
+  const largestThumbnail = thumbnails.reduce((prev, current) => {
+    const { height: prevHeight, width: prevWidth } = getImageDimensions(prev);
+    const { height: currentHeight, width: currentWidth } =
+      getImageDimensions(current);
+    const prevSize = (prevHeight || 0) * (prevWidth || 0);
+    const currentSize = (currentHeight || 0) * (currentWidth || 0);
+    return prevSize > currentSize ? prev : current;
+  });
+  return largestThumbnail?.url;
+};
+
+export const getThumbnailSizedImage = (
+  images: Thumbnail[],
+  width = 400,
+  height = 400
+): string => {
+  if (!images || isEmpty(images)) {
+    return undefined;
+  }
+
+  // If objects don't have width/height, just pick the first one
+  const hasValidDimensions = images.some((img) => {
+    const { height, width } = getImageDimensions(img);
+    return height && width;
+  });
+  if (!hasValidDimensions) {
+    return images[0]?.url;
+  }
+
+  const thumbnail = images.find((image) => {
+    const { height: imageHeight, width: imageWidth } =
+      getImageDimensions(image);
+    return (
+      imageHeight && imageWidth && imageHeight >= height && imageWidth >= width
+    );
+  });
+  return thumbnail?.url;
+};
+
+export const getImageSet = (
+  images: Thumbnail[]
+): { thumb: string; coverImage: string } => {
+  const largestImage = getLargestThumbnail(images);
+  const thumbnail = getThumbnailSizedImage(images, 400, 400);
+
+  return {
+    thumb: thumbnail,
+    coverImage: largestImage
+  };
+};
diff --git a/packages/core/test/spotify-mock.ts b/packages/core/test/spotify-mock.ts
index 196f8bfd20..9e8fd17958 100644
--- a/packages/core/test/spotify-mock.ts
+++ b/packages/core/test/spotify-mock.ts
@@ -3,41 +3,47 @@ import fetchMock from 'fetch-mock';
 import { SpotifyArtist, SpotifyFullAlbum, SpotifyFullArtist, SpotifySimplifiedAlbum, SpotifyTrack } from '../src/rest/Spotify';
 
 export class SpotifyMock {
+  static withServerTime(serverTime = 1700000) {
+    fetchMock.get('https://open.spotify.com/server-time', {
+      serverTime: Math.floor(serverTime)
+    });
+  }
   static withAccessToken(accessToken = 'my-spotify-token') {
+    SpotifyMock.withServerTime();
     fetchMock.get('https://open.spotify.com/get_access_token?reason=transport&productType=web_player', 
       { accessToken });
   }
   
   static withSearchArtists(query: string, artists: Partial<SpotifyArtist>[], limit=10) {
-    fetchMock.get(`https://api.spotify.com/v1/search?type=artist&q=${encodeURIComponent(query)}&decorate_restrictions=false&include_external=audio&limit=${limit}`, {
+    fetchMock.get(`https://api.spotify.com/v1/search?type=artist&q=${encodeURIComponent(query)}&limit=${limit}`, {
       artists: { items: artists } 
     });
   }
   
   static withGetTopArtist(query: string, artist: Partial<SpotifyArtist>) {
-    fetchMock.get(`https://api.spotify.com/v1/search?type=artist&q=${encodeURIComponent(query)}&decorate_restrictions=false&best_match=true&include_external=audio&limit=1`, {
+    fetchMock.get(`https://api.spotify.com/v1/search?type=artist&q=${encodeURIComponent(query)}&best_match=true&limit=1`, {
       best_match: { items: [artist] } 
     });
   }
   
   static withSearchArtistsFail(query: string) {
-    fetchMock.get(`https://api.spotify.com/v1/search?type=artist&q=${encodeURIComponent(query)}&decorate_restrictions=false&include_external=audio&limit=1`, 500);
-  } 
-  
+    fetchMock.get(`https://api.spotify.com/v1/search?type=artist&q=${encodeURIComponent(query)}&limit=1`, 500);
+  }
+
   static withSearchReleases(query: string, releases: Partial<SpotifySimplifiedAlbum>[], limit=10) {
-    fetchMock.get(`https://api.spotify.com/v1/search?type=album&q=${encodeURIComponent(query)}&decorate_restrictions=false&include_external=audio&limit=${limit}`, {
+    fetchMock.get(`https://api.spotify.com/v1/search?type=album&q=${encodeURIComponent(query)}&limit=${limit}`, {
       albums: { items: releases } 
     });
   }
   
   static withSearchTracks(query: string, tracks: Partial<SpotifyTrack>[], limit=20) {
-    fetchMock.get(`https://api.spotify.com/v1/search?type=track&q=${encodeURIComponent(query)}&decorate_restrictions=false&include_external=audio&limit=${limit}`, {
+    fetchMock.get(`https://api.spotify.com/v1/search?type=track&q=${encodeURIComponent(query)}&limit=${limit}`, {
       tracks: { items: tracks } 
     });
   }
   
   static withSearchAll(query: string, artists: Partial<SpotifyArtist>[], releases: Partial<SpotifySimplifiedAlbum>[], tracks: Partial<SpotifyTrack>[]) {
-    fetchMock.get(`https://api.spotify.com/v1/search?q=${encodeURIComponent(query)}&type=artist,album,track&decorate_restrictions=false&include_external=audio`, {
+    fetchMock.get(`https://api.spotify.com/v1/search?q=${encodeURIComponent(query)}&type=artist,album,track`, {
       artists: { items: artists },
       albums: { items: releases },
       tracks: { items: tracks }
@@ -52,20 +58,12 @@ export class SpotifyMock {
     fetchMock.get(`https://api.spotify.com/v1/artists/${artistId}/top-tracks`, { tracks });
   }
   
-  static withGetSimilarArtists(artistId: string, artists: Partial<SpotifyArtist>[]) {
-    fetchMock.get(`https://api.spotify.com/v1/artists/${artistId}/related-artists`, { artists });
-  }
-  
-  static withGetArtistsAlbums(artistId: string, albums: Partial<SpotifySimplifiedAlbum>[]) {
-    fetchMock.get(`https://api.spotify.com/v1/artists/${artistId}/albums?include_groups=album`, { items: albums });
-  }
-  
   static withGetAlbum(albumId: string, album: Partial<SpotifyFullAlbum>) {
     fetchMock.get(`https://api.spotify.com/v1/albums/${albumId}`, album);
   }
   
   static withGetTopAlbum(query: string, album: Partial<SpotifySimplifiedAlbum>) {
-    fetchMock.get(`https://api.spotify.com/v1/search?type=album&q=${encodeURIComponent(query)}&decorate_restrictions=false&best_match=true&include_external=audio&limit=1`, {
+    fetchMock.get(`https://api.spotify.com/v1/search?type=album&q=${encodeURIComponent(query)}&best_match=true&limit=1`, {
       best_match: { items: [album] } 
     });
   }
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
index 526d2633c5..e9ff5b3686 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@@ -13,8 +13,7 @@
     "allowJs": true,
     "typeRoots": [
       "../../node_modules/@types",
-      "typings",
-      "src/ytdl-core"
+      "typings"
     ]
   },
   "include": [
diff --git a/packages/ui/lib/components/GridTrackTable/index.tsx b/packages/ui/lib/components/GridTrackTable/index.tsx
index e5296cbe33..d40701eefd 100644
--- a/packages/ui/lib/components/GridTrackTable/index.tsx
+++ b/packages/ui/lib/components/GridTrackTable/index.tsx
@@ -5,7 +5,7 @@ import { FixedSizeList } from 'react-window';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { TrackTableColumn, TrackTableExtraProps, TrackTableHeaders, TrackTableSettings, TrackTableStrings } from '../TrackTable/types';
-import { TextHeader, TextHeaderProps } from './Headers/TextHeader';
+import { TextHeader } from './Headers/TextHeader';
 import { TextCell } from './Cells/TextCell';
 import { Track } from '../../types';
 import { getTrackThumbnail } from '../TrackRow';
@@ -26,6 +26,9 @@ import { TitleCell } from './Cells/TitleCell';
 import { Input } from 'semantic-ui-react';
 import Button from '../Button';
 
+export const HEADER_HEIGHT = 48;
+export const ITEM_HEIGHT = 42;
+
 export type GridTrackTableProps<T extends Track> = {
   className?: string;
   tracks: T[];
@@ -82,7 +85,7 @@ export const GridTrackTable = <T extends Track>({
       id: TrackTableColumn.Selection,
       Header: (props: HeaderProps<T> & UseRowSelectInstanceProps<T> & TrackTableExtraProps<T>) => <SelectionHeader<T> {...props} {...extraProps} />,
       Cell: (props: SelectionCellProps<T> & UseRowSelectRowProps<T>) => <SelectionCell<T> {...props} />,
-      columnWidth: '7.5em'
+      columnWidth: '4em'
     },
     displayPosition && {
       id: TrackTableColumn.Position,
@@ -218,7 +221,7 @@ export const GridTrackTable = <T extends Track>({
                         className={styles.track_table_virtualized_list}
                         height={height}
                         width={width}
-                        itemSize={42}
+                        itemSize={ITEM_HEIGHT}
                         itemCount={rows.length}
                         overscanCount={2}
                         itemData={{
diff --git a/packages/ui/test/__snapshots__/gridTrackTable.test.tsx.snap b/packages/ui/test/__snapshots__/gridTrackTable.test.tsx.snap
index 4b4c0c5cf8..71fd79a928 100644
--- a/packages/ui/test/__snapshots__/gridTrackTable.test.tsx.snap
+++ b/packages/ui/test/__snapshots__/gridTrackTable.test.tsx.snap
@@ -15,7 +15,7 @@ exports[`(Snapshot) Grid track table - empty should render correctly 1`] = `
         <div
           class="track_table_header_row"
           role="row"
-          style="grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em auto;"
+          style="grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em auto;"
         >
           <div
             class="track_table_header_cell"
@@ -176,7 +176,7 @@ exports[`(Snapshot) Grid track table - example data with all rows should render
         <div
           class="track_table_header_row"
           role="row"
-          style="grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em auto;"
+          style="grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em auto;"
         >
           <div
             class="track_table_header_cell"
@@ -321,7 +321,7 @@ exports[`(Snapshot) Grid track table - example data with all rows should render
               data-rbd-draggable-id="0"
               data-testid="track-table-row"
               role="row"
-              style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em;"
+              style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em;"
               tabindex="0"
             >
               <div
@@ -459,7 +459,7 @@ exports[`(Snapshot) Grid track table - example data with all rows should render
               data-rbd-draggable-id="1"
               data-testid="track-table-row"
               role="row"
-              style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em;"
+              style="position: absolute; left: 0px; top: 42px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em;"
               tabindex="1"
             >
               <div
@@ -597,7 +597,7 @@ exports[`(Snapshot) Grid track table - example data with all rows should render
               data-rbd-draggable-id="2"
               data-testid="track-table-row"
               role="row"
-              style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em;"
+              style="position: absolute; left: 0px; top: 84px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em;"
               tabindex="2"
             >
               <div
@@ -758,7 +758,7 @@ exports[`(Snapshot) Grid track table - example data with multiple discs should r
           <div
             class="track_table_header_row"
             role="row"
-            style="grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em auto;"
+            style="grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em auto;"
           >
             <div
               class="track_table_header_cell"
@@ -903,7 +903,7 @@ exports[`(Snapshot) Grid track table - example data with multiple discs should r
                 data-rbd-draggable-id="0"
                 data-testid="track-table-row"
                 role="row"
-                style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em;"
+                style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em;"
                 tabindex="0"
               >
                 <div
@@ -1056,7 +1056,7 @@ exports[`(Snapshot) Grid track table - example data with multiple discs should r
           <div
             class="track_table_header_row"
             role="row"
-            style="grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em auto;"
+            style="grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em auto;"
           >
             <div
               class="track_table_header_cell"
@@ -1201,7 +1201,7 @@ exports[`(Snapshot) Grid track table - example data with multiple discs should r
                 data-rbd-draggable-id="0"
                 data-testid="track-table-row"
                 role="row"
-                style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 7.5em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em;"
+                style="position: absolute; left: 0px; top: 0px; height: 42px; width: 100%; grid-template-columns: 4em 4em 3em 3em minmax(8em, 1fr) 6em 6em 6em 3em;"
                 tabindex="0"
               >
                 <div