diff --git a/src/js/components/ContextMenu.js b/src/js/components/ContextMenu.js
index f6a38d45..7ce74d68 100755
--- a/src/js/components/ContextMenu.js
+++ b/src/js/components/ContextMenu.js
@@ -5,12 +5,13 @@ import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import FontAwesome from 'react-fontawesome'
 
-import TrackList from './TrackList'
 import * as helpers from '../helpers'
+import * as coreActions from '../services/core/actions'
 import * as uiActions from '../services/ui/actions'
 import * as pusherActions from '../services/pusher/actions'
 import * as mopidyActions from '../services/mopidy/actions'
 import * as spotifyActions from '../services/spotify/actions'
+import TrackList from './TrackList'
 
 class ContextMenu extends React.Component{
 
@@ -186,12 +187,12 @@ class ContextMenu extends React.Component{
 
 	addTracksToPlaylist(e, playlist_uri){
 		this.props.uiActions.hideContextMenu()
-		this.props.uiActions.addTracksToPlaylist(playlist_uri, this.props.menu.uris)
+		this.props.coreActions.addTracksToPlaylist(playlist_uri, this.props.menu.uris)
 	}
 
 	removeFromPlaylist(e){
 		this.props.uiActions.hideContextMenu()
-		this.props.uiActions.removeTracksFromPlaylist(this.props.menu.tracklist_uri, this.props.menu.indexes)
+		this.props.coreActions.removeTracksFromPlaylist(this.props.menu.tracklist_uri, this.props.menu.indexes)
 	}
 
 	startRadio(e){
@@ -587,6 +588,7 @@ const mapStateToProps = (state, ownProps) => {
 
 const mapDispatchToProps = (dispatch) => {
 	return {
+		coreActions: bindActionCreators(coreActions, dispatch),
 		uiActions: bindActionCreators(uiActions, dispatch),
 		pusherActions: bindActionCreators(pusherActions, dispatch),
 		spotifyActions: bindActionCreators(spotifyActions, dispatch),
diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index 5b32d4ac..33686817 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -261,11 +261,11 @@ const MopidyMiddleware = (function(){
                 }
 
                 // playlist already in index
-                if (store.getState().ui.playlists.hasOwnProperty(action.uri)){
+                if (store.getState().core.playlists.hasOwnProperty(action.uri)){
                     
                     // make sure we didn't get this playlist from Mopidy-Spotify
                     // if we did, we'd have a cached version on server so no need to fetch
-                    if (!store.getState().ui.playlists[action.uri].is_mopidy){
+                    if (!store.getState().core.playlists[action.uri].is_mopidy){
                         store.dispatch(uiActions.startProcess('MOPIDY_ENQUEUE_URIS', 'Fetching tracks'))
                         store.dispatch(spotifyActions.getAllPlaylistTracks(action.uri))
                         break
@@ -410,7 +410,7 @@ const MopidyMiddleware = (function(){
             case 'MOPIDY_PLAY_URIS':
 
                 // Stop the radio
-                if (store.getState().ui.radio && store.getState().ui.radio.enabled){
+                if (store.getState().core.radio && store.getState().core.radio.enabled){
                     store.dispatch(pusherActions.stopRadio())
                 }
 
diff --git a/src/js/services/spotify/middleware.js b/src/js/services/spotify/middleware.js
index b8bd1533..16bce36a 100755
--- a/src/js/services/spotify/middleware.js
+++ b/src/js/services/spotify/middleware.js
@@ -69,7 +69,7 @@ const SpotifyMiddleware = (function(){
                 break
 
             case 'SPOTIFY_REMOVE_PLAYLIST_TRACKS':
-                var playlist = state.ui.playlists[action.key]
+                var playlist = state.core.playlists[action.key]
 
                 if( !store.getState().spotify.authorized ){
                     store.dispatch( uiActions.createNotification( "Must be logged in to Spotify to do that", 'bad' ) )
diff --git a/src/js/views/Playlist.js b/src/js/views/Playlist.js
index a876395f..e994aed7 100755
--- a/src/js/views/Playlist.js
+++ b/src/js/views/Playlist.js
@@ -16,6 +16,7 @@ import Header from '../components/Header'
 import ContextMenuTrigger from '../components/ContextMenuTrigger'
 
 import * as helpers from '../helpers'
+import * as coreActions from '../services/core/actions'
 import * as uiActions from '../services/ui/actions'
 import * as mopidyActions from '../services/mopidy/actions'
 import * as spotifyActions from '../services/spotify/actions'
@@ -96,11 +97,11 @@ class Playlist extends React.Component{
 	}
 
 	reorderTracks( indexes, index ){
-		this.props.uiActions.reorderPlaylistTracks( this.props.playlist.uri, indexes, index, this.props.playlist.snapshot_id )
+		this.props.coreActions.reorderPlaylistTracks( this.props.playlist.uri, indexes, index, this.props.playlist.snapshot_id )
 	}
 
 	removeTracks( tracks_indexes ){
-		this.props.uiActions.removeTracksFromPlaylist( this.props.playlist.uri, tracks_indexes )
+		this.props.coreActions.removeTracksFromPlaylist( this.props.playlist.uri, tracks_indexes )
 	}
 
 	inLibrary(){
@@ -223,6 +224,7 @@ const mapStateToProps = (state, ownProps) => {
 
 const mapDispatchToProps = (dispatch) => {
 	return {
+		coreActions: bindActionCreators(coreActions, dispatch),
 		uiActions: bindActionCreators(uiActions, dispatch),
 		mopidyActions: bindActionCreators(mopidyActions, dispatch),
 		spotifyActions: bindActionCreators(spotifyActions, dispatch)
diff --git a/src/js/views/discover/DiscoverCategories.js b/src/js/views/discover/DiscoverCategories.js
index c945e4b4..7075558b 100755
--- a/src/js/views/discover/DiscoverCategories.js
+++ b/src/js/views/discover/DiscoverCategories.js
@@ -60,7 +60,7 @@ class DiscoverCategories extends React.Component{
 
 const mapStateToProps = (state, ownProps) => {
 	return {
-		categories: state.ui.categories,
+		categories: state.core.categories,
 		load_queue: state.ui.load_queue
 	}
 }
diff --git a/src/js/views/discover/DiscoverCategory.js b/src/js/views/discover/DiscoverCategory.js
index db2a6988..cf5d0aaa 100755
--- a/src/js/views/discover/DiscoverCategory.js
+++ b/src/js/views/discover/DiscoverCategory.js
@@ -84,7 +84,7 @@ const mapStateToProps = (state, ownProps) => {
 	return {
 		load_queue: state.ui.load_queue,
 		playlists: state.core.playlists,
-		category: (state.ui.categories && typeof(state.ui.categories['category:'+ownProps.params.id]) !== 'undefined' ? state.ui.categories['category:'+ownProps.params.id] : false )
+		category: (state.core.categories && state.core.categories['category:'+ownProps.params.id] !== undefined ? state.core.categories['category:'+ownProps.params.id] : false )
 	}
 }
 
diff --git a/src/js/views/discover/DiscoverNewReleases.js b/src/js/views/discover/DiscoverNewReleases.js
index a10681cc..f69fc676 100755
--- a/src/js/views/discover/DiscoverNewReleases.js
+++ b/src/js/views/discover/DiscoverNewReleases.js
@@ -129,9 +129,9 @@ const mapStateToProps = (state, ownProps) => {
 	return {
 		load_queue: state.ui.load_queue,
 		albums: state.core.albums,
-		new_releases: state.ui.new_releases,
-		new_releases_more: state.ui.new_releases_more,
-		new_releases_total: state.ui.new_releases_total
+		new_releases: state.core.new_releases,
+		new_releases_more: state.core.new_releases_more,
+		new_releases_total: state.core.new_releases_total
 	}
 }
 
diff --git a/src/js/views/discover/DiscoverRecommendations.js b/src/js/views/discover/DiscoverRecommendations.js
index 5fd9cdf3..90be6055 100755
--- a/src/js/views/discover/DiscoverRecommendations.js
+++ b/src/js/views/discover/DiscoverRecommendations.js
@@ -267,7 +267,7 @@ const mapStateToProps = (state, ownProps) => {
 		albums: (state.core.albums ? state.core.albums : []),
 		artists: (state.core.artists ? state.core.artists : []),
 		tracks: (state.core.tracks ? state.core.tracks : []),
-		genres: (state.ui.genres ? state.ui.genres : []),
+		genres: (state.core.genres ? state.core.genres : []),
 		authorized: state.spotify.authorized,
 		load_queue: state.ui.load_queue,
 		quick_search_results: (state.spotify.quick_search_results ? state.spotify.quick_search_results : {artists: [], tracks: []}),
diff --git a/src/js/views/library/LibraryPlaylists.js b/src/js/views/library/LibraryPlaylists.js
index 1ad8e194..267e498f 100755
--- a/src/js/views/library/LibraryPlaylists.js
+++ b/src/js/views/library/LibraryPlaylists.js
@@ -231,10 +231,10 @@ const mapStateToProps = (state, ownProps) => {
 		slim_mode: state.ui.slim_mode,
 		load_queue: state.ui.load_queue,
 		me_id: (state.spotify.me ? state.spotify.me.id : (state.ui.config && state.ui.config.spotify_username ? state.ui.config.spotify_username : false)),
-		view: state.core.library_playlists_view,
-		filter: (state.core.library_playlists_filter ? state.core.library_playlists_filter : 'all'),
-		sort: (state.core.library_playlists_sort ? state.core.library_playlists_sort : 'name'),
-		sort_reverse: (state.core.library_playlists_sort_reverse ? true : false),
+		view: state.ui.library_playlists_view,
+		filter: (state.ui.library_playlists_filter ? state.ui.library_playlists_filter : 'all'),
+		sort: (state.ui.library_playlists_sort ? state.ui.library_playlists_sort : 'name'),
+		sort_reverse: (state.ui.library_playlists_sort_reverse ? true : false),
 		library_playlists: state.core.library_playlists,
 		playlists: state.core.playlists
 	}