Bump to 0.8.3rc3.

Disable lazily loading query's social-actions.
Bump to 0.8.3rc2.
2025-09-06 12:10:47 +02:00 · 2015-04-10 08:14:28 +02:00 · 2015-04-10 08:06:34 +02:00 · 2015-04-10 07:48:11 +02:00 · 2015-04-10 07:45:29 +02:00 · 2015-04-10 07:41:12 +02:00
2755 changed files with 227944 additions and 548822 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+src/accounts/tomahawk
 *-build/*
 build/*
 .directory
@@ -11,7 +12,6 @@ Makefile*
 moc_*
 *~
 /tomahawk
-thirdparty/qtweetlib/WARNING-twitter-api-keys
 .kdev4
 *.kdev4
 *.kate-swp
@@ -20,3 +20,5 @@ win/
 gcc/
 tags
 .DS_Store
+*.autosave
+Doxyfile
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "thirdparty/libcrashreporter-qt"]
+	path = thirdparty/libcrashreporter-qt
+	url = https://github.com/dschmidt/libcrashreporter-qt
--- a/.tx/config
+++ b/.tx/config
@@ -1,7 +1,7 @@
 [main]
-host = https://www.transifex.net
+host = https://www.transifex.com

-[tomahawk.tomahawk-master]
+[tomahawk.tomahawk-stable08]
 file_filter = lang/tomahawk_<lang>.ts
 source_file = lang/tomahawk_en.ts
 source_lang = en
--- a/16
+++ b/16
@@ -4,13 +4,19 @@ Tomahawk is primarily authored by:

 Contributors include:

-* Leo Franchi <lfranchi@kde.org>
-* Dominik Schmidt <dev@dominik-schmidt.de>
-* Jeff Mitchell <mitchell@kde.org>
-* J Herskowitz <jherskow@gmail.com>
+* Leo Franchi <lfranchi@tomahawk-player.org>
+* Dominik Schmidt <domme@tomahawk-player.org>
+* Jeff Mitchell <jeff@tomahawk-player.org>
+* J Herskowitz <j@tomahawk-player.org>
 * Alejandro Wainzinger <aikawarazuni@gmail.com>
+* Hugo Lindström <hugo@tomahawk-player.org>
+* Teo Mrnjavac <teo@kde.org>
+* Michael Zanetti <dreadhead@follefuder.org>
+* Christopher Reichert <christopher@tomahawk-player.org>
+* Uwe L. Korn <uwelk@xhochy.com>
+* Patrick von Reth <vonreth@kde.org>

 Thanks to:

 * Harald Sitter <sitter@kde.org>
-* Steve Robertson
+* Syd Lawrence <syd@tomahawk-player.org>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,16 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8.6 )
 SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
 CMAKE_POLICY(SET CMP0017 NEW)

+IF ( CMAKE_VERSION VERSION_EQUAL 2.8.12 OR CMAKE_VERSION VERSION_GREATER 2.8.12 )
+CMAKE_POLICY(SET CMP0022 NEW)
+
+# TODO:
+# Update to NEW and fix things up when we can depend on 2.8.12
+CMAKE_POLICY(SET CMP0023 OLD)
+ENDIF()
+
+INCLUDE(CMakeDependentOption)
+
 ###
 ### Tomahawk application info
 ###
@@ -10,68 +20,104 @@ SET( TOMAHAWK_ORGANIZATION_NAME "Tomahawk" )
 SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" )
 SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
+IF(APPLE)
+    SET( TOMAHAWK_TARGET_NAME "Tomahawk" )
+ELSE()
+    SET( TOMAHAWK_TARGET_NAME "tomahawk" )
+ENDIF()
+
+IF( WIN32 )
+    SET( TOMAHAWK_SYSTEM "Windows" )
+ELSEIF( APPLE )
+    SET( TOMAHAWK_SYSTEM "OS X" )
+ELSEIF( UNIX )
+    SET( TOMAHAWK_SYSTEM "Linux")
+ELSE()
+    SET( TOMAHAWK_SYSTEM "Uknown Platform, please let the Tomahawk team know, this actually happened" )
+ENDIF()

 SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 5 )
-SET( TOMAHAWK_VERSION_PATCH 99 )
+SET( TOMAHAWK_VERSION_MINOR 8 )
+SET( TOMAHAWK_VERSION_PATCH 3 )
+SET( TOMAHAWK_VERSION_RC 3 )

-#SET( TOMAHAWK_VERSION_RC 0 )
+SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs da de en el es fi fr hi_IN hu gl id it ja lt nl pl pt_BR ro ru sq sv th tr uk vi zh_CN zh_TW )

-SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg ca de en es fi fr ja pl pt_BR ru sv tr zh_CN zh_TW )
+# add_definitions is only in the scope of this directory and all directories
+# below it. Tomahawk Libraries and plugins that are built with Tomahawk are
+# not included in out-of-source build so we need to re-add_definitions there.
+macro(tomahawk_add_definitions DEFINITION)
+    add_definitions( ${DEFINITION} )
+    list(APPEND TOMAHAWK_DEFINITIONS ${DEFINITION})
+endmacro()

 # enforce proper symbol exporting on all platforms
-add_definitions( "-fvisibility=hidden" )
+tomahawk_add_definitions( "-fvisibility=hidden" )
 # enforce using constBegin, constEnd for const-iterators
-add_definitions( "-DQT_STRICT_ITERATORS" )
+tomahawk_add_definitions( "-DQT_STRICT_ITERATORS" )

 # build options
-option(BUILD_GUI "Build Tomahawk with GUI" ON)
 option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
-option(WITH_BREAKPAD "Build with breakpad integration" ON)
+if(BUILD_RELEASE)
+    set(BUILD_NO_RELEASE OFF)
+else()
+    set(BUILD_NO_RELEASE ON)
+endif()
+
+option(BUILD_GUI "Build Tomahawk with GUI" ON)
+option(BUILD_TESTS "Build Tomahawk with unit tests" ${BUILD_NO_RELEASE})
+option(BUILD_TOOLS "Build Tomahawk helper tools" ${BUILD_NO_RELEASE})
+option(BUILD_HATCHET "Build the Hatchet plugin" ON)
+option(BUILD_WITH_QT4 "Build Tomahawk with Qt4 no matter if Qt5 was found" ON)
+
 option(WITH_CRASHREPORTER "Build with CrashReporter" ON)
 option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON)
 option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
+option(WITH_KDE4 "Build with support for KDE specific stuff" ON)

-IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )
-    message(STATUS "Build of breakpad library disabled on this platform.")
-    SET(WITH_BREAKPAD OFF)
+# build options for development purposes
+option(SANITIZE_ADDRESS "Enable Address Sanitizer for memory error detection" OFF)
+option(TOMAHAWK_FINEGRAINED_MESSAGES "Enable even more verbose logging (will hurt performance significantly" OFF)
+
+CMAKE_DEPENDENT_OPTION(WITH_UPOWER "Build with support for UPower events" ON
+       "UNIX;NOT APPLE" OFF)
+CMAKE_DEPENDENT_OPTION(WITH_GNOMESHORTCUTHANDLER "Build with shortcut handler for GNOME" ON
+       "UNIX;NOT APPLE" OFF)
+
+IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libcrashreporter-qt/CMakeLists.txt")
+    message(STATUS "Build of crashreporter disabled.")
    SET(WITH_CRASHREPORTER OFF)
 ENDIF()

-# add definitions based on build options
-IF( WITH_BREAKPAD )
-    message(STATUS "Build with support for breakpad.")
-    IF( CMAKE_COMPILER_IS_GNUCXX )
-        ADD_DEFINITIONS( -DSTDC_HEADERS -std=gnu++98 )
-#        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTDC_HEADERS -std=gnu++98" )
-    ENDIF()
-ENDIF()
-
 # generate version string

 # base string used in release and unstable builds
-SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} )
+SET( TOMAHAWK_VERSION_TMP "${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH}")
+SET( TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION_TMP}" )
 IF( TOMAHAWK_VERSION_RC )
-  SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}rc${TOMAHAWK_VERSION_RC} )
+  SET( TOMAHAWK_VERSION_TMP "${TOMAHAWK_VERSION_TMP}rc${TOMAHAWK_VERSION_RC}")
 ENDIF()

 # additional info for non-release builds
 IF( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" )
    INCLUDE( CMakeDateStamp )
    SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" )
-    IF( TOMAHAWK_VERSION_DATE GREATER 0)
-        SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} )
+    IF( TOMAHAWK_VERSION_DATE GREATER 0 )
+        SET( TOMAHAWK_VERSION_TMP ${TOMAHAWK_VERSION_TMP}.${TOMAHAWK_VERSION_DATE} )
    ENDIF()

    INCLUDE( CMakeVersionSource )
    IF( CMAKE_VERSION_SOURCE )
-        SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} )
+        SET( TOMAHAWK_VERSION_TMP ${TOMAHAWK_VERSION_TMP}-${CMAKE_VERSION_SOURCE} )
    ENDIF()
 ENDIF()

+# write Tomahawk version to cache
+SET(TOMAHAWK_VERSION "${TOMAHAWK_VERSION_TMP}" CACHE STRING "Tomahawk Version")
+

 # set paths
-SET( THIRDPARTY_DIR  ${CMAKE_SOURCE_DIR}/thirdparty )
+SET( THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty" )
 SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
@@ -82,72 +128,242 @@ INCLUDE( GNUInstallDirs )
 # installer creation
 INCLUDE( TomahawkCPack.cmake )

-#deps
+# deps
 INCLUDE( MacroOptionalFindPackage )
 INCLUDE( MacroLogFeature )

-# Check if we need qtgui:
-SET(NEEDED_QT4_COMPONENTS QtCore QtXml QtNetwork )
-IF( NOT BUILD_GUI )
-    ADD_DEFINITIONS( -DENABLE_HEADLESS )
-    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
-ELSE()
-    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
-    LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" )
-ENDIF()
+message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} ***" )

-IF( BUILD_GUI AND UNIX AND NOT APPLE )
-    FIND_PACKAGE( X11 )
-ENDIF()
+if( NOT BUILD_WITH_QT4 )
+    find_package(Qt5Core QUIET)
+    if( Qt5Core_DIR )
+        # CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets
+        find_package(Qt5Concurrent REQUIRED)
+        find_package(Qt5Svg REQUIRED)
+        find_package(Qt5UiTools REQUIRED)
+        find_package(Qt5WebKitWidgets REQUIRED)
+        find_package(Qt5Widgets REQUIRED)
+        find_package(Qt5Xml REQUIRED)
+        message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!")

-macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
-macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
+        if( UNIX AND NOT APPLE )
+            # We need this to find the paths to qdbusxml2cpp and co
+            find_package(Qt5DBus REQUIRED)
+        endif()

-macro_optional_find_package(Phonon 4.5.0)
-macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
-if(PHONON_FOUND)
-    message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
+        if(WIN32)
+            find_package(Qt5WinExtras REQUIRED)
+        endif()
+
+        macro(qt_wrap_ui)
+            qt5_wrap_ui(${ARGN})
+        endmacro()
+
+        macro(qt_add_resources)
+            qt5_add_resources(${ARGN})
+        endmacro()
+
+        find_package(Qt5LinguistTools REQUIRED)
+        macro(qt_add_translation)
+            qt5_add_translation(${ARGN})
+        endmacro()
+
+        macro(qt_add_dbus_interface)
+            qt5_add_dbus_interface(${ARGN})
+        endmacro()
+
+        macro(qt_add_dbus_adaptor)
+            qt5_add_dbus_adaptor(${ARGN})
+        endmacro()
+
+        macro(setup_qt)
+        endmacro()
+
+        set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
+        #FIXME: CrashReporter depends on deprecated QHttp
+        set(WITH_KDE4 OFF)
+    endif()
+endif()
+if( NOT Qt5Core_DIR )
+    message(STATUS "Could not find Qt5, searching for Qt4 instead...")
+
+    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
+    if( BUILD_GUI )
+        list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
+    endif()
+    if( BUILD_TESTS )
+        list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
+    endif()
+
+    macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
+    macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt-project.org" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
+
+    macro(qt5_use_modules)
+    endmacro()
+
+    macro(qt_wrap_ui)
+        qt4_wrap_ui(${ARGN})
+    endmacro()
+
+    macro(qt_add_resources)
+        qt4_add_resources(${ARGN})
+    endmacro()
+
+    macro(qt_add_translation)
+        qt4_add_translation(${ARGN})
+    endmacro()
+
+    macro(qt_add_dbus_interface)
+      qt4_add_dbus_interface(${ARGN})
+    endmacro()
+
+    macro(qt_add_dbus_adaptor)
+        qt4_add_dbus_adaptor(${ARGN})
+    endmacro()
+
+    macro(setup_qt)
+        if( NOT BUILD_GUI )
+            set(QT_DONT_USE_QTGUI TRUE)
+        endif()
+        if( UNIX AND NOT APPLE )
+            set(QT_USE_QTDBUS TRUE)
+        endif()
+        set(QT_USE_QTSQL TRUE)
+        set(QT_USE_QTNETWORK TRUE)
+        set(QT_USE_QTXML TRUE)
+        set(QT_USE_QTWEBKIT TRUE)
+
+        include( ${QT_USE_FILE} )
+    endmacro()
+
+    # Qt5 C++11 Macros not defined within Qt4
+    # TODO: Add C++11 support
+    tomahawk_add_definitions( "-DQ_DECL_FINAL=" )
+    tomahawk_add_definitions( "-DQ_DECL_OVERRIDE=" )
 endif()

-macro_optional_find_package(Echonest 2.0.0)
-macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.0.0 is needed for dynamic playlists and the infosystem")
+if( Qt5Core_DIR )
+    set( TOMAHAWK_QT5 TRUE )
+else( Qt5Core_DIR )
+    set( TOMAHAWK_QT5 FALSE )
+endif( Qt5Core_DIR )

-macro_optional_find_package(CLucene 0.9.23)
-macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
+if( BUILD_GUI AND UNIX AND NOT APPLE )
+    macro_optional_find_package( X11 )
+    macro_log_feature(X11_FOUND "X11" "The Xorg libraries" "http://www.x.org/wiki/" TRUE "" "Xorg libraries are used by libqnetwm to bring windows to front reliably")
+endif()

-macro_optional_find_package(QJSON)
-macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVariant objects" "http://qjson.sf.net" TRUE "" "libqjson is used for encoding communication between Tomahawk instances")
+# Check if we can use <functional> or need <tr1/functional>
+include( CheckStdFunctional )
+check_std_functional( CXX_STD_FUNCTIONAL )
+include( CheckStdTr1Functional )
+check_std_tr1_functional( CXX_STD_TR1_FUNCTIONAL )
+if ( NOT CXX_STD_FUNCTIONAL AND NOT CXX_STD_TR1_FUNCTIONAL )
+    message( FATAL_ERROR
+        "Used compiler neither provides std::function nor std::tr1::function")
+endif()

-macro_optional_find_package(Taglib 1.6.0)
+macro_optional_find_package(Echonest 2.2.0)
+macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.2.0 is needed for dynamic playlists and the infosystem")
+
+find_package(Boost REQUIRED COMPONENTS system)
+macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explanation
+
+macro_optional_find_package(Lucene++ 3.0.0)
+macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection")
+
+if( NOT TOMAHAWK_QT5 )
+    macro_optional_find_package(QJSON 0.8.1)
+    macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVariant objects" "http://qjson.sf.net" TRUE "" "libqjson is used for encoding communication between Tomahawk instances")
+ENDIF()
+
+macro_optional_find_package(Taglib 1.8.0)
 macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
 include( CheckTagLibFileName )
 check_taglib_filename( COMPLEX_TAGLIB_FILENAME )

-macro_optional_find_package(Boost)
-macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination
+macro_optional_find_package(Sparsehash)
+macro_log_feature(SPARSEHASH_FOUND "Sparsehash"
+    "An extremely memory-efficient hash_map implementation."
+    "https://code.google.com/p/sparsehash/" TRUE ""
+    "Sparsehash is needed for reading metadata of mediastreams and fast
+    forward/backward seeking in HTTP streams")
+
+macro_optional_find_package(GnuTLS)
+macro_log_feature(GNUTLS_FOUND "GnuTLS"
+    "GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them."
+    "http://gnutls.org/" TRUE ""
+    "GnuTLS is needed for serving the Playdar/HTTP API via TLS")

 macro_optional_find_package(QCA2)
-macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions required for Grooveshark resolver" "http://delta.affinix.com/qca/" TRUE "" "")
+macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions necessary for some resolvers and accounts" "http://delta.affinix.com/qca/" TRUE "" "")

-macro_optional_find_package(LibAttica 0.4.0)
-macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for installation of resolvers from the Tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" TRUE "" "")
+if( TOMAHAWK_QT5 )
+    macro_optional_find_package(KF5Attica 1.0.0)
+    set(LIBATTICA_FOUND ${KF5Attica_FOUND})
+else()
+    macro_optional_find_package(LibAttica 0.4.0)
+endif()
+macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for installation of resolvers from the Tomahawk website" "http://download.kde.org/stable/attica/" TRUE "" "")

 macro_optional_find_package(QuaZip)
 macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" TRUE "" "")

 macro_optional_find_package(Jreen 1.0.5)
 macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP Library" "http://qutim.org/jreen / https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
-
-macro_optional_find_package(QTweetLib)
-macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin.\n")
+if( PC_JREEN_VERSION STREQUAL "1.1.0" )
+    message(FATAL_ERROR "Jreen 1.1.0 has a very annoying bug that breaks accepting auth requests in Tomahawk. Please upgrade to 1.1.1 or downgrade to 1.0.5.")
+endif()

 macro_optional_find_package(LibLastFm 1.0.0)
-macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/eartle/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
+macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/lastfm/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")

-IF( WIN32 )
+if( NOT APPLE )
+if( TOMAHAWK_QT5 )
+    macro_optional_find_package(Qt5Keychain 0.1.0)
+else()
+    macro_optional_find_package(QtKeychain 0.1.0)
+endif()
+macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
+endif()
+
+if( UNIX AND NOT APPLE )
+    macro_optional_find_package(TelepathyQt 0.9.3)
+    if ( TOMAHAWK_QT5 )
+        macro_log_feature(TelepathyQt5_FOUND "Telepathy-Qt" "Telepathy-Qt is a Qt high-level binding for Telepathy, a D-Bus framework for unifying real time communication." FALSE "" "Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy.\n")
+    else ( TOMAHAWK_QT5)
+        macro_log_feature(TelepathyQt4_FOUND "Telepathy-Qt" "Telepathy-Qt is a Qt high-level binding for Telepathy, a D-Bus framework for unifying real time communication." FALSE "" "Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy.\n")
+    endif()
+endif()
+
+# we need pthreads too
+macro_optional_find_package(Threads)
+macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
+
+### QtSparkle
+if( WIN32 )
    macro_optional_find_package(QtSparkle)
    macro_log_feature(QTSPARKLE_FOUND "qtsparkle" "Library for creating auto updaters written in Qt" "https://github.com/davidsansome/qtsparkle" FALSE "" "")
-ENDIF( WIN32 )
+endif( WIN32 )
+
+if( WIN32 OR APPLE )
+if( TOMAHAWK_QT5 )
+    macro_optional_find_package(LibsnoreQt5 QUIET)
+else()
+    macro_optional_find_package(Libsnore QUIET)
+endif()
+    macro_log_feature(LIBSNORE_FOUND "Libsnore" "Library for notifications" "https://github.com/TheOneRing/Snorenotify" FALSE "" "")
+endif()
+
+set(QXTWEB_FOUND TRUE)
+set(QXTWEB_LIBRARIES qxtweb-standalone)
+set(QXTWEB_INCLUDE_DIRS ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/web ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/network ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/core ${CMAKE_CURRENT_BINARY_DIR})
+
+### libportfwd
+set(LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include)
+set(LIBPORTFWD_LIBRARY tomahawk_portfwd)
+set(LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY})
+add_subdirectory(${THIRDPARTY_DIR}/libportfwd)

 #### submodules start
 # automatically init submodules here, don't delete this code we may add submodules again
@@ -163,24 +379,23 @@ ENDIF( WIN32 )

 #### submodules end

-### libportfwd
-SET( LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include )
-SET( LIBPORTFWD_LIBRARY tomahawk_portfwd )
-SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
-ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )

-# we need pthreads too
-macro_optional_find_package(Threads)
-macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
+if (WITH_KDE4)
+    macro_optional_find_package(KDE4)
+    macro_optional_find_package(KDE4Installed)
+endif(WITH_KDE4)
+macro_log_feature(KDE4_FOUND "KDE4" "Provides support for configuring Telepathy Accounts from inside Tomahawk" "https://www.kde.org" FALSE "" "")

-macro_optional_find_package(KDE4)
-macro_optional_find_package(KDE4Installed)
+if(NOT Phonon_FOUND)
+  macro_optional_find_package(Phonon 4.5.0)
+endif()
+macro_log_feature(Phonon_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")

-# this was used before we had FindKDE4Installed, just leaving it here to keep the flags
-# for future kde integration
+if(Phonon_FOUND)
+    message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
+endif()

-# macro_optional_find_package(KDE4)
-IF(KDE4_FOUND)
+IF( KDE4_FOUND OR Phonon_FOUND )
    IF( CMAKE_C_FLAGS )
        # KDE4 adds and removes some compiler flags that we don't like
        # (only for gcc not for clang e.g.)
@@ -202,19 +417,78 @@ CONFIGURE_FILE(
  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
  IMMEDIATE @ONLY)

-# KDE4 defines an uninstall target for us automatically
-IF( NOT KDE4_FOUND )
-    ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+# KDE4 defines an uninstall target for us automatically (and at least with Qt4 Phonon does as well no matter if kdelibs was found)
+# IF( NOT KDE4_FOUND )
+#     ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+# ENDIF()
+
+IF( ( NOT APPLE ) AND ( NOT SANITIZE_ADDRESS ))
+    # Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often
+    #
+    # On using Address Sanitizer, we cannot link to the ASAN lib, so
+    # --no-undefined would break the build.
+    SET( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+    SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined" )
 ENDIF()

-IF( NOT APPLE )
-    # Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often
-    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
-ENDIF( NOT APPLE )
+IF ( SANITIZE_ADDRESS )
+    SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS}   -fsanitize=address -fno-omit-frame-pointer")
+    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}   -fsanitize=address -fno-omit-frame-pointer")
+ENDIF()
+
+# Early configure these files as we need them later on
+configure_file(TomahawkUse.cmake.in "${PROJECT_BINARY_DIR}/TomahawkUse.cmake" @ONLY)
+file(COPY TomahawkAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}")
+file(COPY TomahawkAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}")

 SET( TOMAHAWK_LIBRARIES tomahawklib )
+SET( TOMAHAWK_WIDGETS_LIBRARIES tomahawk-widgets )
+SET( TOMAHAWK_PLAYDARAPI_LIBRARIES tomahawk-playdarapi )

 ADD_SUBDIRECTORY( thirdparty )
 ADD_SUBDIRECTORY( src )
-ADD_SUBDIRECTORY( src/libtomahawk )
 ADD_SUBDIRECTORY( admin )
+
+IF(BUILD_TESTS)
+  enable_testing()
+  ADD_SUBDIRECTORY( src/tests )
+ENDIF()
+
+# Add all targets to the build-tree export set
+set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Tomahawk" CACHE PATH  "Installation directory for CMake files")
+set(CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}")
+export(TARGETS tomahawklib
+  FILE "${PROJECT_BINARY_DIR}/TomahawkLibraryDepends.cmake")
+
+# Export the package for use from the build-tree
+# (this registers the build-tree with a global CMake-registry)
+export(PACKAGE Tomahawk)
+
+# Create a TomahawkBuildTreeSettings.cmake file for the use from the build tree
+configure_file(TomahawkBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/TomahawkBuildTreeSettings.cmake" @ONLY)
+
+# Create the TomahawkConfig.cmake and TomahawkConfigVersion files
+file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+
+configure_file(TomahawkConfig.cmake.in "${PROJECT_BINARY_DIR}/TomahawkConfig.cmake" @ONLY)
+configure_file(TomahawkConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/TomahawkConfigVersion.cmake" @ONLY)
+
+# Install the cmake files
+install(
+    FILES
+        "${PROJECT_BINARY_DIR}/TomahawkConfig.cmake"
+        "${PROJECT_BINARY_DIR}/TomahawkConfigVersion.cmake"
+        "${PROJECT_BINARY_DIR}/TomahawkUse.cmake"
+        "${PROJECT_BINARY_DIR}/TomahawkAddPlugin.cmake"
+        "${PROJECT_BINARY_DIR}/TomahawkAddLibrary.cmake"
+    DESTINATION
+        "${CMAKE_INSTALL_CMAKEDIR}"
+)
+
+# Install the export set for use with the install-tree
+install(
+    EXPORT
+        TomahawkLibraryDepends
+    DESTINATION
+        "${CMAKE_INSTALL_CMAKEDIR}"
+)
--- a/CMakeModules/AddAppIconMacro.cmake
+++ b/CMakeModules/AddAppIconMacro.cmake
@@ -12,8 +12,8 @@ SET(WINDRES_EXECUTABLE  ${CMAKE_RC_COMPILER})

 # adds application icon to target source list 
 # for detailed documentation see the top of FindKDE4Internal.cmake
-macro (KDE4_ADD_APP_ICON appsources pattern)
-    set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appsources})
+macro (TOMAHAWK_ADD_APP_ICON appsources outfilename pattern)
+    set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${outfilename})

    if (WIN32)
        if(NOT WINCE)
@@ -86,9 +86,9 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
            if (_icon)
                
                # first, get the basename of our app icon
-                add_custom_command(OUTPUT ${_outfilename}.icns ${outfilename}.tiff
-                                   COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${outfilename}.tiff
-                                   COMMAND ${TIFF2ICNS_EXECUTABLE} ${outfilename}.tiff ${_outfilename}.icns
+                add_custom_command(OUTPUT ${_outfilename}.icns ${_outfilename}.tiff
+                                   COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${_outfilename}.tiff
+                                   COMMAND ${TIFF2ICNS_EXECUTABLE} ${_outfilename}.tiff ${_outfilename}.icns
                                   DEPENDS ${_icon}
                                   )

@@ -111,4 +111,4 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
            message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!")
        endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
    endif(Q_WS_MAC)
-endmacro (KDE4_ADD_APP_ICON)
+endmacro (TOMAHAWK_ADD_APP_ICON)
--- a/CMakeModules/AddTomahawkPlugin.cmake
+++ b/CMakeModules/AddTomahawkPlugin.cmake
@@ -1,99 +0,0 @@
-MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
-  SET(DEFAULT_ARGS)
-  FOREACH(arg_name ${arg_names})
-    SET(${prefix}_${arg_name})
-  ENDFOREACH(arg_name)
-  FOREACH(option ${option_names})
-    SET(${prefix}_${option} FALSE)
-  ENDFOREACH(option)
-
-  SET(current_arg_name DEFAULT_ARGS)
-  SET(current_arg_list)
-  FOREACH(arg ${ARGN})
-    SET(larg_names ${arg_names})
-    LIST(FIND larg_names "${arg}" is_arg_name)
-    IF (is_arg_name GREATER -1)
-      SET(${prefix}_${current_arg_name} ${current_arg_list})
-      SET(current_arg_name ${arg})
-      SET(current_arg_list)
-    ELSE (is_arg_name GREATER -1)
-      SET(loption_names ${option_names})
-      LIST(FIND loption_names "${arg}" is_option)
-      IF (is_option GREATER -1)
-         SET(${prefix}_${arg} TRUE)
-      ELSE (is_option GREATER -1)
-         SET(current_arg_list ${current_arg_list} ${arg})
-      ENDIF (is_option GREATER -1)
-    ENDIF (is_arg_name GREATER -1)
-  ENDFOREACH(arg)
-  SET(${prefix}_${current_arg_name} ${current_arg_list})
-ENDMACRO(PARSE_ARGUMENTS)
-
-MACRO(CAR var)
-  SET(${var} ${ARGV1})
-ENDMACRO(CAR)
-
-MACRO(CDR var junk)
-  SET(${var} ${ARGN})
-ENDMACRO(CDR)
-
-
-macro(add_tomahawk_plugin)
-    parse_arguments(PLUGIN
-        "SOURCES;UI;LINK_LIBRARIES;TYPE;EXPORT_MACRO;COMPILE_DEFINITIONS"
-        "NO_INSTALL"
-        ${ARGN}
-        )
-    car(PLUGIN_NAME ${PLUGIN_DEFAULT_ARGS})
-
-#     message("*** Arguments for ${PLUGIN_NAME}")
-#     message("Sources: ${PLUGIN_SOURCES}")
-#     message("Link libraries: ${PLUGIN_LINK_LIBRARIES}")
-#     message("UI: ${PLUGIN_UI}")
-#     message("TYPE: ${PLUGIN_TYPE}")
-#     message("EXPORT_MACRO: ${PLUGIN_EXPORT_MACRO}")
-
-    # create target name once for convenience
-    set(target "tomahawk_${PLUGIN_TYPE}_${PLUGIN_NAME}")
-
-    # qt stuff
-    include_directories(${CMAKE_CURRENT_BINARY_DIR})
-    if(PLUGIN_UI)
-        qt4_wrap_ui(PLUGIN_UI_SOURCES ${PLUGIN_UI})
-        list(APPEND PLUGIN_SOURCES ${PLUGIN_UI_SOURCES})
-    endif()
-
-    if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc")
-        qt4_add_resources(PLUGIN_RC_SOURCES "resources.qrc")
-        list(APPEND PLUGIN_SOURCES ${PLUGIN_RC_SOURCES})
-        unset(PLUGIN_RC_SOURCES)
-    endif()
-
-    # add target
-    add_library(${target} MODULE ${PLUGIN_SOURCES})
-
-    # definitions - can this be moved into set_target_properties below?
-    add_definitions(${QT_DEFINITIONS})
-    set_target_properties(${target} PROPERTIES AUTOMOC TRUE COMPILE_DEFINITIONS ${PLUGIN_EXPORT_MACRO})
-    if(PLUGIN_COMPILE_DEFINITIONS)
-        # Dear CMake, i hate you! Sincerely, domme
-        # At least in CMake 2.8.8, you CANNOT set more than one COMPILE_DEFINITIONS value
-        # only takes the first one if called multiple times or bails out with wrong number of arguments
-        # when passing in a list, thus i redefine the export macro here in hope it won't mess up other targets
-        add_definitions( "-D${PLUGIN_EXPORT_MACRO}" )
-
-        set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${PLUGIN_COMPILE_DEFINITIONS})
-    endif()
-
-    # add link targets
-    target_link_libraries(${target} tomahawklib)
-    if(PLUGIN_LINK_LIBRARIES)
-        target_link_libraries(${target} ${PLUGIN_LINK_LIBRARIES})
-    endif()
-
-    # make installation optional, maybe useful for dummy plugins one day
-    if(NOT PLUGIN_NO_INSTALL)
-        include(GNUInstallDirs)
-        install(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-    endif()
-endmacro()
--- a/CMakeModules/CheckStdFunctional.cmake
+++ b/CMakeModules/CheckStdFunctional.cmake
@@ -0,0 +1,12 @@
+macro (CHECK_STD_FUNCTIONAL CXX_STD_FUNCTIONAL)
+	include (CheckCXXSourceCompiles)
+	check_cxx_source_compiles(
+	"
+    #include <functional>
+    using std::function;
+    int main()
+    {
+    return 0;
+    }" ${CXX_STD_FUNCTIONAL})
+endmacro()
+
--- a/CMakeModules/CheckStdTr1Functional.cmake
+++ b/CMakeModules/CheckStdTr1Functional.cmake
@@ -0,0 +1,12 @@
+macro (CHECK_STD_TR1_FUNCTIONAL CXX_STD_TR1_FUNCTIONAL)
+	include (CheckCXXSourceCompiles)
+	check_cxx_source_compiles(
+	"
+    #include <tr1/functional>
+    using std::tr1::function;
+    int main()
+    {
+    return 0;
+    }" ${CXX_STD_TR1_FUNCTIONAL})
+endmacro()
+
--- a/CMakeModules/FindCLucene.cmake
+++ b/CMakeModules/FindCLucene.cmake
@@ -1,132 +0,0 @@
-#
-# This module looks for clucene (http://clucene.sf.net) support
-# It will define the following values
-#
-# CLUCENE_INCLUDE_DIRS = CLUCENE_INCLUDE_DIR + CLUCENE_LIBRARY_DIR
-# CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
-# CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
-# CLUCENE_LIBRARIES    = the libraries to link against CLucene
-# CLUCENE_VERSION      = The CLucene version string
-# CLucene_FOUND        = set to 1 if clucene is found
-#
-
-INCLUDE(CheckSymbolExists)
-INCLUDE(FindLibraryWithDebug)
-
-# try to locate a patched unstable version (for comp's sake *sigh*) first
-FIND_PACKAGE(CLuceneUnstable QUIET)
-IF(CLUCENEUNSTABLE_FOUND)
-    SET(CLucene_FOUND TRUE)
-    SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS})
-    SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_INCLUDE_DIR})
-    SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})
-
-    #MESSAGE(FATAL_ERROR NARF)
-ELSE(CLUCENEUNSTABLE_FOUND)
-IF(CLucene_FIND_VERSION)
-  SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
-ELSEIF()
-  SET(CLUCENE_MIN_VERSION "0.9.23")
-ENDIF(CLucene_FIND_VERSION)
-
-IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
-  INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
-ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
-
-SET(TRIAL_LIBRARY_PATHS
-  $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
-  ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-  /usr/local/lib${LIB_SUFFIX}
-  /usr/lib${LIB_SUFFIX}
-  /sw/lib${LIB_SUFFIX}
-  /usr/pkg/lib${LIB_SUFFIX}
-  /usr/lib64
-  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-  )
-SET(TRIAL_INCLUDE_PATHS
-  $ENV{CLUCENE_HOME}/include
-  ${CMAKE_INSTALL_PREFIX}/include
-  /usr/local/include
-  /usr/include
-  /sw/include
-  /usr/pkg/include
-  )
-FIND_LIBRARY_WITH_DEBUG(CLUCENE_CORE_LIBRARY
-  WIN32_DEBUG_POSTFIX d
-  NAMES clucene-core
-  PATHS ${TRIAL_LIBRARY_PATHS})
-IF (CLUCENE_CORE_LIBRARY)
-  MESSAGE(STATUS "Found CLucene core library: ${CLUCENE_CORE_LIBRARY}")
-ENDIF (CLUCENE_CORE_LIBRARY)
-FIND_LIBRARY_WITH_DEBUG(CLUCENE_SHARED_LIBRARY
-  WIN32_DEBUG_POSTFIX d
-  NAMES clucene-shared
-  PATHS ${TRIAL_LIBRARY_PATHS})
-IF (CLUCENE_SHARED_LIBRARY)
-  MESSAGE(STATUS "Found CLucene shared library: ${CLUCENE_SHARED_LIBRARY}")
-ENDIF (CLUCENE_SHARED_LIBRARY)
-
-IF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
-  SET(CLUCENE_LIBRARIES ${CLUCENE_CORE_LIBRARY} ${CLUCENE_SHARED_LIBRARY})
-ENDIF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
-
-FIND_PATH(CLUCENE_INCLUDE_DIR
-  NAMES CLucene.h
-  PATHS ${TRIAL_INCLUDE_PATHS})
-
-IF (CLUCENE_INCLUDE_DIR)
-  MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}")
-ENDIF (CLUCENE_INCLUDE_DIR)
-
-IF(WIN32)
-  SET(TRIAL_LIBRARY_PATHS ${CLUCENE_INCLUDE_DIR})
-ENDIF(WIN32)
-
-SET(CLUCENE_GOOD_VERSION TRUE)
-
-FIND_PATH(CLUCENE_LIBRARY_DIR
-	NAMES CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
-       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
-IF (CLUCENE_LIBRARY_DIR)
-  MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
-  # include CLuceneConfig/CLuceneConfig.cmake
-  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-  # include CLucene/CLuceneConfig.cmake
-  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
-        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
-  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
-  IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-    MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
-    SET(CLUCENE_GOOD_VERSION FALSE)
-  ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-  IF (CLUCENE_VERSION STREQUAL "0.9.17")
-    MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
-    SET(CLUCENE_GOOD_VERSION FALSE)
-  ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
-ENDIF (CLUCENE_LIBRARY_DIR)
-
-IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
-  SET(CLucene_FOUND TRUE)
-  SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_LIBRARY_DIR} ${CLUCENE_INCLUDE_DIR})
-ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
-
-ENDIF(CLUCENEUNSTABLE_FOUND)
-
-IF(CLucene_FOUND)
-  IF(NOT CLucene_FIND_QUIETLY)
-    MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCENE_VERSION}")
-  ENDIF(NOT CLucene_FIND_QUIETLY)
-ELSE(CLucene_FOUND)
-  IF(CLucene_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find CLucene.")
-  ENDIF(CLucene_FIND_REQUIRED)
-ENDIF(CLucene_FOUND)
-
-MARK_AS_ADVANCED(
-  CLUCENE_INCLUDE_DIRS
-  CLUCENE_INCLUDE_DIR
-  CLUCENE_LIBRARY_DIR
-  CLUCENE_LIBRARIES
-  )
--- a/CMakeModules/FindCLuceneUnstable.cmake
+++ b/CMakeModules/FindCLuceneUnstable.cmake
@@ -1,37 +0,0 @@
-# - Try to find clucene-unstable
-#  This is a workaround for distros, that want to ship a recent enough clucene but don't want to replace the old version
-#
-#  CLUCENEUNSTABLE_FOUND - system has clucene-unstable
-#  CLUCENE_UNSTABLE_INCLUDE_DIR - the clucene-unstable include directories
-#  CLUCENE_UNSTABLE_LIBS - link these to use clucene-unstable
-#
-# (c) Dominik Schmidt <dev@dominik-schmidt.de>
-#
-
-# Include dir
-find_path(CLUCENE_UNSTABLE_INCLUDE_DIR
-  NAMES CLucene.h
-  PATH_SUFFIXES clucene-unstable
-  PATHS ${KDE4_INCLUDE_DIR}
-)
-
-# Finally the library itself
-find_library(CLUCENE_UNSTABLE_SHARED_LIB
-  NAMES clucene-unstable-shared
-  PATHS ${KDE4_LIB_DIR}
-)
-
-find_library(CLUCENE_UNSTABLE_CORE_LIB
-  NAMES clucene-unstable-core
-  PATHS ${KDE4_LIB_DIR}
-)
-
-
-SET( CLUCENE_UNSTABLE_LIBS  ${CLUCENE_UNSTABLE_SHARED_LIB} ${CLUCENE_UNSTABLE_CORE_LIB} )
-SET( CLUCENE_UNSTABLE_INCLUDE_DIRS ${CLUCENE_UNSTABLE_INCLUDE_DIR})
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CLuceneUnstable DEFAULT_MSG CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
-
-
-MARK_AS_ADVANCED(CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
-
--- a/CMakeModules/FindEchonest.cmake
+++ b/CMakeModules/FindEchonest.cmake
@@ -6,7 +6,12 @@
 # ECHONEST_FOUND, whether libechonest was found

 FIND_PACKAGE(PkgConfig QUIET)
-PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest)
+
+if( TOMAHAWK_QT5 )
+    set(LIBECHONEST_SUFFIX "5")
+endif()
+
+PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX})

 FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
    HINTS
@@ -16,7 +21,7 @@ FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
        ${KDE4_INCLUDE_DIR}
 )

-FIND_LIBRARY(ECHONEST_LIBRARIES NAMES echonest
+FIND_LIBRARY(ECHONEST_LIBRARIES NAMES echonest${LIBECHONEST_SUFFIX}
    HINTS
        ${PC_ECHONEST_LIBDIR}
        ${PC_ECHONEST_LIBRARY_DIRS}
--- a/CMakeModules/FindJreen.cmake
+++ b/CMakeModules/FindJreen.cmake
@@ -6,7 +6,13 @@
 # LIBJREEN_FOUND, whether libjreen was found

 FIND_PACKAGE(PkgConfig QUIET)
-PKG_CHECK_MODULES(PC_JREEN QUIET libjreen)
+if( TOMAHAWK_QT5 )
+    set(JREEN_LIB_SUFFIX "-qt5")
+    set(JREEN_INCLUDE_SUFFIX ${JREEN_LIB_SUFFIX})
+else()
+    set(JREEN_INCLUDE_SUFFIX "-qt4")
+endif()
+PKG_CHECK_MODULES(PC_JREEN QUIET libjreen${JREEN_LIB_SUFFIX})

 FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h
    HINTS
@@ -14,9 +20,12 @@ FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h
        ${PC_JREEN_INCLUDE_DIRS}
        ${CMAKE_INSTALL_INCLUDEDIR}
        ${KDE4_INCLUDE_DIR}
+    PATH_SUFFIXES
+        jreen${JREEN_INCLUDE_SUFFIX}
+    
 )

-FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen
+FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen${JREEN_LIB_SUFFIX}
    HINTS
        ${PC_JREEN_LIBDIR}
        ${PC_JREEN_LIBRARY_DIRS}
--- a/CMakeModules/FindLibLastFm.cmake
+++ b/CMakeModules/FindLibLastFm.cmake
@@ -7,9 +7,8 @@
 # (c) Dominik Schmidt <dev@dominik-schmidt.de>
 #

-# Dependencies
-if(NOT QT4_FOUND)
-    find_package(Qt4 REQUIRED)
+if( TOMAHAWK_QT5 )
+    set(LASTFM_LIB_SUFFIX "5")
 endif()

 # Include dir
@@ -21,7 +20,7 @@ find_path(LIBLASTFM_INCLUDE_DIR

 # Finally the library itself
 find_library(LIBLASTFM_LIBRARY
-  NAMES lastfm
+  NAMES lastfm${LASTFM_LIB_SUFFIX}
  PATHS ${KDE4_LIB_DIR}
 )

--- a/CMakeModules/FindLucene++.cmake
+++ b/CMakeModules/FindLucene++.cmake
@@ -0,0 +1,103 @@
+#
+# This module looks for lucene++ support
+# It will define the following values
+#
+# LUCENEPP_INCLUDE_DIRS = LUCENEPP_INCLUDE_DIR + LUCENEPP_LIBRARY_DIR
+# LUCENEPP_INCLUDE_DIR  = where lucene++/Lucene.h can be found
+# LUCENEPP_LIBRARY_DIR  = where liblucene++.so can be found
+# LUCENEPP_LIBRARIES    = the libraries to link against lucene++
+# LUCENEPP_VERSION      = The lucene++ version string
+# LUCENEPP_FOUND        = set to 1 if lucene++ is found
+#
+
+INCLUDE(CheckSymbolExists)
+INCLUDE(FindLibraryWithDebug)
+
+IF(LUCENEPP_FIND_VERSION)
+  SET(LUCENEPP_MIN_VERSION ${LUCENEPP_FIND_VERSION})
+ELSEIF()
+  SET(LUCENEPP_MIN_VERSION "3.0.0")
+ENDIF(LUCENEPP_FIND_VERSION)
+
+SET(TRIAL_LIBRARY_PATHS
+  $ENV{LUCENEPP_HOME}/lib${LIB_SUFFIX}
+  ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
+  ${CMAKE_INSTALL_PREFIX}/lib
+  /usr/local/lib${LIB_SUFFIX}
+  /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+  /usr/lib${LIB_SUFFIX}
+  /sw/lib${LIB_SUFFIX}
+  /usr/pkg/lib${LIB_SUFFIX}
+  /usr/lib64
+  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+  )
+SET(TRIAL_INCLUDE_PATHS
+  $ENV{LUCENEPP_HOME}/include
+  ${CMAKE_INSTALL_PREFIX}/include
+  /usr/local/include
+  /usr/include
+  /sw/include
+  /usr/pkg/include
+  )
+FIND_LIBRARY_WITH_DEBUG(LUCENEPP_CORE_LIBRARY
+  WIN32_DEBUG_POSTFIX d
+  NAMES lucene++
+  PATHS ${TRIAL_LIBRARY_PATHS})
+IF (LUCENEPP_CORE_LIBRARY)
+  MESSAGE(STATUS "Found Lucene++ core library: ${LUCENEPP_CORE_LIBRARY}")
+ENDIF (LUCENEPP_CORE_LIBRARY)
+FIND_LIBRARY_WITH_DEBUG(LUCENEPP_SHARED_LIBRARY
+  WIN32_DEBUG_POSTFIX d
+  NAMES lucene++-contrib
+  PATHS ${TRIAL_LIBRARY_PATHS})
+IF (LUCENEPP_SHARED_LIBRARY)
+  MESSAGE(STATUS "Found Lucene++ contrib library: ${LUCENEPP_SHARED_LIBRARY}")
+ENDIF (LUCENEPP_SHARED_LIBRARY)
+
+IF(LUCENEPP_CORE_LIBRARY AND LUCENEPP_SHARED_LIBRARY)
+  SET(LUCENEPP_LIBRARIES ${LUCENEPP_CORE_LIBRARY} ${LUCENEPP_SHARED_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+ENDIF(LUCENEPP_CORE_LIBRARY AND LUCENEPP_SHARED_LIBRARY)
+
+FIND_PATH(LUCENEPP_INCLUDE_DIR
+  NAMES lucene++/Lucene.h
+  PATHS ${TRIAL_INCLUDE_PATHS})
+
+IF (LUCENEPP_INCLUDE_DIR)
+  MESSAGE(STATUS "Found Lucene++ include dir: ${LUCENEPP_INCLUDE_DIR}")
+ENDIF (LUCENEPP_INCLUDE_DIR)
+
+SET(LUCENEPP_GOOD_VERSION TRUE)
+
+FIND_PATH(LUCENEPP_LIBRARY_DIR
+	NAMES liblucene++.dylib liblucene++.so liblucene++.dll.a lucene++
+       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
+IF (LUCENEPP_LIBRARY_DIR)
+  MESSAGE(STATUS "Found Lucene++ library dir: ${LUCENEPP_LIBRARY_DIR}")
+
+  IF (LUCENEPP_VERSION STRLESS "${LUCENEPP_MIN_VERSION}")
+    MESSAGE(ERROR " Lucene++ version ${LUCENEPP_VERSION} is less than the required minimum ${LUCENEPP_MIN_VERSION}")
+    SET(LUCENEPP_GOOD_VERSION FALSE)
+  ENDIF (LUCENEPP_VERSION STRLESS "${LUCENEPP_MIN_VERSION}")
+ENDIF (LUCENEPP_LIBRARY_DIR)
+
+IF(LUCENEPP_INCLUDE_DIR AND LUCENEPP_LIBRARIES AND LUCENEPP_LIBRARY_DIR AND LUCENEPP_GOOD_VERSION)
+  SET(LUCENEPP_FOUND TRUE)
+  SET(LUCENEPP_INCLUDE_DIRS ${LUCENEPP_LIBRARY_DIR} ${LUCENEPP_INCLUDE_DIR})
+ENDIF(LUCENEPP_INCLUDE_DIR AND LUCENEPP_LIBRARIES AND LUCENEPP_LIBRARY_DIR AND LUCENEPP_GOOD_VERSION)
+
+IF(LUCENEPP_FOUND)
+  IF(NOT LUCENEPP_FIND_QUIETLY)
+    MESSAGE(STATUS "Found Lucene++: ${LUCENEPP_LIBRARIES} version ${LUCENEPP_VERSION}")
+  ENDIF(NOT LUCENEPP_FIND_QUIETLY)
+ELSE(LUCENEPP_FOUND)
+  IF(LUCENEPP_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find Lucene++.")
+  ENDIF(LUCENEPP_FIND_REQUIRED)
+ENDIF(LUCENEPP_FOUND)
+
+MARK_AS_ADVANCED(
+  LUCENEPP_INCLUDE_DIRS
+  LUCENEPP_INCLUDE_DIR
+  LUCENEPP_LIBRARY_DIR
+  LUCENEPP_LIBRARIES
+  )
--- a/CMakeModules/FindPhonon.cmake
+++ b/CMakeModules/FindPhonon.cmake
@@ -11,27 +11,14 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.

-macro(_phonon_find_version)
-   set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h")
-   if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
-      set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
-   endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
-   file(READ ${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000)
-   string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}")
-   set(PHONON_VERSION "${CMAKE_MATCH_1}")
-endmacro(_phonon_find_version)
-
-# the dirs listed with HINTS are searched before the default sets of dirs
-find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
-find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
-
-if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
-   set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
-   set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
-   _phonon_find_version()
-endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
-
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Phonon  DEFAULT_MSG  PHONON_INCLUDE_DIR PHONON_LIBRARY)

-mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY)
+if( TOMAHAWK_QT5 )
+    find_package(Phonon4Qt5 NO_MODULE)
+    set(Phonon_FOUND ${Phonon4Qt5_FOUND})
+    set(Phonon_DIR ${Phonon4Qt5_DIR})
+else()
+    find_package(Phonon NO_MODULE)
+endif()
+
+find_package_handle_standard_args(Phonon DEFAULT_MSG  Phonon_DIR )
--- a/CMakeModules/FindQJSON.cmake
+++ b/CMakeModules/FindQJSON.cmake
@@ -6,45 +6,24 @@
 #  QJSON_INCLUDE_DIR - the include path of the qjson library
 #

-if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
-
-  # Already in cache
-  set (QJSON_FOUND TRUE)
-
-else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
-
-  if (NOT WIN32)
-    # use pkg-config to get the values of QJSON_INCLUDE_DIRS
-    # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
-    include (FindPkgConfig)
-    pkg_check_modules (QJSON REQUIRED QJson>=0.5)
-  endif (NOT WIN32)
-
-  find_library (QJSON_LIBRARIES
+find_library (QJSON_LIBRARIES
    NAMES
    qjson
    PATHS
    ${QJSON_LIBRARY_DIRS}
    ${LIB_INSTALL_DIR}
    ${KDE4_LIB_DIR}
-  )
+)

-  find_path (QJSON_INCLUDE_DIR
+find_path (QJSON_INCLUDE_DIR
    NAMES
-    parser.h
-    PATH_SUFFIXES
-    qjson
+    qjson/parser.h
    PATHS
    ${QJSON_INCLUDE_DIRS}
    ${INCLUDE_INSTALL_DIR}
    ${KDE4_INCLUDE_DIR}
-  )
+)

-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)

-  if ( UNIX AND NOT APPLE )
-    set ( QJSON_LIBRARIES "${QJSON_LIBRARIES} ${QJSON_LDFLAGS}" CACHE INTERNAL "")
-  endif ()
-
-endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
--- a/CMakeModules/FindQTweetLib.cmake
+++ b/CMakeModules/FindQTweetLib.cmake
@@ -1,31 +0,0 @@
-# - Try to find QTweetLib
-#
-#  QTWEETLIB_FOUND - system has QTweetLib
-#  QTWEETLIB_INCLUDE_DIRS - the QTweetLib include directories
-#  QTWEETLIB_LIBRARIES - link these to use QTweetLib
-#
-# (c) Dominik Schmidt <dev@dominik-schmidt.de>
-#
-
-# Dependencies
-find_package(Qt4 REQUIRED)
-
-# Include dir
-find_path(QTWEETLIB_INCLUDE_DIR
-  NAMES QTweetLib/qtweetlib_global.h
-  PATHS ${KDE4_INCLUDE_DIR}
-)
-
-# Finally the library itself
-find_library(QTWEETLIB_LIBRARY
-  NAMES QTweetLib
-  PATHS ${KDE4_LIB_DIR}
-)
-
-SET( QTWEETLIB_LIBRARIES  ${QTWEETLIB_LIBRARY} ${QJSON_LIBRARIES} )
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(QTweetLib DEFAULT_MSG QTWEETLIB_LIBRARY QTWEETLIB_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(QTWEETLIB_LIBRARIES QTWEETLIB_INCLUDE_DIR)
-
--- a/CMakeModules/FindQuaZip.cmake
+++ b/CMakeModules/FindQuaZip.cmake
@@ -1,11 +1,10 @@
-find_package(Qt4)
-find_path(QuaZip_INCLUDE_DIR quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QUAZIP_DIR}/include/quazip ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}/include)
+find_path(QuaZip_INCLUDE_DIR quazip/quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QUAZIP_DIR}/include/quazip ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}/include)
 find_library(QuaZip_LIBRARY NAMES quazip PATHS ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/Library/Frameworks ${QUAZIP_DIR}/lib64 ${QUAZIP_DIR}/lib ${QUAZIP_DIR}/quazip ${QUAZIP_DIR})
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(quazip DEFAULT_MSG QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
 set(QuaZip_LIBRARIES ${QuaZip_LIBRARY})
 mark_as_advanced(QuaZip_LIBRARY QuaZip_INCLUDE_DIR)

-if(QuaZip_LIBRARY AND QuaZip_INCLUDE_DIR)
-   set(QuaZip_FOUND TRUE)
+if(QuaZip_LIBRARY AND QuaZip_INCLUDE_DIR)
+   set(QuaZip_FOUND TRUE)
 endif()
--- a/CMakeModules/FindSparsehash.cmake
+++ b/CMakeModules/FindSparsehash.cmake
@@ -0,0 +1,25 @@
+# - Find google-sparsehash
+# Find the google-sparsehash includes
+# This module defines
+# SPARSEHASH_INCLUDE_DIR, root jreen include dir.
+# SPARSEHASH_FOUND, whether libjreen was found
+
+FIND_PACKAGE(PkgConfig QUIET)
+PKG_CHECK_MODULES(PC_SPARSEHASH QUIET libsparsehash)
+
+FIND_PATH(SPARSEHASH_INCLUDE_DIR NAMES google/sparsetable
+    HINTS
+        ${PC_SPARSEHASH_INCLUDEDIR}
+        ${PC_SPARSEHASH_INCLUDE_DIRS}
+        ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+IF(SPARSEHASH_INCLUDE_DIR AND NOT PC_SPARSEHASH_VERSION)
+    MESSAGE(WARNING "You don't have pkg-config and so the google-sparsehash version check does not work!")
+ENDIF()
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sparsehash
+    REQUIRED_VARS SPARSEHASH_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(SPARSEHASH_INCLUDE_DIR)
--- a/CMakeModules/FindTelepathyQt.cmake
+++ b/CMakeModules/FindTelepathyQt.cmake
@@ -0,0 +1,27 @@
+# Copyright (c) 2013, Teo Mrnjavac <teo@kde.org>
+
+include(FindPackageHandleStandardArgs)
+
+if( NOT BUILD_WITH_QT4 )
+    find_package(TelepathyQt5 NO_MODULE)
+    set(TelepathyQt_FOUND ${TelepathyQt5_FOUND})
+    set(TELEPATHY_QT_VERSION ${TELEPATHY_QT5_VERSION})
+    set(TELEPATHY_QT_INSTALL_DIR ${TELEPATHY_QT5_INSTALL_DIR})
+    set(TELEPATHY_QT_INCLUDE_DIR ${TELEPATHY_QT5_INCLUDE_DIR})
+    set(TELEPATHY_QT_LIB_DIR ${TELEPATHY_QT5_LIB_DIR})
+    set(TELEPATHY_QT_SHARE_DIR ${TELEPATHY_QT5_SHARE_DIR})
+    set(TELEPATHY_QT_LIBRARIES ${TELEPATHY_QT5_LIBRARIES})
+else()
+    find_package(TelepathyQt4 NO_MODULE)
+    set(TelepathyQt_FOUND ${TelepathyQt4_FOUND})
+    set(TELEPATHY_QT_VERSION ${TELEPATHY_QT4_VERSION})
+    set(TELEPATHY_QT_INSTALL_DIR ${TELEPATHY_QT4_INSTALL_DIR})
+    set(TELEPATHY_QT_INCLUDE_DIR ${TELEPATHY_QT4_INCLUDE_DIR})
+    set(TELEPATHY_QT_LIB_DIR ${TELEPATHY_QT4_LIB_DIR})
+    set(TELEPATHY_QT_SHARE_DIR ${TELEPATHY_QT4_SHARE_DIR})
+    set(TELEPATHY_QT_LIBRARIES ${TELEPATHY_QT4_LIBRARIES})
+endif()
+
+set(TELEPATHY_QT_FOUND ${TelepathyQt_FOUND})
+
+find_package_handle_standard_args(TelepathyQt DEFAULT_MSG  TELEPATHY_QT_INSTALL_DIR )
--- a/CMakeModules/NSIS.template.in
+++ b/CMakeModules/NSIS.template.in
@@ -34,6 +34,9 @@

 !define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"

+;define app id needed for Windows 8 notifications
+!define AppUserModelId org.tomahawk-player.Tomahawk
+
 ;-----------------------------------------------------------------------------
 ; Installer version
 ;-----------------------------------------------------------------------------
@@ -274,11 +277,11 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
        File "${INSTALL_PATH}\bin\tomahawk.exe"

        File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe"
-        File "${INSTALL_PATH}\bin\libtomahawk_breakpad.dll"

-        File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
-        File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
-        File "${INSTALL_PATH}\bin\libtomahawklib.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk-widgets.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk-playdarapi.dll"
+
        ; plugins
        File "${INSTALL_PATH}\lib\libtomahawk_*_*.dll"
   !endif
@@ -287,11 +290,11 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
        File "${BUILD_PATH}\tomahawk.exe"

        File "${BUILD_PATH}\tomahawk_crash_reporter.exe"
-        File "${BUILD_PATH}\libtomahawk_breakpad.dll"

-        File "${BUILD_PATH}\libtomahawklib.dll"
-        File "${BUILD_PATH}\libqxtweb-standalone.dll"
-        File "${BUILD_PATH}\libtomahawk_portfwd.dll"
+        File "${BUILD_PATH}\libtomahawk.dll"
+        File "${BUILD_PATH}\libtomahawk-widgets.dll"
+        File "${BUILD_PATH}\libtomahawk-playdarapi.dll"
+
        ; plugins
        File "${BUILD_PATH}\libtomahawk_*_*.dll"
   !endif
@@ -310,11 +313,14 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
   File "${QT_DLL_PATH}\QtWebKit4.dll"
   File "${QT_DLL_PATH}\QtXml4.dll"
   File "${QT_DLL_PATH}\QtSvg4.dll"
+   File "${QT_DLL_PATH}\QtDeclarative4.dll"
+   File "${QT_DLL_PATH}\QtXmlPatterns4.dll"

   ;SQLite driver
   SetOutPath "$INSTDIR\sqldrivers"
   File "${SQLITE_DLL_PATH}\qsqlite4.dll"
   SetOutPath "$INSTDIR"
+   File "${MING_BIN}\libsqlite3-0.dll"

   ;Image plugins
   SetOutPath "$INSTDIR\imageformats"
@@ -346,26 +352,56 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
   ; Other
   File "${MING_BIN}\libqjson.dll"
   File "${MING_BIN}\libtag.dll"
-   File "${MING_BIN}\libpng15-15.dll"
+   File "${MING_BIN}\libpng16-16.dll"
   File "${MING_BIN}\libjpeg-8.dll"
   File "${MING_BIN}\zlib1.dll"

   File "${MING_BIN}\libechonest.dll"
   File "${MING_BIN}\liblastfm.dll"
-   File "${MING_BIN}\libQTweetLib.dll"
   File "${MING_BIN}\libquazip.dll"
+   File "${MING_BIN}\libqtkeychain.dll"
+
+   ; GnuTLS
+   File "${MING_BIN}\libgnutls-28.dll"
+   File "${MING_BIN}\libtasn1-6.dll"
+   File "${MING_BIN}\libgmp-10.dll"
+   File "${MING_BIN}\libhogweed-2-4.dll"
+   File "${MING_BIN}\libintl-8.dll"
+   File "${MING_BIN}\libnettle-4-6.dll"
+   File "${MING_BIN}\libp11-kit-0.dll"
+   File "${MING_BIN}\libffi-6.dll"
+
+   ; Snorenotify
+   File "${MING_BIN}\SnoreToast.exe"
+   File "${MING_BIN}\libsnore.dll"
+   File "${MING_LIB}\libsnore\libsnore_backend_growl.dll"
+   File "${MING_LIB}\libsnore\libsnore_backend_snarl.dll"
+   File "${MING_LIB}\libsnore\libsnore_backend_snore.dll"
+   File "${MING_LIB}\libsnore\libsnore_backend_snoretoast.dll"
+
+   ; Snoregrowl
+   File "${MING_BIN}\libsnoregrowl++.dll"
+   File "${MING_BIN}\libsnoregrowl.dll"

   ; Jabber
   File "${MING_BIN}\libjreen.dll"
+   File "${MING_BIN}\libidn-11.dll"
+   File "${MING_BIN}\libgsasl-7.dll"
   File "${MING_BIN}\libqca.dll"
   SetOutPath "$INSTDIR\crypto"
   File "${MING_LIB}\qt4\plugins\crypto\libqca-ossl.dll"
   SetOutPath "$INSTDIR"
-   File "${MING_BIN}\libssl-8.dll"
-   File "${MING_BIN}\libcrypto-8.dll"
+   File "${MING_BIN}\libssl-10.dll"
+   File "${MING_BIN}\libcrypto-10.dll"

-   File "${MING_LIB}\libclucene-core.dll"
-   File "${MING_LIB}\libclucene-shared.dll"
+   ; LucenePlusPlus
+   File "${MING_BIN}\liblucene++.dll"
+   File "${MING_BIN}\libboost_system-mt.dll"
+   File "${MING_BIN}\libboost_filesystem-mt.dll"
+   File "${MING_BIN}\libboost_iostreams-mt.dll"
+   File "${MING_BIN}\libboost_regex-mt.dll"
+   File "${MING_BIN}\libboost_thread-mt.dll"
+   File "${MING_BIN}\bz2-1.dll"

   File "${MING_BIN}\libqtsparkle.dll"
   File "${MING_BIN}\libattica.dll"
@@ -384,6 +420,7 @@ SectionGroup "Shortcuts"
      CreateDirectory "$SMPROGRAMS\Tomahawk"
      CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
      CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
+      WinShell::SetLnkAUMI "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "${AppUserModelId}"
      CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt"
      CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe"
      SetShellVarContext current
@@ -464,6 +501,72 @@ Section -post
   WriteRegStr HKCR "tomahawk\shell" "" "open"
   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'

+   ; Register file associations
+   WriteRegStr HKCR ".mp3" "" "MPEG Audio Layer 3"
+   WriteRegStr HKCR ".mp3\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".mp3\shell" "" "open"
+   WriteRegStr HKCR ".mp3\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".oga" "" "Ogg Audio File"
+   WriteRegStr HKCR ".oga\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".oga\shell" "" "open"
+   WriteRegStr HKCR ".oga\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".ogg" "" "Ogg Audio File"
+   WriteRegStr HKCR ".ogg\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".ogg\shell" "" "open"
+   WriteRegStr HKCR ".ogg\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".opus" "" "OPUS File"
+   WriteRegStr HKCR ".opus\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".opus\shell" "" "open"
+   WriteRegStr HKCR ".opus\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".mp4" "" "AAC File"
+   WriteRegStr HKCR ".mp4\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".mp4\shell" "" "open"
+   WriteRegStr HKCR ".mp4\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".aac" "" "AAC File"
+   WriteRegStr HKCR ".aac\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".aac\shell" "" "open"
+   WriteRegStr HKCR ".aac\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".m4a" "" "AAC File"
+   WriteRegStr HKCR ".m4a\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".m4a\shell" "" "open"
+   WriteRegStr HKCR ".m4a\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".mpc" "" "Musepack Audio File"
+   WriteRegStr HKCR ".mpc\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".mpc\shell" "" "open"
+   WriteRegStr HKCR ".mpc\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".wma" "" "Windows Media Audio"
+   WriteRegStr HKCR ".wma\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".wma\shell" "" "open"
+   WriteRegStr HKCR ".wma\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".aiff" "" "AIFF File"
+   WriteRegStr HKCR ".aiff\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".aiff\shell" "" "open"
+   WriteRegStr HKCR ".aiff\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".aif" "" "AIFF File"
+   WriteRegStr HKCR ".aif\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".aif\shell" "" "open"
+   WriteRegStr HKCR ".aif\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".wv" "" "WavePack Audio File"
+   WriteRegStr HKCR ".wv\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".wv\shell" "" "open"
+   WriteRegStr HKCR ".wv\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   WriteRegStr HKCR ".flac" "" "FLAC Audio File"
+   WriteRegStr HKCR ".flac\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR ".flac\shell" "" "open"
+   WriteRegStr HKCR ".flac\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
   SetDetailsPrint textonly
   DetailPrint "Finsihed."
 SectionEnd
@@ -523,11 +626,15 @@ Section Uninstall
   DeleteRegValue HKLM "Software\Tomahawk" ""
   DeleteRegKey HKLM "Software\Tomahawk"

+   ;DeleteRegKey HKCR "Software\Tomahawk"
+   ;DeleteRegKey HKCR "Software\TomahawkSpotify"
   DeleteRegKey HKCR "tomahawk"

   ;Start menu shortcuts.
   !ifdef OPTION_SECTION_SC_START_MENU
      SetShellVarContext all
+      WinShell::UninstAppUserModelId "${AppUserModelId}"
+      WinShell::UninstShortcut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk"
      RMDir /r "$SMPROGRAMS\Tomahawk"
      SetShellVarContext current
   !endif
--- a/114
+++ b/114
@@ -1,3 +1,108 @@
+Version 0.8.3:
+    * Performance improvements for collection browsing.
+    * Improved memory footprint.
+    * Show cloud collections above your friends in the sidebar.
+    * Keep looking for alternative sources even when we found a perfect match.
+    * Fixed crash in network code.
+    * Fixed repeat one/all icons.
+    * Be more lenient about accepting JSPF and M3U playlists.
+    * Improved support for compilation albums.
+    * (Windows) Fixed support for Windows XP.
+    * (OS X) Fixed settings dialog appearance on Yosemite.
+    * (OS X) Fixed SSL errors on Yosemite.
+
+Version 0.8.2:
+    * Show error message if saving tags failed.
+    * Fixed painting issue on search page.
+    * (OS X & Windows) Fixed crash during collection scan.
+
+Version 0.8.1:
+    * Disabled sorting for stations.
+    * Fixed drag & drop behavior in combination with certain resolvers.
+    * Fixed infinite scanning recursion.
+    * Prevented adding dupes to the collection when scanning.
+    * When playing an artist or album, don't give up when the first track
+      in list isn't playable.
+    * Fixed importing M3U playlists.
+    * Sort album grids by artist name.
+    * Fixed painting issue on 'More Albums' grid.
+    * Fixed crash when editing/saving track tags.
+
+Version 0.8.0:
+    * Redesigned - Shiny new interface. Simplified. New icons.
+    * Added Friend Feed.
+    * Now Playing notifications (OS X & Windows) - support for OS-level
+      notification systems (e.g. Notification Center) with fallback to its own
+      native notification system.
+    * Many actions now available in context menu - including Favorite and Send
+      to a Friend.
+    * Drag and drop support for iTunes, Deezer, Beats Music, Rdio, Spotify,
+      SoundCloud links (into Tomahawk) for playlists/tracks/artists/album urls.
+    * Support for clicking source icon for currently playing track in audio
+      controls to take user to associated page on source's site.
+    * Added Hatchet plug-in.
+    * Added Google Play Music and Beats Music support.
+    * Add links to Support site, Bug Reports and Translations to Help menu.
+    * Add "What's New" page to display on first launch (or until dismissed).
+      Also available from Help menu.
+    * Changed label from "Resolvers" and "Services" to more generic "Plug-Ins".
+    * Clarified some labels, help text and status messages.
+    * Changed icon color a bit.
+    * Added "Acoustic" and "Electric" songtypes to Stations options.
+    * Removed some stale Chart sources.
+    * Playback Queue now saves its state across sessions.
+    * Queue now moved to sidebar.
+    * Added "Inbox" feature, showing incoming song recommendations. Dropping
+      a track on a user in the sidebar sends a recommendation to them.
+    * You will now be asked whether you want to trust invalid SSL certificates.
+    * Improved connecting between Tomahawk peers and support multiple IPs
+      (including IPv6).
+    * Removed Top Loved from sidebar.
+    * Removed Spotify playlist syncing (will return in future versions).
+    * HTTP(S) streaming is now done by Tomahawk instead of the Phonon backend
+      (fixed HTTPS streaming on MacOS).
+    * Heavily reduced memory footprint during and after indexing the database.
+    * Retina display and DPI scaling fixes.
+    * New Collection views. Re-added support for tracklist view of Collection.
+    * Added Telepathy support.
+    * Plugin refactoring (and .AXE resolver binaries).
+    * Removed Twitter due to change in Twitter's API.
+    * Removed auto-playlists.
+    * Improved error messages.
+    * Added basic remote control API.
+    * Add support for Opus codec (requires TagLib 1.9).
+    * Support rtmp:// streams.
+    * Support custom headers in CustomUrlHandler.
+    * Fuzzy search indices for JS Resolvers.
+    * Add metadata retrieval of HTTP(S) streams in JavaScript resolvers.
+
+Version 0.7.0:
+    * JavaScript Resolvers can now expose collections.
+    * Introduced bundle system for JavaScript Resolvers, called "axes".
+    * Fixed playback-loop caused by duplicate tracks in a playlist.
+    * Improved peer handling and removed connection support through Twitter.
+    * Taking an account offline now also disconnects associated peers.
+    * Improved spotify protocol handling.
+    * Added "Append to Playlist" context menu item.
+    * User-friendlier collection handling: added info-buttons for artists and
+      albums. Double-clicking an item expands it now.
+    * Charts only load on-demand now.
+    * Fixed Diagnostics information not correctly updating.
+    * Fixed issue with hidden sidebar and panels.
+    * Fixed issues with some color schemes.
+    * Fixed playing files with special characters in the filename.
+    * Improved stability.
+    * Added translations for Catalan, Czech, Galician, Greek, Italian and
+      Chinese.
+    * (Windows) Smoother and more responsive audio playback.
+    * (Linux) Fixed grid issues with GTK-styles.
+
+Version 0.6.1:
+    * Improved stability.
+    * Improved UPnP detection and port-forwarding.
+    * Fixed scrolling behaviour of grid-views.
+    * Lots of small design tweaks and fixes.
+
 Version 0.6.0:
    * Improved icon theme with vector graphics.
    * Higher resolution artist and album images.
@@ -5,6 +110,8 @@ Version 0.6.0:
      biographies.
    * New AudioControl logic - only enable Prev/Skip buttons if available.
    * Added more options to right-click/context menus.
+    * Resolver source icon in Audiocontrols now supports being a link-back URL
+      to original source.
    * Make friends' currently playing song (in sidebar) clickable.
    * Improve MusicBrainz plugin to use normalized artist names and avoid
      duplicate tracks.
@@ -22,8 +129,11 @@ Version 0.6.0:
    * Remove YouTube resolver from plug-in directory on request of YouTube.
    * Fixed iTunes m3u playlist support.
    * Support dropping of new Soundcloud user, track, set & likes URLs.
-    * Add HotNewHipHop as available chart.
-    * Add iTunes as available source for New Releases.
+    * Added HotNewHipHop as available chart.
+    * Added iTunes as available source for New Releases.
+    * Updates and additions to translations including: Japanese, Bulgarian, 
+      Finnish, Russian, Arabic, Chinese, Swedish, Czech and more.
+    * (Windows) Added thumb buttons to Windows 7's taskbar.
    * (Linux) Allow disabling of playback notifications.

 Version 0.5.5:
--- a/PACKAGING.md
+++ b/PACKAGING.md
@@ -0,0 +1,73 @@
+# Packaging Tomahawk
+
+General distribution agnostic packaging documentation for Linux.
+
+## Stay up to date!
+
+We will try to keep this document up to date, but we also let our packagers know if our dependencies get important updates - especially if they fix crashes or add new features - or if we add completely new ones. Last but not least, of course we want to let you know about new releases of Tomahawk!
+
+If you want to be notified too subscribe to our [Google Group](https://groups.google.com/forum/#!forum/tomahawk-packagers).
+
+## CMake build options
+
+CMake build options are prefixed with ```-D``` and get their value passed after an ```=```.
+You could for example specify the build type like this ```-DCMAKE_BUILD_TYPE=RelWithDebInfo```.
+This document contains only options relevant to packaging, to have a complete overview you should check our CMake scripts yourself. Looking at it the other way round, this also means that you should read everything in here really carefully.
+
+
+##### ```CMAKE_BUILD_TYPE```
+
+Make sure to specify the build type as ```Release``` or even better ```RelWithDebInfo``` if your distribution supports debug packages. If you do not do this, your users might see asserts (that look like crashes to them) which are only really useful to developers.
+
+##### ```BUILD_RELEASE``` (boolean) (default: OFF)
+
+If you're not using our tarballs you can turn this on to suppress putting Git revision hashes into the version string. This also disables building tools and tests by default (although you can do that manually) it's more future-proof to simply pass ```-DBUILD_RELEASE=ON``` because we might make use of it in later releases.
+
+##### ```BUILD_TOOLS``` (boolean) (default: OFF, when BUILD_RELEASE=ON)
+
+Tomahawk provides some tools that help highlight where crashes (of course we only crash in theory!) come from. To make them really useful, we need debug symbols to be available. If your distribution supports/allows it, you could put them into the -debug package.
+
+##### ```BUILD_HATCHET``` (boolean) (default: ON)
+
+Build the account plugin for Hatchet (http://hatchet.is). Requires [websocketpp](https://github.com/zaphoyd/websocketpp).
+
+##### ```BUILD_WITH_QT4``` (boolean) (default: ON)
+
+This enforces CMake to link against Qt4 regardless of whether Qt5 was found or not. Currently Qt4 is still our main development target, so this is still recommended. If you feel adventurous or are preparing Qt5 repositories for your distribution, feel free to give ```-DBUILD_WITH_QT4=OFF``` a shot.
+
+##### ```WITH_CRASHREPORTER``` (boolean) (default: ON)
+
+The crash reporter is built by default if libcrashreporter-qt is available in ```thirdparty/libcrashreporter-qt/``` (for example via git submodule). Usually distributions don't allow packagers to upload debug symbols to the Tomahawk HQ so to give crash reports more meaning for us, that's why we have no standardised submit process in place yet. If you can do that in your distribution, please get in touch with us!
+
+##### ```WITH_KDE``` (boolean) (default: ON)
+
+The KDE Telepathy plugin to configure Telepathy accounts from our Telepathy plugin can be disabled, if for some reason KDE is available in your build environment but you don't need this plugin.
+
+##### ```WITH_UPOWER``` (boolean) (default on Linux: ON)
+
+Build with support for UPower events.
+
+##### ```WITH_GNOMESHORTCUTHANDLER``` (boolean) (default on Linux: ON)
+
+Build with shortcut handler for GNOME.
+
+#### Runtime dependencies
+
+##### QSql
+
+If your distribution splits the QSqlite plugin for QSql into a separate package, make it a requirement of Tomahawk -  otherwise it might fail to start.
+
+##### XMPP / jreen
+
+Either jreen or (at least) Tomahawk's package should require the qca-ossl plugin, otherwise there will be no GTalk/Jabber support.
+
+##### Audio / Phonon
+Tomahawk requires phonon-vlc >= 0.4.1 or phonon-gstreamer >= 4.6.1 (esp. phonon-xine in any version will not work!).
+
+### Icon caches
+
+In openSUSE there are macros for updating icon caches in KDE and GNOME (```%desktop_database_post[un]``` ```%icon_theme_cache_post[un]```) after [un]installation, check if your distribution offers the same.
+
+### Firewall
+
+Tomahawk offers P2P functionality, if your distribution offers a default firewall, it's nice to support a default profile for the standard Tomahawk P2P-port (50210). (cf. [openSUSE integration](https://build.opensuse.org/package/view_file/KDE:Extra/tomahawk/tomahawk.SuSEfirewall2?expand=1))
--- a/README.md
+++ b/README.md
@@ -1,61 +1,157 @@
-Tomahawk
-========
+# TOMAHAWK

-Compiling and running Tomahawk
------------------------------
+## WHAT TOMAHAWK IS

-Compile:
+Tomahawk is a free multi-source and cross-platform music player. An application that can play not only your local files, but also stream from services like Spotify, Beats, SoundCloud, Google Music, YouTube and many others. You can even connect with your friends' Tomahawks, share your musical gems or listen along to them. Let the music play!
+
+![Tomahawk Screenshot](/data/screenshots/tomahawk-screenshot.png?raw=true)
+
+## HOW TOMAHAWK WORKS
+
+Tomahawk is basically a **music metadata player**.  At its core it decouples the metadata about a song from the source and reassembles it for each user based on their individual music accessibility and rights. In short, given the name of a song and artist Tomahawk will find the right source, for the right user at the right time.  This fundamentally different approach to music enables a range of new music consumption and sharing experiences previously not possible. 
+
+## MUSIC SOURCES
+
+* Local music library (MP3, Ogg, FLAC and many other formats)
+* Networked music libraries (other connected computers)
+
+### Subscription Music Services
+
+* Spotify
+* Beats Music
+* Google Play Music (on-demand streaming and music locker)
+* Grooveshark 
+* Rdio (Android only)
+* Deezer (Android only)
+
+### Free Streaming/Music Promotion Platforms
+
+* Soundcloud
+* Bandcamp
+* Last.fm
+* Jamendo
+* Official.fm
+
+### Network/Cloud storage
+
+* Ampache
+* Owncloud
+* Subsonic
+* Beets
+
+Third party-developed resolvers have also been written for services like YouTube, Qobuz and others. We've also heard of digital music distributors writing their own for their internal CMSes to help them navigate and preview their content. That's cool.
+
+Packaged binary resolvers (.axes) are available: [here](http://teom.org/axes).
+
+Source code (and examples) can be found in our [Resolver repository](https://github.com/tomahawk-player/tomahawk-resolvers).
+
+## DOWNLOAD TOMAHAWK
+
+You can download one of our nightly or stable builds:
+
+| *BUILD* | MAC / OSX | WINDOWS | LINUX |
+|:-------:|:---------:|:-------:|:-----:|
+|**NIGHTLY** | [**latest**](http://download.tomahawk-player.org/nightly/mac/Tomahawk-latest.dmg) | [**latest**](http://download.tomahawk-player.org/nightly/windows/tomahawk-latest.exe) | [**latest**] (https://launchpad.net/~tomahawk/+archive/ubuntu/nightly) (Ubuntu) |
+|**STABLE** | [**0.8**](http://download.tomahawk-player.org/Tomahawk-0.8.0.dmg) | [**0.8**](http://download.tomahawk-player.org/tomahawk-0.8.0.exe) | [**0.8**](http://www.tomahawk-player.org/#page-about) (various distros) |
+
+## BUILD TOMAHAWK
+
+... or you can compile it yourself:

    $ mkdir build && cd build
    $ cmake ..
    $ make

-Start the application on Linux:
+### Detailed Build Instructions

-    $ ./tomahawk
-Start the application on OS X:
+**LINUX**

-    $ open tomahawk.app
+* [Arch](http://wiki.tomahawk-player.org/index.php/Building_ArchLinux_package)
+* [Debian](http://wiki.tomahawk-player.org/index.php/Building_on_Debian)
+* [Fedora](http://wiki.tomahawk-player.org/index.php/Building_on_Fedora)
+* [openSUSE](http://wiki.tomahawk-player.org/index.php/Building_on_openSUSE)
+* [Ubuntu](http://wiki.tomahawk-player.org/index.php/Building_on_Ubuntu)

+**MAC**

-Detailed building instructions for Ubuntu
-----------------------------------------
-See: http://wiki.tomahawk-player.org/index.php/Building_Ubuntu_Binary_on_Precise_(12.04)
+* [OS X](http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle)

-Detailed building instructions for OS X
---------------------------------------
-See: http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle_on_Snow_Leopard_(10.6)_and_Lion_(10.7)
+**WINDOWS**

-Doxygen Documentation
---------------------
-See: http://dev.tomahawk-player.org/api/classes.html
+* [Windows](http://wiki.tomahawk-player.org/index.php/Building_Windows_Binary)

-Dependencies
------------
+### Dependencies

 Required dependencies:

-* CMake 2.8.6 - http://www.cmake.org/
-* Qt 4.7.0 - http://qt.nokia.com/
-* Phonon 4.6.0 - http://phonon.kde.org/
-* QJson 0.7.1 - http://qjson.sourceforge.net/
-* SQLite 3.6.22 - http://www.sqlite.org/
-* TagLib 1.6.2 - http://developer.kde.org/~wheeler/taglib.html
-* Boost 1.3 - http://www.boost.org/
-* CLucene 0.9.23 (0.9.21 will fail) - http://clucene.sourceforge.net/download.shtml
-* libechonest 2.0.0 - http://projects.kde.org/projects/playground/libs/libechonest/
-* Attica 0.4.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
-* QuaZip 0.4.3 - http://quazip.sourceforge.net/
-* liblastfm 1.0.1 - http://github.com/lastfm/liblastfm/
+* [CMake 2.8.6](http://www.cmake.org/)
+* [Qt 4.7.0](http://qt-project.org/)
+* [Phonon 4.6.0](http://phonon.kde.org/)
+* [QJson 0.8.1](http://qjson.sourceforge.net/)
+* [SQLite 3.6.22](http://www.sqlite.org/)
+* [TagLib 1.8](http://developer.kde.org/~wheeler/taglib.html)
+* [Boost 1.3](http://www.boost.org/)
+* [Lucene++ 3.0.6](https://github.com/luceneplusplus/LucenePlusPlus/)
+* [libechonest 2.2.0](http://projects.kde.org/projects/playground/libs/libechonest/)
+* [Attica 0.4.0](http://ftp.kde.org/stable/attica/)
+* [QuaZip 0.4.3](http://quazip.sourceforge.net/)
+* [liblastfm 1.0.1](https://github.com/lastfm/liblastfm/)
+* [QtKeychain 0.1](https://github.com/frankosterfeld/qtkeychain/)
+* [Sparsehash](https://code.google.com/p/sparsehash/)
+* [GnuTLS](http://gnutls.org/)

-The following dependencies are optional, but recommended:
+The following dependencies are optional (but *recommended*):

-* Jreen 1.0.5 - http://qutim.org/jreen / https://github.com/euroelessar/jreen
-* QTweetLib 0.5.0 - https://github.com/minimoog/QTweetLib
+* [Jreen 1.0.5](http://qutim.org/jreen/) (1.1.0 will fail, 1.1.1 is fine)
+* [Snorenotify](https://github.com/Snorenotify/Snorenotify/)

 Third party libraries that we ship with our source:

-* MiniUPnP 1.6 - http://miniupnp.free.fr/
-* Breakpad - http://code.google.com/p/google-breakpad/
+* [MiniUPnP 1.6](http://miniupnp.free.fr/)
+* [Qocoa](https://github.com/mikemcquaid/Qocoa/)
+* [libqnetwm](https://code.google.com/p/libqnetwm/)
+* [libqxt](http://libqxt.org/) (QxtWeb module) 
+* [SPMediaKeyTap](https://github.com/nevyn/SPMediaKeyTap/)
+* [kdSingleApplicationGuard](http://www.kdab.com/)

-Enjoy!
+## SUPPORT TOMAHAWK
+
+* [Bug Tracker & Issues](https://bugs.tomahawk-player.org/secure/Dashboard.jspa)
+* [Translations](https://www.transifex.com/projects/p/tomahawk/)
+* [Donate](https://flattr.com/thing/169312/Tomahawk)
+
+## GET HELP
+
+* [Support & Feedback](https://tomahawk.uservoice.com)
+* Chat with Us (IRC): #tomahawk (on Freenode)
+* [Twitter](https://twitter.com/tomahawk)
+* [Facebook](https://facebook.com/tomahawkplayer)
+* [Developer API documentation](http://dev.tomahawk-player.org/api/classes.html)
+
+## SCREENSHOTS
+
+BROWSE FRIENDS' MUSIC & LISTEN ALONG
+
+![Browse](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998050088_listen-along.jpg)
+
+INBOX - RECEIVED & FORWARDING
+
+![Inbox](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410997751044_inbox.jpg)
+
+CHARTS - BILLBOARD'S TASTEMAKER ALBUMS
+
+![Charts](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410997901969_charts.jpg)
+
+FRIEND FEED
+
+![Feed](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410971283885_heroshot.png)
+
+DYNAMIC (AUTO-UPDATING) PLAYLIST
+
+![Xspf](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998362549_dynamic-playlist-1.jpg)
+
+PLUG-INS / RESOLVER SETTINGS
+
+![Settings](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998587408_prefs.jpg)
+
+**Enjoy!**
--- a/TomahawkAddLibrary.cmake
+++ b/TomahawkAddLibrary.cmake
@@ -0,0 +1,116 @@
+include( CMakeParseArguments )
+
+function(tomahawk_add_library)
+    # parse arguments (name needs to be saved before passing ARGN into the macro)
+    set(NAME ${ARGV0})
+    set(options NO_INSTALL NO_VERSION)
+    set(oneValueArgs NAME TYPE EXPORT_MACRO TARGET TARGET_TYPE EXPORT VERSION SOVERSION INSTALL_BINDIR)
+    set(multiValueArgs SOURCES UI LINK_LIBRARIES LINK_PRIVATE_LIBRARIES COMPILE_DEFINITIONS QT5_MODULES)
+    cmake_parse_arguments(LIBRARY "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    set(LIBRARY_NAME ${NAME})
+
+
+#     message("*** Arguments for ${LIBRARY_NAME}")
+#     message("Sources: ${LIBRARY_SOURCES}")
+#     message("Link libraries: ${LIBRARY_LINK_LIBRARIES}")
+#     message("UI: ${LIBRARY_UI}")
+#     message("TARGET_TYPE: ${LIBRARY_TARGET_TYPE}")
+#     message("EXPORT_MACRO: ${LIBRARY_EXPORT_MACRO}")
+#     message("NO_INSTALL: ${LIBRARY_NO_INSTALL}")
+
+    set(target ${LIBRARY_NAME})
+
+    # qt stuff
+    include_directories(${CMAKE_CURRENT_LIST_DIR})
+    include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+    if(LIBRARY_UI)
+        qt_wrap_ui(LIBRARY_UI_SOURCES ${LIBRARY_UI})
+        list(APPEND LIBRARY_SOURCES ${LIBRARY_UI_SOURCES})
+    endif()
+
+    # add resources from current dir
+    if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc")
+        qt_add_resources(LIBRARY_RC_SOURCES "resources.qrc")
+        list(APPEND LIBRARY_SOURCES ${LIBRARY_RC_SOURCES})
+        unset(LIBRARY_RC_SOURCES)
+    endif()
+
+    # add target
+    if(LIBRARY_TARGET_TYPE STREQUAL "STATIC")
+        add_library(${target} STATIC ${LIBRARY_SOURCES})
+    elseif(LIBRARY_TARGET_TYPE STREQUAL "MODULE")
+        add_library(${target} MODULE ${LIBRARY_SOURCES})
+    else() # default
+        add_library(${target} SHARED ${LIBRARY_SOURCES})
+    endif()
+
+    # HACK: add qt modules - every lib should define its own set of modules
+    qt5_use_modules(${target} Core Network Widgets Sql Xml DBus ${LIBRARY_QT5_MODULES})
+
+    # definitions - can this be moved into set_target_properties below?
+    add_definitions(${QT_DEFINITIONS})
+    set_target_properties(${target} PROPERTIES AUTOMOC TRUE)
+
+    add_definitions(${TOMAHAWK_DEFINITIONS})
+    if(LIBRARY_EXPORT_MACRO)
+        set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${LIBRARY_EXPORT_MACRO})
+    endif()
+
+    if(LIBRARY_COMPILE_DEFINITIONS)
+        # Dear CMake, i hate you! Sincerely, domme
+        # At least in CMake 2.8.8, you CANNOT set more than one COMPILE_DEFINITIONS value
+        # only takes the first one if called multiple times or bails out with wrong number of arguments
+        # when passing in a list, thus i redefine the export macro here in hope it won't mess up other targets
+        # Dear domme,
+        # "The COMPILE_DEFINITIONS property may be set to a semicolon-separated list"
+        # Sincerely, CMake Documentation
+        add_definitions( "-D${LIBRARY_EXPORT_MACRO}" )
+
+        set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${LIBRARY_COMPILE_DEFINITIONS})
+    endif()
+
+    # add link targets
+    target_link_libraries(${target} ${TOMAHAWK_LIBRARIES})
+    if(LIBRARY_LINK_LIBRARIES)
+        target_link_libraries(${target} ${LIBRARY_LINK_LIBRARIES})
+    endif()
+    if(LIBRARY_LINK_PRIVATE_LIBRARIES)
+        target_link_libraries(${target} LINK_PRIVATE ${LIBRARY_LINK_PRIVATE_LIBRARIES})
+    endif()
+
+    # add soversion
+    if(NOT LIBRARY_NO_VERSION)
+        set_target_properties(${target} PROPERTIES VERSION ${LIBRARY_VERSION})
+
+        if(NOT LIBRARY_SOVERSION)
+            set(LIBRARY_SOVERSION ${LIBRARY_VERSION})
+        endif()
+
+        set_target_properties(${target} PROPERTIES SOVERSION ${LIBRARY_SOVERSION})
+    endif()
+
+
+    if(NOT LIBRARY_INSTALL_BINDIR)
+        set(LIBRARY_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
+    endif()
+
+    # make installation optional, maybe useful for dummy plugins one day
+    if(NOT LIBRARY_NO_INSTALL)
+        include(GNUInstallDirs)
+        if(NOT LIBRARY_EXPORT)
+            install( TARGETS ${target}
+                RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR}
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            )
+        else()
+            install( TARGETS ${target}
+                EXPORT ${LIBRARY_EXPORT}
+                RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR}
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            )
+        endif()
+    endif()
+endfunction()
--- a/TomahawkAddPlugin.cmake
+++ b/TomahawkAddPlugin.cmake
@@ -0,0 +1,55 @@
+include( CMakeParseArguments )
+include( ${TOMAHAWK_CMAKE_DIR}/TomahawkAddLibrary.cmake )
+
+function(tomahawk_add_plugin)
+    # parse arguments (name needs to be saved before passing ARGN into the macro)
+    set(NAME ${ARGV0})
+    set(options NO_INSTALL SHARED_LIB)
+    set(oneValueArgs NAME TYPE EXPORT_MACRO)
+    set(multiValueArgs SOURCES UI LINK_LIBRARIES COMPILE_DEFINITIONS)
+    cmake_parse_arguments(PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    set(PLUGIN_NAME ${NAME})
+
+#     message("*** Arguments for ${PLUGIN_NAME}")
+#     message("Sources: ${PLUGIN_SOURCES}")
+#     message("Link libraries: ${PLUGIN_LINK_LIBRARIES}")
+#     message("UI: ${PLUGIN_UI}")
+#     message("TYPE: ${PLUGIN_TYPE}")
+#     message("EXPORT_MACRO: ${PLUGIN_EXPORT_MACRO}")
+#     message("NO_INSTALL: ${PLUGIN_NO_INSTALL}")
+
+    # create target name once for convenience
+    set(target "tomahawk_${PLUGIN_TYPE}_${PLUGIN_NAME}")
+
+    # determine target type
+    if(NOT ${PLUGIN_SHARED_LIB})
+        set(target_type "MODULE")
+    else()
+        set(target_type "SHARED")
+    endif()
+
+    list(APPEND tomahawk_add_library_args
+      "${target}"
+      "EXPORT_MACRO" "${PLUGIN_EXPORT_MACRO}"
+      "TARGET_TYPE" "${target_type}"
+      "SOURCES" "${PLUGIN_SOURCES}"
+    )
+
+    if(PLUGIN_UI)
+        list(APPEND tomahawk_add_library_args "UI" "${PLUGIN_UI}")
+    endif()
+
+    if(PLUGIN_LINK_LIBRARIES)
+        list(APPEND tomahawk_add_library_args "LINK_LIBRARIES" "${PLUGIN_LINK_LIBRARIES}")
+    endif()
+
+    if(PLUGIN_COMPILE_DEFINITIONS)
+        list(APPEND tomahawk_add_library_args "COMPILE_DEFINITIONS" ${PLUGIN_COMPILE_DEFINITIONS})
+    endif()
+
+    list(APPEND tomahawk_add_library_args "NO_VERSION")
+
+    list(APPEND tomahawk_add_library_args "INSTALL_BINDIR" "${CMAKE_INSTALL_LIBDIR}")
+
+    tomahawk_add_library(${tomahawk_add_library_args})
+endfunction()
--- a/TomahawkBuildTreeSettings.cmake.in
+++ b/TomahawkBuildTreeSettings.cmake.in
@@ -0,0 +1,4 @@
+set(TOMAHAWK_INCLUDE_DIRS
+  "@PROJECT_SOURCE_DIR@/src/libtomahawk"
+  "@PROJECT_BINARY_DIR@/src/libtomahawk"
+)
--- a/TomahawkConfig.cmake.in
+++ b/TomahawkConfig.cmake.in
@@ -0,0 +1,21 @@
+# - Config file for the Tomahawk package
+# It defines the following variables
+#  TOMAHAWK_INCLUDE_DIRS - include directories for Tomahawk
+#  TOMAHAWK_LIBRARIES    - libraries to link against
+#  TOMAHAWK_EXECUTABLE   - the bar executable
+
+# Compute paths
+get_filename_component(TOMAHAWK_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+if(EXISTS "${TOMAHAWK_CMAKE_DIR}/CMakeCache.txt")
+   # In build tree
+   include("${TOMAHAWK_CMAKE_DIR}/TomahawkBuildTreeSettings.cmake")
+else()
+   set(TOMAHAWK_INCLUDE_DIRS "${TOMAHAWK_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@/libtomahawk")
+endif()
+
+# Our library dependencies (contains definitions for IMPORTED targets)
+include("${TOMAHAWK_CMAKE_DIR}/TomahawkLibraryDepends.cmake")
+
+# These are IMPORTED targets created by TomahawkLibraryDepends.cmake
+set(TOMAHAWK_LIBRARIES tomahawklib)
+set(TOMAHAWK_USE_FILE "${TOMAHAWK_CMAKE_DIR}/TomahawkUse.cmake")
--- a/TomahawkConfigVersion.cmake.in
+++ b/TomahawkConfigVersion.cmake.in
@@ -0,0 +1,12 @@
+set(PACKAGE_VERSION "@TOMAHAWK_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()
+
--- a/TomahawkUse.cmake.in
+++ b/TomahawkUse.cmake.in
@@ -0,0 +1,63 @@
+#FIXME: this duplicates top level cmakelists: how can we reduce code duplication?
+
+set( TOMAHAWK_QT5 @TOMAHAWK_QT5@ )
+
+if(TOMAHAWK_QT5)
+    find_package(Qt5Core)
+    find_package(Qt5Network)
+    find_package(Qt5Gui)
+    find_package(Qt5Sql)
+
+    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
+    if(BUILD_GUI OR NOT DEFINED BUILD_GUI)
+        find_package(Qt5Widgets)
+        find_package(Qt5Svg)
+    endif()
+
+    macro(qt_wrap_ui)
+        qt5_wrap_ui(${ARGN})
+    endmacro()
+
+    macro(qt_add_resources)
+        qt5_add_resources(${ARGN})
+    endmacro()
+
+    find_package(Qt5LinguistTools REQUIRED)
+    macro(qt_add_translation)
+        qt5_add_translation(${ARGN})
+    endmacro()
+else(TOMAHAWK_QT5)
+    find_package(Qt4 COMPONENTS QtNetwork QtCore QtGui QtSql REQUIRED)
+    include( ${QT_USE_FILE} )
+
+    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
+    if(BUILD_GUI OR NOT DEFINED BUILD_GUI)
+        list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
+    endif()
+
+    find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS})
+    include( ${QT_USE_FILE} )
+
+    macro(qt5_use_modules)
+    endmacro()
+
+    macro(qt_wrap_ui)
+        qt4_wrap_ui(${ARGN})
+    endmacro()
+
+    macro(qt_add_resources)
+        qt4_add_resources(${ARGN})
+    endmacro()
+
+    macro(qt_add_translation)
+        qt4_add_translation(${ARGN})
+    endmacro()
+endif(TOMAHAWK_QT5)
+
+
+if(NOT TOMAHAWK_CMAKE_DIR)
+    set(TOMAHAWK_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
+endif()
+
+include( "${TOMAHAWK_CMAKE_DIR}/TomahawkAddLibrary.cmake" )
+include( "${TOMAHAWK_CMAKE_DIR}/TomahawkAddPlugin.cmake" )
--- a/admin/mac/Info.plist
+++ b/admin/mac/Info.plist
@@ -23,9 +23,11 @@
 	<key>CFBundleName</key>
 	<string>Tomahawk</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.5.0</string>
+	<string>10.7.0</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSHighResolutionCapable</key>
+	<true />
 	<key>SUFeedURL</key>
 	<string>http://download.tomahawk-player.org/sparkle/update.php</string>
 	<key>SUPublicDSAKeyFile</key>
@@ -61,6 +63,174 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>jspf</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>Generic.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/jspf</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>JSPF Playlist</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>mp3</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>mp3.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/mpeg</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>MPEG Audio Layer 3</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>oga</string>
+				<string>ogg</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>ogg.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/ogg</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Ogg Audio File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>opus</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>ogg.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/opus</string>
+				<string>application/opus</string>
+				<string>audio/ogg; codecs=opus</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>OPUS file</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>aac</string>
+				<string>mp4</string>
+				<string>m4a</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/aac</string>
+				<string>audio/mp4</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>AAC file</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>mpc</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/x-musepack</string>
+				<string>audio/mpc</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Musepack Audio File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>wma</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/x-ms-wma</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Windows Media Audio</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>flac</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/flac</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>FLAC Audio File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>aiff</string>
+				<string>aif</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/aiff</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>AIFF File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>wv</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/x-wavpack</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>WavePack Audio File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>
 </dict>
 </plist>
--- a/admin/mac/build-release-osx.sh
+++ b/admin/mac/build-release-osx.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 #
-# Usage: ./admin/mac/build-release-osx.sh [--no-clean]
+# Usage: ./admin/mac/build-release-osx.sh VERSION CERT_SIGNER [--no-clean]
 #
 ################################################################################

+set -e
+

 function header {
    echo -e "\033[0;34m==>\033[0;0;1m $1 \033[0;0m"
@@ -16,43 +18,44 @@ function die {
 }
 ################################################################################

-if [ -z $1 ]
+if [ -z "$2" ]
 then
-    echo This script expects the version number as a parameter, e.g. 1.0.0
+    echo This script expects the version number and cert-signer as parameters, e.g. "1.0.0 John Doe"
    exit 1
 fi

 ROOT=`pwd`
 VERSION=$1
+CERT_SIGNER=$2

 ################################################################################

-    mv tomahawk.app Tomahawk.app
-    mv Tomahawk.app/Contents/MacOS/tomahawk Tomahawk.app/Contents/MacOS/Tomahawk
-
    header "Fixing and copying libraries"
    $ROOT/../admin/mac/macdeploy.py Tomahawk.app quiet

    cd Tomahawk.app

-    header "Renaming icon"
-    mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
    cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf

    header "Copying Sparkle framework"
-    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
-    
+    rm -rf Contents/Frameworks/Sparkle.framework
+    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks/
+
    header "Creating DMG"
    cd ..

    header "Signing bundle"
-    codesign -s "Developer ID Application: Leonardo Franchi" -f -v ./Tomahawk.app
+    codesign -s "Developer ID Application: $CERT_SIGNER" -f -v ./Tomahawk.app
+
+    if [ -f ~/sign_step.sh ];
+    then
+        ~/sign_step.sh "$CERT_SIGNER" "Tomahawk.app"
+    fi

    $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
    mv Tomahawk.dmg Tomahawk-$VERSION.dmg
-    
+
    header "Creating signed Sparkle update"
    $ROOT/../admin/mac/sign_bundle.rb $VERSION ~/tomahawk_sparkle_privkey.pem
-    mv Tomahawk.app tomahawk.app

    header "Done!"
--- a/admin/mac/dmg_background.png
+++ b/admin/mac/dmg_background.png
--- a/admin/mac/macdeploy.py
+++ b/admin/mac/macdeploy.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-#  This file is part of Tomahawk. 
+#  This file is part of Tomahawk.
 #  It was inspired in large part by the macdeploy script in Clementine.
 #
 #  Clementine is free software: you can redistribute it and/or modify
@@ -26,162 +26,162 @@ FRAMEWORK_SEARCH_PATH=[
    os.path.join(os.environ['HOME'], 'Library/Frameworks')
 ]

-LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.1.1/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.']

 VLC_PLUGINS=[
-  'libaccess_attachment_plugin.dylib',
-  #'libaccess_avio_plugin.dylib',
-  #'libaccess_fake_plugin.dylib',
-  'libaccess_ftp_plugin.dylib',
-  'libaccess_http_plugin.dylib',
-  'libaccess_imem_plugin.dylib',
-  #'libaccess_mmap_plugin.dylib',
-  'libaccess_mms_plugin.dylib',
-  'libaccess_realrtsp_plugin.dylib',
-  'libaccess_tcp_plugin.dylib',
-  'libaccess_udp_plugin.dylib',
-  'libcdda_plugin.dylib',
-  'libfilesystem_plugin.dylib',
-  'libqtcapture_plugin.dylib',
-  'librtp_plugin.dylib',
-  'libzip_plugin.dylib',
-  'libaccess_output_dummy_plugin.dylib',
-  'libaccess_output_file_plugin.dylib',
-  'libaccess_output_http_plugin.dylib',
-  'libaccess_output_shout_plugin.dylib',
-  'libaccess_output_udp_plugin.dylib',
-  'liba52tofloat32_plugin.dylib',
-  'liba52tospdif_plugin.dylib',
-  'libaudio_format_plugin.dylib',
-  'libaudiobargraph_a_plugin.dylib',
-  'libchorus_flanger_plugin.dylib',
-  'libconverter_fixed_plugin.dylib',
-  'libdolby_surround_decoder_plugin.dylib',
-  'libdtstofloat32_plugin.dylib',
-  'libdtstospdif_plugin.dylib',
-  'libequalizer_plugin.dylib',
-  'libheadphone_channel_mixer_plugin.dylib',
-  'libmono_plugin.dylib',
-  'libmpgatofixed32_plugin.dylib',
-  'libnormvol_plugin.dylib',
-  'libparam_eq_plugin.dylib',
-  'libscaletempo_plugin.dylib',
-  'libsimple_channel_mixer_plugin.dylib',
-  'libspatializer_plugin.dylib',
-  'libtrivial_channel_mixer_plugin.dylib',
-  'libugly_resampler_plugin.dylib',
-  'libfloat32_mixer_plugin.dylib',
+  'access/libattachment_plugin.dylib',
+  #'access/libaccess_avio_plugin.dylib',
+  #'access/libaccess_fake_plugin.dylib',
+  'access/libftp_plugin.dylib',
+  'access/libhttp_plugin.dylib',
+  'access/libimem_plugin.dylib',
+  #'access/libaccess_mmap_plugin.dylib',
+  'access/libaccess_mms_plugin.dylib',
+  'access/libaccess_realrtsp_plugin.dylib',
+  'access/libtcp_plugin.dylib',
+  'access/libudp_plugin.dylib',
+  'access/libcdda_plugin.dylib',
+  'access/libfilesystem_plugin.dylib',
+  'access/libqtcapture_plugin.dylib',
+  'access/librtp_plugin.dylib',
+  'access/libzip_plugin.dylib',
+  'access_output/libaccess_output_dummy_plugin.dylib',
+  'access_output/libaccess_output_file_plugin.dylib',
+  'access_output/libaccess_output_http_plugin.dylib',
+  'access_output/libaccess_output_shout_plugin.dylib',
+  'access_output/libaccess_output_udp_plugin.dylib',
+  'audio_filter/liba52tofloat32_plugin.dylib',
+  'audio_filter/liba52tospdif_plugin.dylib',
+  'audio_filter/libaudio_format_plugin.dylib',
+  'audio_filter/libaudiobargraph_a_plugin.dylib',
+  'audio_filter/libchorus_flanger_plugin.dylib',
+  #'libconverter_fixed_plugin.dylib',
+  'audio_filter/libdolby_surround_decoder_plugin.dylib',
+  'audio_filter/libdtstofloat32_plugin.dylib',
+  'audio_filter/libdtstospdif_plugin.dylib',
+  'audio_filter/libequalizer_plugin.dylib',
+  'audio_filter/libheadphone_channel_mixer_plugin.dylib',
+  'audio_filter/libmono_plugin.dylib',
+  'audio_filter/libmpgatofixed32_plugin.dylib',
+  'audio_filter/libnormvol_plugin.dylib',
+  'audio_filter/libparam_eq_plugin.dylib',
+  'audio_filter/libscaletempo_plugin.dylib',
+  'audio_filter/libsimple_channel_mixer_plugin.dylib',
+  'audio_filter/libspatializer_plugin.dylib',
+  'audio_filter/libtrivial_channel_mixer_plugin.dylib',
+  'audio_filter/libugly_resampler_plugin.dylib',
+  'audio_mixer/libfloat_mixer_plugin.dylib',
  #'libspdif_mixer_plugin.dylib',
  #'libtrivial_mixer_plugin.dylib',
-  'libaout_file_plugin.dylib',
-  'libauhal_plugin.dylib',
-  'liba52_plugin.dylib',
-  'libadpcm_plugin.dylib',
-  'libaes3_plugin.dylib',
-  'libaraw_plugin.dylib',
-  'libavcodec_plugin.dylib',
-  'libcc_plugin.dylib',
-  'libcdg_plugin.dylib',
-  'libdts_plugin.dylib',
-  'libfaad_plugin.dylib',
+  #'libaout_file_plugin.dylib',
+  'audio_output/libauhal_plugin.dylib',
+  'codec/liba52_plugin.dylib',
+  'codec/libadpcm_plugin.dylib',
+  'codec/libaes3_plugin.dylib',
+  'codec/libaraw_plugin.dylib',
+  'codec/libavcodec_plugin.dylib',
+  'codec/libcc_plugin.dylib',
+  'codec/libcdg_plugin.dylib',
+  'codec/libdts_plugin.dylib',
+  'codec/libfaad_plugin.dylib',
  #'libfake_plugin.dylib',
-  'libflac_plugin.dylib',
-  'libfluidsynth_plugin.dylib',
+  'codec/libflac_plugin.dylib',
+  #'libfluidsynth_plugin.dylib',
  #'libinvmem_plugin.dylib',
-  'liblpcm_plugin.dylib',
-  'libmpeg_audio_plugin.dylib',
-  'libpng_plugin.dylib',
-  'librawvideo_plugin.dylib',
-  'libspeex_plugin.dylib',
-  'libspudec_plugin.dylib',
-  'libtheora_plugin.dylib',
-  'libtwolame_plugin.dylib',
-  'libvorbis_plugin.dylib',
-  'libgestures_plugin.dylib',
-  'libhotkeys_plugin.dylib',
-  'libmotion_plugin.dylib',
-  'libnetsync_plugin.dylib',
+  'codec/liblpcm_plugin.dylib',
+  'codec/libmpeg_audio_plugin.dylib',
+  'codec/libpng_plugin.dylib',
+  'codec/librawvideo_plugin.dylib',
+  'codec/libspeex_plugin.dylib',
+  'codec/libspudec_plugin.dylib',
+  'codec/libtheora_plugin.dylib',
+  'codec/libtwolame_plugin.dylib',
+  'codec/libvorbis_plugin.dylib',
+  #'control/libgestures_plugin.dylib',
+  #'libhotkeys_plugin.dylib',
+  #'libmotion_plugin.dylib',
+  #'libnetsync_plugin.dylib',
  #'libsignals_plugin.dylib',
-  'libaiff_plugin.dylib',
-  'libasf_plugin.dylib',
-  'libau_plugin.dylib',
+  'demux/libaiff_plugin.dylib',
+  'demux/libasf_plugin.dylib',
+  'demux/libau_plugin.dylib',
  #'libavformat_plugin.dylib',
-  'libavi_plugin.dylib',
-  'libdemux_cdg_plugin.dylib',
-  'libdemuxdump_plugin.dylib',
-  'libdirac_plugin.dylib',
-  'libes_plugin.dylib',
-  'libflacsys_plugin.dylib',
-  'liblive555_plugin.dylib',
-  'libmkv_plugin.dylib',
-  'libmod_plugin.dylib',
-  'libmp4_plugin.dylib',
-  'libmpc_plugin.dylib',
-  'libmpgv_plugin.dylib',
-  'libnsc_plugin.dylib',
-  'libnsv_plugin.dylib',
-  'libnuv_plugin.dylib',
-  'libogg_plugin.dylib',
-  'libplaylist_plugin.dylib',
-  'libps_plugin.dylib',
-  'libpva_plugin.dylib',
-  'librawaud_plugin.dylib',
-  'librawdv_plugin.dylib',
-  'librawvid_plugin.dylib',
-  'libreal_plugin.dylib',
-  'libsmf_plugin.dylib',
-  'libts_plugin.dylib',
-  'libtta_plugin.dylib',
-  'libty_plugin.dylib',
-  'libvc1_plugin.dylib',
-  'libvoc_plugin.dylib',
-  'libwav_plugin.dylib',
-  'libxa_plugin.dylib',
-  'libfolder_plugin.dylib',
-  'libtaglib_plugin.dylib',
-  'libaudioscrobbler_plugin.dylib',
-  'libdummy_plugin.dylib',
-  'libexport_plugin.dylib',
-  'libfreetype_plugin.dylib',
-  'libgnutls_plugin.dylib',
-  'liblogger_plugin.dylib',
-  'liblua_plugin.dylib',
-  'libosd_parser_plugin.dylib',
-  'libquartztext_plugin.dylib',
-  'libstats_plugin.dylib',
-  'libvod_rtsp_plugin.dylib',
-  'libxml_plugin.dylib',
+  'demux/libavi_plugin.dylib',
+  'demux/libdemux_cdg_plugin.dylib',
+  'demux/libdemuxdump_plugin.dylib',
+  'demux/libdiracsys_plugin.dylib',
+  'demux/libes_plugin.dylib',
+  'demux/libflacsys_plugin.dylib',
+  'access/liblive555_plugin.dylib',
+  'demux/libmkv_plugin.dylib',
+  'demux/libmod_plugin.dylib',
+  'demux/libmp4_plugin.dylib',
+  'demux/libmpc_plugin.dylib',
+  'demux/libmpgv_plugin.dylib',
+  'demux/libnsc_plugin.dylib',
+  'demux/libnsv_plugin.dylib',
+  'demux/libnuv_plugin.dylib',
+  'demux/libogg_plugin.dylib',
+  'demux/libplaylist_plugin.dylib',
+  'demux/libps_plugin.dylib',
+  'demux/libpva_plugin.dylib',
+  'demux/librawaud_plugin.dylib',
+  'demux/librawdv_plugin.dylib',
+  'demux/librawvid_plugin.dylib',
+  'demux/libreal_plugin.dylib',
+  'demux/libsmf_plugin.dylib',
+  'demux/libts_plugin.dylib',
+  'demux/libtta_plugin.dylib',
+  'demux/libty_plugin.dylib',
+  'demux/libvc1_plugin.dylib',
+  'demux/libvoc_plugin.dylib',
+  'demux/libwav_plugin.dylib',
+  'demux/libxa_plugin.dylib',
+  'meta_engine/libfolder_plugin.dylib',
+  'meta_engine/libtaglib_plugin.dylib',
+  #'libaudioscrobbler_plugin.dylib',
+  'control/libdummy_plugin.dylib',
+  'misc/libexport_plugin.dylib',
+  #'libfreetype_plugin.dylib',
+  #'libgnutls_plugin.dylib',
+  'misc/liblogger_plugin.dylib',
+  'lua/liblua_plugin.dylib',
+  #'libosd_parser_plugin.dylib',
+  #'libquartztext_plugin.dylib',
+  #'libstats_plugin.dylib',
+  'misc/libvod_rtsp_plugin.dylib',
+  'misc/libxml_plugin.dylib',
  #'libxtag_plugin.dylib',
-  'libi420_rgb_mmx_plugin.dylib',
-  'libi420_yuy2_mmx_plugin.dylib',
-  'libi422_yuy2_mmx_plugin.dylib',
-  'libmemcpymmx_plugin.dylib',
-  'libmemcpymmxext_plugin.dylib',
-  'libmux_asf_plugin.dylib',
-  'libmux_avi_plugin.dylib',
-  'libmux_dummy_plugin.dylib',
-  'libmux_mp4_plugin.dylib',
-  'libmux_mpjpeg_plugin.dylib',
-  'libmux_ogg_plugin.dylib',
-  'libmux_ps_plugin.dylib',
-  'libmux_ts_plugin.dylib',
-  'libmux_wav_plugin.dylib',
-  'libpacketizer_copy_plugin.dylib',
-  'libpacketizer_dirac_plugin.dylib',
-  'libpacketizer_flac_plugin.dylib',
-  'libpacketizer_h264_plugin.dylib',
-  'libpacketizer_mlp_plugin.dylib',
-  'libpacketizer_mpeg4audio_plugin.dylib',
-  'libpacketizer_mpeg4video_plugin.dylib',
-  'libpacketizer_mpegvideo_plugin.dylib',
-  'libpacketizer_vc1_plugin.dylib',
-  'libi420_rgb_sse2_plugin.dylib',
-  'libi420_yuy2_sse2_plugin.dylib',
-  'libi422_yuy2_sse2_plugin.dylib',
-  'libdecomp_plugin.dylib',
-  'libstream_filter_rar_plugin.dylib',
-  'libstream_filter_record_plugin.dylib',
-  'libvisual_plugin.dylib',
+  'video_chroma/libi420_rgb_mmx_plugin.dylib',
+  'video_chroma/libi420_yuy2_mmx_plugin.dylib',
+  'video_chroma/libi422_yuy2_mmx_plugin.dylib',
+  #'libmemcpymmx_plugin.dylib',
+  #'libmemcpymmxext_plugin.dylib',
+  'mux/libmux_asf_plugin.dylib',
+  'mux/libmux_avi_plugin.dylib',
+  'mux/libmux_dummy_plugin.dylib',
+  'mux/libmux_mp4_plugin.dylib',
+  'mux/libmux_mpjpeg_plugin.dylib',
+  'mux/libmux_ogg_plugin.dylib',
+  'mux/libmux_ps_plugin.dylib',
+  'mux/libmux_ts_plugin.dylib',
+  'mux/libmux_wav_plugin.dylib',
+  'packetizer/libpacketizer_copy_plugin.dylib',
+  'packetizer/libpacketizer_dirac_plugin.dylib',
+  'packetizer/libpacketizer_flac_plugin.dylib',
+  'packetizer/libpacketizer_h264_plugin.dylib',
+  'packetizer/libpacketizer_mlp_plugin.dylib',
+  'packetizer/libpacketizer_mpeg4audio_plugin.dylib',
+  'packetizer/libpacketizer_mpeg4video_plugin.dylib',
+  'packetizer/libpacketizer_mpegvideo_plugin.dylib',
+  'packetizer/libpacketizer_vc1_plugin.dylib',
+  'video_chroma/libi420_rgb_sse2_plugin.dylib',
+  'video_chroma/libi420_yuy2_sse2_plugin.dylib',
+  'video_chroma/libi422_yuy2_sse2_plugin.dylib',
+  'stream_filter/libdecomp_plugin.dylib',
+  #'access/libstream_filter_rar_plugin.dylib',
+  'stream_filter/librecord_plugin.dylib',
+  #'libvisual_plugin.dylib',
 ]

 VLC_SEARCH_PATH=[
@@ -199,11 +199,16 @@ QT_PLUGINS = [
    'imageformats/libqmng.dylib',
 ]

+SNORE_PLUGINS = [
+    'libsnore_backend_growl.so',
+    'libsnore_backend_osxnotificationcenter.so',
+]
+
 TOMAHAWK_PLUGINS = [
-  'libtomahawk_account_xmpp.so',
+  'libtomahawk_account_xmpp.dylib',
  'libtomahawk_account_google.so',
-  'libtomahawk_account_twitter.so',
  'libtomahawk_account_zeroconf.so',
+  'libtomahawk_account_hatchet.so',
  'libtomahawk_infoplugin_adium.so',
  'libtomahawk_infoplugin_charts.so',
  'libtomahawk_infoplugin_discogs.so',
@@ -213,13 +218,22 @@ TOMAHAWK_PLUGINS = [
  'libtomahawk_infoplugin_musixmatch.so',
  'libtomahawk_infoplugin_newreleases.so',
  'libtomahawk_infoplugin_rovi.so',
+  'libtomahawk_infoplugin_snorenotify.so',
  'libtomahawk_infoplugin_spotify.so',
+  'libtomahawk_viewpage_dashboard.so',
+#  'libtomahawk_viewpage_networkactivity.so',
+  'libtomahawk_viewpage_charts.so',
+  'libtomahawk_viewpage_newreleases.so',
+  'libtomahawk_viewpage_whatsnew_0_8.so',
 ]

 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/qt/4.8.2/plugins',
+    '/usr/local/Cellar/qt/HEAD/plugins',
 ]

+SNORE_PLUGINS_SEARCH_PATH=[
+    '/usr/local/Cellar/snorenotify/0.5.2/lib/libsnore',
+]

 class Error(Exception):
  pass
@@ -237,6 +251,10 @@ class CouldNotFindQtPluginError(Error):
  pass


+class CouldNotFindSnorePluginError(Error):
+  pass
+
+
 class CouldNotFindVLCPluginError(Error):
  pass

@@ -245,12 +263,10 @@ class CouldNotFindScriptPluginError(Error):
  pass


-
 if len(sys.argv) < 2:
  print 'Usage: %s <bundle.app>' % sys.argv[0]

 bundle_dir = sys.argv[1]
-
 bundle_name = os.path.basename(bundle_dir).split('.')[0]

 commands = []
@@ -258,6 +274,10 @@ commands = []
 binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS')
 frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
 commands.append(['mkdir', '-p', frameworks_dir])
+vlcplugins_dir = os.path.join(frameworks_dir, 'vlc', 'plugins')
+commands.append(['mkdir', '-p', vlcplugins_dir])
+snoreplugins_dir = os.path.join(binary_dir, 'libsnore')
+commands.append(['mkdir', '-p', snoreplugins_dir])
 resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
 commands.append(['mkdir', '-p', resources_dir])
 plugins_dir = os.path.join(bundle_dir, 'Contents', 'qt-plugins')
@@ -369,12 +389,12 @@ def FixLibrary(path):
  for library in broken_libs['libs']:
    FixLibraryInstallPath(library, new_path)

-def FixVLCPlugin(abs_path, subdir):
+def FixVLCPlugin(abs_path):
  broken_libs = GetBrokenLibraries(abs_path)
  FixAllLibraries(broken_libs)

  #print "Copying plugin....%s %s %s" % (plugins_dir, subdir, os.path.join(abs_path.split('/')[-2:]))
-  new_path = os.path.join(plugins_dir, subdir, os.path.basename(abs_path))
+  new_path = os.path.join(vlcplugins_dir, os.path.basename(abs_path))
  args = ['mkdir', '-p', os.path.dirname(new_path)]
  commands.append(args)
  args = ['ditto', '--arch=i386', '--arch=x86_64', abs_path, new_path]
@@ -424,8 +444,10 @@ def CopyPlugin(path, subdir):

 def CopyFramework(path):
  parts = path.split(os.sep)
+  name = ''
  for i, part in enumerate(parts):
    if re.match(r'\w+\.framework', part):
+      name = part[:-10]
      full_path = os.path.join(frameworks_dir, *parts[i:-1])
      break
  args = ['mkdir', '-p', full_path]
@@ -437,9 +459,47 @@ def CopyFramework(path):

  menu_nib = os.path.join(os.path.split(path)[0], 'Resources', 'qt_menu.nib')
  if os.path.exists(menu_nib):
-    args = ['cp', '-r', menu_nib, resources_dir]
+    args = ['cp', '-rf', menu_nib, resources_dir]
    commands.append(args)

+  framework_versions_dir = os.path.join(full_path, '..', '..', 'Versions')
+  framework_resources_current_dir = os.path.join(full_path, 'Resources')
+  framework_resources_main_dir = os.path.join(full_path, '..', '..', 'Resources')
+  framework_current_version = full_path.split(os.sep)[-1]
+
+  # link /Versions/Current to /Versions/$currentVersion
+  args = ['ln', '-Fs', framework_current_version, os.path.join(framework_versions_dir, 'Current')]
+  commands.append(args)
+
+  # Copy Contents/Info.plist to Resources/Info.plist if Resources/Info.plist does not exist
+  # If Contents/Info.plist doesn't exist either, error out. If we actually see this, we can copy QtCore's Info.plist
+  info_plist_in_resources = os.path.join(os.path.split(path)[0], '..', '..', 'Resources', 'Info.plist')
+  if not os.path.exists(info_plist_in_resources):
+    info_plist_in_contents = os.path.join(os.path.split(path)[0], '..', '..', 'Contents', 'Info.plist')
+    args = ['mkdir', '-p', framework_resources_current_dir]
+    commands.append(args)
+    if os.path.exists(info_plist_in_contents):
+      args = ['cp', '-rf', info_plist_in_contents, framework_resources_current_dir]
+      commands.append(args)
+    else:
+      print "%s: Framework does not contain an Info.plist file in Contents/ or Resources/ folder." % (path)
+      sys.exit(-1)
+
+  # link /Resources to /Versions/Current/Resources
+  args = ['ln', '-Fs', 'Versions/Current/Resources', framework_resources_main_dir]
+  commands.append(args)
+
+  # link /$name to /Versions/Current/$name
+  args = ['ln', '-Fs', os.path.join('Versions/Current/', name), os.path.join(full_path, '..', '..', name)]
+  commands.append(args)
+
+  # HACK: CopyFramework is called repeatedly for the same frameworks, but we can't check for the existence of the link from python
+  # as the commands are only executed in the end, that's why we remove wrong symlinks afterwards
+  args = ['rm', '-rf', os.path.join(framework_resources_main_dir, 'Resources')]
+  commands.append(args)
+  args = ['rm', '-rf', os.path.join(framework_versions_dir, 'Current', framework_current_version)]
+  commands.append(args)
+
  return os.path.join(full_path, parts[-1])

 def FixId(path, library_name):
@@ -489,6 +549,12 @@ def FindQtPlugin(name):
        return os.path.join(path, name)
  raise CouldNotFindQtPluginError(name)

+def FindSnorePlugin(name):
+  for path in SNORE_PLUGINS_SEARCH_PATH:
+    if os.path.exists(path):
+      if os.path.exists(os.path.join(path, name)):
+        return os.path.join(path, name)
+  raise CouldNotFindSnorePluginError(name)

 def FindVLCPlugin(name):
  for path in VLC_SEARCH_PATH:
@@ -500,11 +566,14 @@ def FindVLCPlugin(name):
 FixBinary(binary)

 for plugin in VLC_PLUGINS:
-  FixVLCPlugin(FindVLCPlugin(plugin), '../plugins')
+  FixVLCPlugin(FindVLCPlugin(plugin))

 for plugin in TOMAHAWK_PLUGINS:
  FixPlugin(plugin, '../MacOS')

+for plugin in SNORE_PLUGINS:
+  FixPlugin(FindSnorePlugin(plugin), '../MacOS/libsnore')
+
 try:
  FixPlugin('tomahawk_crash_reporter', '../MacOS')
 except:
--- a/admin/unix/tomahawk.desktop
+++ b/admin/unix/tomahawk.desktop
@@ -5,11 +5,17 @@ Name=Tomahawk
 GenericName=Music Player
 GenericName[de]=Musik Player
 GenericName[fi]=Musiikkisoitin
+GenericName[pl]=Odtwarzacz Muzyki
+GenericName[ro]=Redare muzică
+GenericName[se]=Musikspelare
 TryExec=tomahawk
 Exec=tomahawk %u
-Comment=Tomahawk - Social Music Player
+Comment=Tomahawk — Multi Source Music Player
 Comment[fi]=Tomahawk – sosiaalinen musiikkisoitin
+Comment[pl]=Tomahawk – Społecznościowy Odtwarzacz Muzyki
+Comment[ro]=Tomahawk – Redare muzică în mod social
+Comment[se]=Tomahawk — Den Sociala Musikspelaren
 Icon=tomahawk
 Terminal=false
 Categories=Qt;AudioVideo;Audio;Player;
-MimeType=x-scheme-handler/tomahawk;
+MimeType=x-scheme-handler/tomahawk;x-scheme-handler/spotify;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/opus;application/opus;audio/x-vorbis;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg;application/xspf+xml;application/jspf;
--- a/admin/win/Toolchain-mingw32-openSUSE.cmake
+++ b/admin/win/Toolchain-mingw32-openSUSE.cmake
@@ -5,11 +5,11 @@ SET(CMAKE_SYSTEM_NAME Windows)


 # specify the cross compiler
-SET(CMAKE_C_COMPILER ccache ${MINGW_PREFIX}-gcc)
-SET(CMAKE_C_FLAGS "-fno-keep-inline-dllexport")
-SET(CMAKE_CXX_COMPILER ccache ${MINGW_PREFIX}-g++)
-SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
-SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres)
+SET(CMAKE_C_COMPILER ${MINGW_PREFIX}-gcc)
+SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}-g++)
+SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres CACHE FILEPATH "windres")
+SET(CMAKE_AR /usr/bin/${MINGW_PREFIX}-ar CACHE FILEPATH "ar")
+

 # where is the target environment containing libraries
 SET(CMAKE_FIND_ROOT_PATH  /usr/${MINGW_PREFIX}/sys-root/mingw)
@@ -18,6 +18,21 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE  ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)


-# configure qt variables
-SET(QT_LIBRARY_DIR  /usr/${MINGW_PREFIX}/bin)
-SET(QT_PLUGINS_DIR  ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/)
+## configure qt variables
+# generic
+SET(QMAKESPEC               win32-g++-cross)
+
+# dirs
+SET(QT_LIBRARY_DIR          /usr/${MINGW_PREFIX}/bin)
+SET(QT_PLUGINS_DIR          ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins)
+SET(QT_MKSPECS_DIR          ${CMAKE_FIND_ROOT_PATH}/share/qt4/mkspecs)
+SET(QT_QT_INCLUDE_DIR       ${CMAKE_FIND_ROOT_PATH}/include)
+
+SET(QT_QMAKE_EXECUTABLE     /usr/bin/${MINGW_PREFIX}-qmake CACHE FILEPATH "qmake" )
+SET(QT_MOC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-moc CACHE FILEPATH "moc")
+SET(QT_RCC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-rcc CACHE FILEPATH "rcc")
+SET(QT_UIC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-uic CACHE FILEPATH "uic")
+SET(QT_LRELEASE_EXECUTABLE  /usr/bin/${MINGW_PREFIX}-lrelease CACHE FILEPATH "lrelease")
+
+# phonon -_-
+SET(Automoc4_DIR	    "/usr/lib64/automoc4/")
--- a/admin/win/nsi/page_header.bmp
+++ b/admin/win/nsi/page_header.bmp
--- a/admin/win/nsi/welcome.bmp
+++ b/admin/win/nsi/welcome.bmp
--- a/admin/win/update-vlc.sh
+++ b/admin/win/update-vlc.sh
@@ -50,6 +50,7 @@ tar xvjf pvlc.tar.bz2


 # this is for vlc-2.x
+cd vlc/plugins
 rm -rvf \
    video_*/ \
    gui/ \
@@ -68,15 +69,16 @@ rm -rvf \
    services_discovery/ \
    visualization/ \
    control/ \
-    misc/ \
    **/libi420* \
    **/libi422* \
    mux/ \
    stream_filter/ \
    **/libtheora_plugin* \
    **/liblibbluray_plugin* \
-    **/libdtv_plugin*
+    **/libdtv_plugin* \
+    **/*.dll.a \
+    **/*.la \
+    misc/liblogger_plugin*


 echo "Downloaded and stripped VLC"
-
--- a/data/fonts/OFL.txt
+++ b/data/fonts/OFL.txt
@@ -0,0 +1,92 @@
+Copyright (c) 2009-2011 by Accademia di Belle Arti di Urbino and students of MA course of Visual design. Some rights reserved.
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/data/fonts/Roboto-Black.ttf
+++ b/data/fonts/Roboto-Black.ttf
--- a/data/fonts/Roboto-BlackItalic.ttf
+++ b/data/fonts/Roboto-BlackItalic.ttf
--- a/data/fonts/Roboto-Bold.ttf
+++ b/data/fonts/Roboto-Bold.ttf
--- a/data/fonts/Roboto-BoldItalic.ttf
+++ b/data/fonts/Roboto-BoldItalic.ttf
--- a/data/fonts/Roboto-Italic.ttf
+++ b/data/fonts/Roboto-Italic.ttf
--- a/data/fonts/Roboto-Light.ttf
+++ b/data/fonts/Roboto-Light.ttf
--- a/data/fonts/Roboto-LightItalic.ttf
+++ b/data/fonts/Roboto-LightItalic.ttf
--- a/data/fonts/Roboto-Medium.ttf
+++ b/data/fonts/Roboto-Medium.ttf
--- a/data/fonts/Roboto-MediumItalic.ttf
+++ b/data/fonts/Roboto-MediumItalic.ttf
--- a/data/fonts/Roboto-Regular.ttf
+++ b/data/fonts/Roboto-Regular.ttf
--- a/data/fonts/Roboto-Thin.ttf
+++ b/data/fonts/Roboto-Thin.ttf
--- a/data/fonts/Roboto-ThinItalic.ttf
+++ b/data/fonts/Roboto-ThinItalic.ttf
--- a/data/fonts/RobotoCondensed-Bold.ttf
+++ b/data/fonts/RobotoCondensed-Bold.ttf
--- a/data/fonts/RobotoCondensed-BoldItalic.ttf
+++ b/data/fonts/RobotoCondensed-BoldItalic.ttf
--- a/data/fonts/RobotoCondensed-Italic.ttf
+++ b/data/fonts/RobotoCondensed-Italic.ttf
--- a/data/fonts/RobotoCondensed-Light.ttf
+++ b/data/fonts/RobotoCondensed-Light.ttf
--- a/data/fonts/RobotoCondensed-LightItalic.ttf
+++ b/data/fonts/RobotoCondensed-LightItalic.ttf
--- a/data/fonts/RobotoCondensed-Regular.ttf
+++ b/data/fonts/RobotoCondensed-Regular.ttf
--- a/data/icons/tomahawk-grayscale-icon-128x128.png
+++ b/data/icons/tomahawk-grayscale-icon-128x128.png
--- a/data/icons/tomahawk-icon-1024x1024.png
+++ b/data/icons/tomahawk-icon-1024x1024.png
--- a/data/icons/tomahawk-icon-128x128-grayscale.png
+++ b/data/icons/tomahawk-icon-128x128-grayscale.png
--- a/data/icons/tomahawk-icon-128x128.png
+++ b/data/icons/tomahawk-icon-128x128.png
--- a/data/icons/tomahawk-icon-16x16.png
+++ b/data/icons/tomahawk-icon-16x16.png
--- a/data/icons/tomahawk-icon-256x256.png
+++ b/data/icons/tomahawk-icon-256x256.png
--- a/data/icons/tomahawk-icon-32x32.png
+++ b/data/icons/tomahawk-icon-32x32.png
--- a/data/icons/tomahawk-icon-512x512.png
+++ b/data/icons/tomahawk-icon-512x512.png
--- a/data/icons/tomahawk-icon-64x64.png
+++ b/data/icons/tomahawk-icon-64x64.png
--- a/data/icons/tomahawk-icon.svg
+++ b/data/icons/tomahawk-icon.svg
@@ -1,101 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="606.248px" height="595.5px" viewBox="0 0 606.248 595.5" enable-background="new 0 0 606.248 595.5" xml:space="preserve">
-<g id="Layer_3">
-	<rect x="-20.376" y="-15.75" stroke="#E63E30" stroke-miterlimit="10" width="688" height="700"/>
-</g>
-<g id="Layer_2">
-	<path id="path9_1_" inkscape:connector-curvature="0" fill="none" stroke="#E63E30" stroke-miterlimit="10" d="M429.977,493.576
-		V154.483h-65.371h-6.949v115.065L194.409,156.07c-2.608-1.802-6.036-2.046-8.93-0.661c-2.895,1.493-4.692,4.437-4.692,7.56v266.003
-		c0,3.123,1.798,6.037,4.692,7.488c1.234,0.695,2.608,0.977,3.953,0.977c1.725,0,3.522-0.561,4.977-1.529l163.248-113.472v201.091
-		c-17.532,4.084-35.744,6.375-54.511,6.375c-130.896,0-237.345-104.598-237.345-233.146c0-128.547,106.442-233.117,237.345-233.117
-		c130.858,0,237.344,104.562,237.344,233.116C540.482,379.515,496.305,452.197,429.977,493.576L429.977,493.576z"/>
-	<ellipse fill="#FFFFFF" stroke="#E63E30" stroke-miterlimit="10" cx="318.624" cy="295.75" rx="286" ry="270.5"/>
-</g>
-<g id="Layer_1" sodipodi:docname="tomahawk-icon.svg" inkscape:version="0.48.2 r9819" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
-	
-		<sodipodi:namedview  fit-margin-bottom="0" fit-margin-right="0" inkscape:snap-page="false" inkscape:current-layer="Layer_1" inkscape:window-maximized="0" inkscape:window-y="0" inkscape:window-x="0" inkscape:window-height="794" inkscape:window-width="1440" inkscape:pageshadow="2" inkscape:pageopacity="0" fit-margin-left="0" fit-margin-top="0" inkscape:cy="336.94553" inkscape:cx="431.12548" inkscape:zoom="1" showgrid="false" guidetolerance="10" gridtolerance="10" objecttolerance="10" bordercolor="#666666" pagecolor="#ffffff" borderopacity="1" id="namedview11">
-		<sodipodi:guide  orientation="0,841.89001" position="-3.5728101e-05,-1.501866e-05" id="guide2994"></sodipodi:guide>
-		<sodipodi:guide  orientation="-595.28003,0" position="841.88997,-1.501866e-05" id="guide2996"></sodipodi:guide>
-		<sodipodi:guide  orientation="0,-841.89001" position="841.88997,595.28001" id="guide2998"></sodipodi:guide>
-		<sodipodi:guide  orientation="595.28003,0" position="-3.5728101e-05,595.28001" id="guide3000"></sodipodi:guide>
-	</sodipodi:namedview>
-	<g id="g3_1_" transform="matrix(7.3080643,0,0,7.1790074,-2773.1692,-1839.0104)">
-		<g>
-			<g enable-background="new    ">
-				<g>
-					<polygon fill="#4C1410" points="430.355,293.516 429.444,293.909 429.416,279.061 430.323,277.603 					"/>
-				</g>
-				<g>
-					<polygon fill="#4C1410" points="430.428,328.913 429.507,326.921 429.457,300.757 430.371,300.856 					"/>
-				</g>
-				<g enable-background="new    ">
-					<defs>
-						<path id="SVGID_1_" enable-background="new    " d="M440.229,324.595l-1.574-1.692c2.083-1.367,3.987-2.983,5.669-4.803
-							c1.678-1.816,3.136-3.836,4.332-6.018c1.194-2.177,2.127-4.516,2.758-6.973c0.63-2.454,0.959-5.028,0.945-7.679
-							c-0.022-4.114-0.867-8.035-2.377-11.605c-1.51-3.571-3.686-6.797-6.372-9.519c-2.69-2.726-5.895-4.949-9.458-6.505
-							c-3.573-1.561-7.51-2.454-11.652-2.511c-4.16-0.058-8.14,0.731-11.777,2.212c-3.65,1.486-6.953,3.668-9.739,6.386
-							c-2.795,2.728-5.069,5.995-6.649,9.637c-1.584,3.651-2.47,7.677-2.486,11.907c-0.016,4.236,0.842,8.276,2.405,11.95
-							c1.563,3.673,3.829,6.974,6.627,9.736c2.794,2.757,6.114,4.973,9.791,6.483c3.666,1.506,7.683,2.31,11.88,2.251
-							c0.601-0.008,1.197-0.036,1.787-0.08c0.59-0.045,1.176-0.107,1.756-0.186c0.58-0.079,1.154-0.174,1.723-0.286
-							c0.569-0.111,1.132-0.238,1.689-0.379l0.921,1.992c-0.597,0.152-1.201,0.288-1.81,0.408c-0.61,0.12-1.226,0.223-1.847,0.308
-							c-0.622,0.085-1.249,0.153-1.883,0.201c-0.634,0.049-1.272,0.078-1.917,0.088c-4.502,0.068-8.811-0.79-12.745-2.404
-							c-3.946-1.618-7.511-3.994-10.51-6.951c-3.004-2.963-5.437-6.506-7.115-10.448c-1.678-3.944-2.599-8.28-2.58-12.827
-							c0.018-4.54,0.971-8.86,2.673-12.777c1.698-3.907,4.139-7.409,7.141-10.333c2.99-2.913,6.534-5.249,10.45-6.838
-							c3.9-1.583,8.167-2.424,12.626-2.357c4.439,0.066,8.656,1.027,12.483,2.703c3.815,1.671,7.247,4.055,10.127,6.976
-							c2.875,2.916,5.205,6.373,6.822,10.198c1.616,3.824,2.522,8.023,2.548,12.43c0.016,2.84-0.335,5.597-1.008,8.226
-							c-0.674,2.633-1.672,5.139-2.949,7.472c-1.279,2.338-2.839,4.504-4.636,6.452C444.498,321.393,442.46,323.127,440.229,324.595
-							z"/>
-					</defs>
-					<clipPath id="SVGID_2_">
-						<use xlink:href="#SVGID_1_"  overflow="visible"/>
-					</clipPath>
-					<g clip-path="url(#SVGID_2_)" enable-background="new    ">
-						<path fill="#4D1510" d="M440.229,324.595l-1.574-1.692c2.083-1.367,3.987-2.983,5.669-4.803
-							c1.678-1.816,3.136-3.836,4.332-6.018c1.194-2.177,2.127-4.516,2.758-6.973c0.63-2.454,0.959-5.028,0.945-7.679
-							c-0.022-4.114-0.867-8.035-2.377-11.605c-1.51-3.571-3.686-6.797-6.372-9.519c-2.69-2.726-5.895-4.949-9.458-6.505
-							c-3.573-1.561-7.51-2.454-11.652-2.511c-4.16-0.058-8.14,0.731-11.777,2.212c-3.65,1.486-6.953,3.668-9.739,6.386
-							c-2.795,2.728-5.069,5.995-6.649,9.637c-1.584,3.651-2.47,7.677-2.486,11.907c-0.016,4.236,0.842,8.276,2.405,11.95
-							c1.563,3.673,3.829,6.974,6.627,9.736c2.794,2.757,6.114,4.973,9.791,6.483c3.666,1.506,7.683,2.31,11.88,2.251
-							c0.601-0.008,1.197-0.036,1.787-0.08c0.59-0.045,1.176-0.107,1.756-0.186c0.58-0.079,1.154-0.174,1.723-0.286
-							c0.569-0.111,1.132-0.238,1.689-0.379l0.921,1.992c-0.597,0.152-1.201,0.288-1.81,0.408c-0.61,0.12-1.226,0.223-1.847,0.308
-							c-0.622,0.085-1.249,0.153-1.883,0.201c-0.634,0.049-1.272,0.078-1.917,0.088c-4.502,0.068-8.811-0.79-12.745-2.404
-							c-3.946-1.618-7.511-3.994-10.51-6.951c-3.004-2.963-5.437-6.506-7.115-10.448c-1.678-3.944-2.599-8.28-2.58-12.827
-							c0.018-4.54,0.971-8.86,2.673-12.777c1.698-3.907,4.139-7.409,7.141-10.333c2.99-2.913,6.534-5.249,10.45-6.838
-							c3.9-1.583,8.167-2.424,12.626-2.357c4.439,0.066,8.656,1.027,12.483,2.703c3.815,1.671,7.247,4.055,10.127,6.976
-							c2.875,2.916,5.205,6.373,6.822,10.198c1.616,3.824,2.522,8.023,2.548,12.43c0.016,2.84-0.335,5.597-1.008,8.226
-							c-0.674,2.633-1.672,5.139-2.949,7.472c-1.279,2.338-2.839,4.504-4.636,6.452C444.498,321.393,442.46,323.127,440.229,324.595
-							"/>
-					</g>
-				</g>
-				<g>
-					<path fill="#E53E30" d="M422.903,256.08c5.658,0.108,11.029,1.353,15.897,3.504c4.85,2.143,9.21,5.189,12.868,8.915
-						c3.65,3.717,6.608,8.117,8.662,12.983c2.053,4.864,3.208,10.204,3.247,15.808c0.04,5.613-1.043,10.98-3.039,15.883
-						c-2.002,4.92-4.927,9.381-8.565,13.159c-3.654,3.795-8.032,6.904-12.92,9.095c-4.913,2.202-10.344,3.478-16.073,3.588
-						c-5.761,0.111-11.281-0.966-16.325-3.014c-5.064-2.056-9.641-5.088-13.494-8.871c-3.862-3.792-6.988-8.332-9.143-13.388
-						c-2.155-5.058-3.333-10.622-3.302-16.455c0.032-5.822,1.266-11.358,3.463-16.374c2.19-4.998,5.333-9.474,9.191-13.203
-						c3.84-3.711,8.385-6.68,13.4-8.69C411.761,257.022,417.213,255.972,422.903,256.08z M440.229,324.595
-						c2.231-1.468,4.269-3.201,6.069-5.154c1.796-1.948,3.356-4.114,4.636-6.452c1.277-2.334,2.274-4.84,2.949-7.472
-						c0.673-2.629,1.024-5.386,1.008-8.226c-0.025-4.407-0.931-8.606-2.548-12.43c-1.617-3.826-3.947-7.282-6.822-10.198
-						c-2.88-2.922-6.312-5.305-10.127-6.976c-3.827-1.676-8.044-2.637-12.483-2.703c-4.458-0.067-8.726,0.775-12.626,2.357
-						c-3.916,1.589-7.46,3.925-10.45,6.838c-3.001,2.924-5.443,6.426-7.141,10.333c-1.702,3.917-2.655,8.237-2.673,12.777
-						c-0.018,4.547,0.902,8.884,2.58,12.827c1.678,3.942,4.111,7.485,7.115,10.448c2.999,2.957,6.563,5.333,10.51,6.951
-						c3.934,1.613,8.243,2.471,12.745,2.404c0.644-0.01,1.283-0.039,1.917-0.088c0.633-0.049,1.261-0.116,1.883-0.201
-						c0.622-0.085,1.237-0.188,1.847-0.308c0.609-0.12,1.213-0.256,1.81-0.408l-0.057-28.056l-22.413,16.004
-						c-0.051,0.034-0.104,0.065-0.16,0.092c-0.056,0.027-0.113,0.05-0.172,0.069c-0.059,0.019-0.119,0.033-0.179,0.043
-						c-0.06,0.01-0.121,0.016-0.18,0.016c-0.047,0.001-0.094-0.001-0.141-0.006c-0.047-0.005-0.094-0.012-0.14-0.023
-						c-0.046-0.011-0.092-0.024-0.137-0.041c-0.045-0.017-0.089-0.037-0.132-0.061c-0.1-0.05-0.191-0.114-0.271-0.187
-						c-0.08-0.074-0.149-0.157-0.205-0.249c-0.056-0.091-0.1-0.19-0.13-0.294s-0.045-0.212-0.045-0.322l0.06-37.332
-						c0-0.109,0.016-0.216,0.046-0.319c0.03-0.103,0.074-0.201,0.13-0.292c0.056-0.091,0.125-0.175,0.205-0.249
-						c0.08-0.074,0.17-0.138,0.27-0.189c0.043-0.02,0.087-0.038,0.131-0.053s0.09-0.028,0.135-0.037
-						c0.046-0.01,0.091-0.017,0.137-0.022c0.046-0.005,0.092-0.007,0.138-0.006c0.061,0.001,0.122,0.006,0.183,0.015
-						c0.06,0.01,0.12,0.024,0.178,0.042c0.058,0.018,0.116,0.042,0.171,0.069c0.055,0.027,0.109,0.059,0.161,0.095l22.346,15.897
-						l-0.033-15.913l0.94,0.009l8.801,0.081L440.229,324.595"/>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>tomahawk-icon-512x512</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="Oval-1-+-Shape" sketch:type="MSLayerGroup" transform="translate(18.000000, 19.000000)">
+            <g id="Oval-1" transform="translate(0.927734, 0.927734)" fill-opacity="0.9" fill="#FFFFFF" sketch:type="MSShapeGroup">
+                <path d="M236.572266,473.144531 C367.227527,473.144531 473.144531,367.227527 473.144531,236.572266 C473.144531,105.917005 367.227527,0 236.572266,0 C105.917005,0 0,105.917005 0,236.572266 C0,367.227527 105.917005,473.144531 236.572266,473.144531 Z"></path>
+            </g>
+            <path d="M237.385542,0 C106.48012,0 -1.70530257e-13,106.48012 -1.70530257e-13,237.356928 C-1.70530257e-13,368.239458 106.48012,474.713855 237.385542,474.713855 C368.262349,474.713855 474.748193,368.239458 474.748193,237.356928 C474.74247,106.48012 368.262349,0 237.385542,0 L237.385542,0 Z M336.706325,394.261446 L336.706325,123.946386 L285.51506,123.946386 L280.07259,123.946386 L280.07259,215.672892 L152.234639,125.211145 C150.191566,123.774699 147.50753,123.58012 145.241265,124.684639 C142.975,125.875 141.567169,128.221386 141.567169,130.710843 L141.567169,342.761145 C141.567169,345.250602 142.975,347.574096 145.241265,348.73012 C146.208434,349.285241 147.284337,349.508434 148.337349,349.508434 C149.687952,349.508434 151.095783,349.062048 152.234639,348.289458 L280.07259,257.833434 L280.07259,418.137349 C266.343373,421.393675 252.081928,423.219277 237.385542,423.219277 C134.882831,423.219277 51.5231928,339.836747 51.5231928,237.362651 C51.5231928,134.888554 134.877108,51.5289157 237.385542,51.5289157 C339.859639,51.5289157 423.247892,134.882831 423.247892,237.362651 C423.242169,303.336145 388.647289,361.274699 336.706325,394.261446 L336.706325,394.261446 Z" id="Shape" fill="#FF004C" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
--- a/data/icons/tomahawk-white-icon-128x128.png
+++ b/data/icons/tomahawk-white-icon-128x128.png
--- a/data/images/account-none.png
+++ b/data/images/account-none.png
--- a/data/images/account-none.svg
+++ b/data/images/account-none.svg
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="55px" height="55px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>account-none</title>
+<svg width="63px" height="63px" viewBox="0 0 63 63" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>Slice 1</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
    <defs>
-        <radialGradient cx="50%" cy="42.571189%" fx="50%" fy="42.571189%" r="57.428813%" id="radialGradient-1">
-            <stop stop-color="rgb(113,114,112)" offset="0%"></stop>
-            <stop stop-color="rgb(60,60,60)" offset="100%"></stop>
+        <radialGradient cx="50%" cy="0%" fx="50%" fy="0%" r="50%" id="radialGradient-1">
+            <stop stop-color="#000000" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" offset="100%"></stop>
        </radialGradient>
    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="g430" fill="rgb(0,0,0)">
-            <path d="M6.25636752,11.5187741 C4.20816486,14.5775092 3,18.3321999 3,22.3856982 C3,31.7567891 9.30999994,39.4618424 17.6929998,40.778919 L17.6929998,49.303531 C17.6929998,50.1410367 18.2039998,50.8957889 18.9839998,51.2088565 C19.2339998,51.3085596 19.4939998,51.356417 19.7519999,51.356417 C20.3029999,51.356417 20.8429998,51.1360733 21.2399999,50.7242996 L22.9542104,48.9393602 L30.5949994,40.98331 L35.5949994,40.98331 C45.0989991,40.98331 52.8309995,32.6411552 52.8309995,22.385698 C52.8319998,12.131227 45.0989981,3.78908268 35.5950003,3.78908268 L20.2360001,3.78908268 C14.488848,3.78908268 9.3896678,6.83958098 6.25636752,11.5187741 Z M6.25636752,11.5187741" id="path432" fill="url(#radialGradient-1)"></path>
-        </g>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M39.4882425,50.1164605 L31,62 L22.2995024,49.8193034 C9.95141137,46.556924 1,36.9024496 1,25.5 C1,11.4167382 14.6553143,0 31.5,0 C48.3446857,0 62,11.4167382 62,25.5 C62,37.2723466 52.4583986,47.1814694 39.4882425,50.1164605 Z" id="Triangle-1" fill="#000000" sketch:type="MSShapeGroup"></path>
+        <path d="M4.5,62 L56.5,62" id="Line" stroke="url(#radialGradient-1)" stroke-width="2" stroke-linecap="square" sketch:type="MSShapeGroup"></path>
    </g>
 </svg>
--- a/data/images/account-offline.png
+++ b/data/images/account-offline.png
--- a/data/images/account-offline.svg
+++ b/data/images/account-offline.svg
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="55px" height="55px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>account-offline</title>
+<svg width="63px" height="63px" viewBox="0 0 63 63" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>Slice 1</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
    <defs>
-        <radialGradient cx="50%" cy="40.9965298%" fx="50%" fy="40.9965298%" r="132.924116%" id="radialGradient-1">
-            <stop stop-color="rgb(254,255,254)" offset="0%"></stop>
-            <stop stop-color="rgb(178,177,177)" offset="100%"></stop>
+        <radialGradient cx="50%" cy="0%" fx="50%" fy="0%" r="50%" id="radialGradient-1">
+            <stop stop-color="#000000" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" offset="100%"></stop>
        </radialGradient>
    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="g430" fill="rgb(0,0,0)">
-            <path d="M6.25636752,11.5187741 C4.20816486,14.5775092 3,18.3321999 3,22.3856982 C3,31.7567891 9.30999994,39.4618424 17.6929998,40.778919 L17.6929998,49.303531 C17.6929998,50.1410367 18.2039998,50.8957889 18.9839998,51.2088565 C19.2339998,51.3085596 19.4939998,51.356417 19.7519999,51.356417 C20.3029999,51.356417 20.8429998,51.1360733 21.2399999,50.7242996 L22.9542104,48.9393602 L30.5949994,40.98331 L35.5949994,40.98331 C45.0989991,40.98331 52.8309995,32.6411552 52.8309995,22.385698 C52.8319998,12.131227 45.0989981,3.78908268 35.5950003,3.78908268 L20.2360001,3.78908268 C14.488848,3.78908268 9.3896678,6.83958098 6.25636752,11.5187741 Z M6.25636752,11.5187741" id="path432" stroke="rgb(0,0,0)" stroke-width="0.25" fill="url(#radialGradient-1)"></path>
-        </g>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M39.4882425,50.1164605 L31,62 L22.2995024,49.8193034 C9.95141137,46.556924 1,36.9024496 1,25.5 C1,11.4167382 14.6553143,0 31.5,0 C48.3446857,0 62,11.4167382 62,25.5 C62,37.2723466 52.4583986,47.1814694 39.4882425,50.1164605 Z" id="Triangle-1" fill="#D6D6D6" sketch:type="MSShapeGroup"></path>
+        <path d="M4.5,62 L56.5,62" id="Line" stroke="url(#radialGradient-1)" stroke-width="2" stroke-linecap="square" sketch:type="MSShapeGroup"></path>
    </g>
 </svg>
--- a/data/images/account-online.png
+++ b/data/images/account-online.png
--- a/data/images/account-online.svg
+++ b/data/images/account-online.svg
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="55px" height="55px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>account-online</title>
+<svg width="63px" height="63px" viewBox="0 0 63 63" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>Slice 1</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="g430" fill="rgb(113,175,250)">
-            <path d="M5.25636752,11.5187741 C3.20816486,14.5775092 2,18.3321999 2,22.3856982 C2,31.7567891 8.30999994,39.4618424 16.6929998,40.778919 L16.6929998,49.303531 C16.6929998,50.1410367 17.2039998,50.8957889 17.9839998,51.2088565 C18.2339998,51.3085596 18.4939998,51.356417 18.7519999,51.356417 C19.3029999,51.356417 19.8429998,51.1360733 20.2399999,50.7242996 L21.9542104,48.9393602 L29.5949994,40.98331 L34.5949994,40.98331 C44.0989991,40.98331 51.8309995,32.6411552 51.8309995,22.385698 C51.8319998,12.131227 44.0989981,3.78908268 34.5950003,3.78908268 L19.2360001,3.78908268 C13.488848,3.78908268 8.3896678,6.83958098 5.25636752,11.5187741 Z M5.25636752,11.5187741" id="path432"></path>
-        </g>
+    <defs>
+        <radialGradient cx="50%" cy="0%" fx="50%" fy="0%" r="50%" id="radialGradient-1">
+            <stop stop-color="#000000" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M39.4882425,50.1164605 L31,62 L22.2995024,49.8193034 C9.95141137,46.556924 1,36.9024496 1,25.5 C1,11.4167382 14.6553143,0 31.5,0 C48.3446857,0 62,11.4167382 62,25.5 C62,37.2723466 52.4583986,47.1814694 39.4882425,50.1164605 Z" id="Triangle-1" fill="#198DE7" sketch:type="MSShapeGroup"></path>
+        <path d="M4.5,62 L56.5,62" id="Line" stroke="url(#radialGradient-1)" stroke-width="2" stroke-linecap="square" sketch:type="MSShapeGroup"></path>
    </g>
 </svg>
--- a/data/images/account-settings.png
+++ b/data/images/account-settings.png
--- a/data/images/account-settings.svg
+++ b/data/images/account-settings.svg
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="51px" height="51px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>account-settings</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="173.920641%" id="linearGradient-1">
-            <stop stop-color="rgb(123,125,121)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M42.6990051,13.3120117 L34.1450043,21.8679199 L31.2910004,19.3811035 L40.029007,10.6398926 L41.1909943,7.73510742 L44.7319946,5.10107422 L48.2409973,8.60595703 L45.6109924,12.1420898 Z M47.8320007,37.1010742 C50.8619995,40.1311035 50.8609924,45.0620117 47.830001,48.094075 C46.3610006,49.5630749 44.4080008,50.3710749 42.3320008,50.3710749 C40.2560008,50.3710749 38.3050009,49.563075 36.8050009,48.061075 L18.6350008,27.2010744 C16.945001,27.5510744 15.2170009,27.7350744 13.6140009,27.7350744 L13.6130009,27.7350744 C9.79200126,27.7350744 6.73800124,26.7000743 4.77900125,24.7420743 C1.4870012,21.4480747 0.0610011965,16.7530745 0.967001215,12.1790746 C1.01600121,11.9290746 1.19800121,11.7300746 1.4380012,11.6580746 C1.67900117,11.5850746 1.94000117,11.6500746 2.12000118,11.8290746 L8.08200108,17.7890746 L13.8480009,18.9820746 L18.7180008,14.1140746 L17.5240007,8.34707436 L11.5620009,2.38407454 C11.3840009,2.20707455 11.3190009,1.94407453 11.3920009,1.70407453 C11.4660009,1.46207453 11.6650009,1.28207453 11.9130009,1.23207453 C12.8040009,1.05607454 13.7180009,0.965074539 14.629001,0.965074539 C18.3490008,0.965074539 21.8470007,2.41407442 24.4750007,5.04507446 C28.4720007,9.04007435 27.4830007,16.2210746 26.9350007,18.8990746 L31.4470008,22.8290746 L32.0090008,23.3190746 Z M43.7059937,43.9680176 C42.9479936,44.7270176 41.7209936,44.7270176 40.9629936,43.9690176 L40.9619936,43.9680176 C40.2049936,43.2100176 40.2049936,41.9810176 40.9619936,41.2240176 C41.7199936,40.4680176 42.9479936,40.4680176 43.7059936,41.2260176 L43.7069936,41.2260176 C44.4629974,41.9829102 44.4629974,43.2099609 43.7059937,43.9680176 Z M17.6609955,30.9750977 L21.8529949,35.8560972 C22.5449949,36.5490971 22.5449949,37.6720971 21.8529949,38.3640971 L10.574995,49.6410975 C9.88099515,50.3320975 8.75899512,50.3320975 8.06699514,49.6410975 L3.53299522,45.1050978 C2.84099525,44.4110978 2.84099525,43.2890978 3.53299522,42.5980978 L15.1539955,30.9750977 C15.8469955,30.2830977 16.9689955,30.2830977 17.6609955,30.9750977 Z M17.6609955,30.9750977" id="Shape" fill="url(#linearGradient-1)"></path>
-    </g>
-</svg>
--- a/data/images/add-contact.png
+++ b/data/images/add-contact.png
--- a/data/images/add-contact.svg
+++ b/data/images/add-contact.svg
@@ -1,20 +1,77 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>add-contact</title>
+    <title>Slice 1</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="rgb(95,88,88)" offset="0%"></stop>
-            <stop stop-color="rgb(34,31,31)" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="173.920641%" id="linearGradient-2">
-            <stop stop-color="rgb(123,125,121)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)">
-            <path d="M41.7720032,33.5539551 C35.769989,34.1109619 31.052002,39.1710205 31.0530045,45.3179558 C31.0530045,47.0919557 31.4560045,48.7689556 32.1580045,50.2799557 L24.0980041,50.2799557 C24.0580041,50.2919557 24.0180041,50.2979557 23.9740041,50.2979557 L9.86000377,50.2979557 C9.73200378,50.2979557 9.60800378,50.2459557 9.51900378,50.1529557 C9.42900378,50.0609557 9.37900378,49.9379557 9.38200378,49.8099557 C9.5860033,40.1639548 13.6520033,32.344955 20.2560034,28.897955 C20.4300034,28.808955 20.6390034,28.832955 20.7870034,28.958955 C22.2620035,30.2229551 24.0390035,31.1019551 25.9240035,31.4979551 C25.9260033,31.4979551 26.8810034,31.680955 28.2380034,31.680955 C29.0350033,31.680955 29.8120033,31.618955 30.5480033,31.496955 C32.4120032,31.1009549 34.1890031,30.221955 35.6620032,28.9589549 C35.8100032,28.8329549 36.0190032,28.8079549 36.1930032,28.8979549 C38.3370032,30.0169551 40.2090032,31.6009551 41.7720032,33.5539551 Z M28.2260132,28.9150391 C22.1520081,28.9150391 17.2109985,23.8580322 17.211013,17.643039 C17.211013,15.2640388 17.9400131,13.0580389 19.1740131,11.2380388 C19.2140131,11.1140388 19.2780131,10.9950388 19.3690131,10.8910388 C19.4080131,10.8460388 19.4590131,10.8220388 19.5040131,10.7870388 C21.5200133,8.10803878 24.6740131,6.37203884 28.2260132,6.37203884 C34.3000126,6.37203884 39.2390127,11.4290385 39.2390127,17.6430387 C39.2390127,23.8580389 34.2990131,28.9150391 28.2260132,28.9150391 Z M44.8389893,36.3830566 C50.303009,36.3830566 54.7520142,40.8299561 54.7519894,46.2940569 C54.7519894,51.7610569 50.3029895,56.207057 44.8389893,56.207057 C39.3719893,56.207057 34.9259892,51.7610569 34.9259892,46.2940569 C34.9259892,40.8300567 39.3719893,36.3830566 44.8389893,36.3830566 Z M44.8389893,54.6779785 C40.2149892,54.6779785 36.453989,50.9169786 36.453989,46.2939787 C36.453989,41.6719785 40.2149889,37.9119787 44.8389893,37.9119787 C49.4609895,37.9119787 53.2209892,41.6719787 53.2209892,46.2939787 C53.2210083,50.9169922 49.4609985,54.6779785 44.8389893,54.6779785 Z M46.1209874,45.1409912 L46.1209874,41.3059912 C46.1209874,40.9709912 45.8499874,40.6989912 45.5169874,40.6989912 L44.3059875,40.6989912 C43.9749875,40.6989912 43.7019875,40.9709912 43.7019875,41.3059912 L43.7019875,45.1409912 L40.0379875,45.1409912 C39.7019875,45.1409912 39.4319875,45.4119912 39.4319875,45.7469912 L39.4319875,46.8789912 C39.4319875,47.2139912 39.7029875,47.4849912 40.0379875,47.4849912 L43.7019875,47.4849912 L43.7019875,51.3579911 C43.7019875,51.6919911 43.9749875,51.9629911 44.3059875,51.9629911 L45.5169874,51.9629911 C45.8509874,51.9629911 46.1209874,51.6919911 46.1209874,51.3579911 L46.1209874,47.4849912 L49.7869873,47.4849912 C50.1209873,47.4849912 50.3919873,47.2139912 50.3919873,46.8789912 L50.3919873,45.7469912 C50.3930054,45.4110107 50.1210022,45.1409912 49.7869873,45.1409912 Z M46.1209874,45.1409912" id="Shape" fill="url(#linearGradient-2)"></path>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="icon_Connect1" sketch:type="MSLayerGroup">
+            <g id="Layer_2"></g>
+            <g id="Layer_3"></g>
+            <g id="Layer_4"></g>
+            <g id="Layer_5"></g>
+            <g id="Layer_6"></g>
+            <g id="Layer_8"></g>
+            <g id="Layer_9"></g>
+            <g id="Layer_10"></g>
+            <g id="Layer_11"></g>
+            <g id="Layer_12"></g>
+            <g id="Layer_13"></g>
+            <g id="Layer_14"></g>
+            <g id="Layer_15"></g>
+            <g id="Layer_16"></g>
+            <g id="Layer_17"></g>
+            <g id="Layer_18"></g>
+            <g id="Layer_19"></g>
+            <g id="Layer_20"></g>
+            <g id="Layer_21"></g>
+            <g id="Layer_24"></g>
+            <g id="Layer_25"></g>
+            <g id="Layer_26"></g>
+            <g id="Layer_27"></g>
+            <g id="Layer_28"></g>
+            <g id="Layer_29"></g>
+            <g id="Layer_47"></g>
+            <g id="Layer_30"></g>
+            <g id="Layer_31"></g>
+            <g id="Layer_32"></g>
+            <g id="Layer_33"></g>
+            <g id="Layer_34"></g>
+            <g id="Layer_35"></g>
+            <g id="Layer_36"></g>
+            <g id="Layer_37"></g>
+            <g id="Layer_38"></g>
+            <g id="Layer_39"></g>
+            <g id="Layer_40"></g>
+            <g id="Layer_41"></g>
+            <g id="Layer_42"></g>
+            <g id="Layer_43"></g>
+            <g id="Layer_44"></g>
+            <g id="Layer_45"></g>
+            <g id="Layer_46"></g>
+            <g id="Layer_48"></g>
+            <g id="Layer_49"></g>
+            <g id="Layer_51"></g>
+            <g id="Layer_52"></g>
+            <g id="Layer_53"></g>
+            <g id="Layer_54" fill="#000000" sketch:type="MSShapeGroup">
+                <g id="Group">
+                    <path d="M36,32.25 C35.25,33 34.5,33.375 34.125,34.125 C31.875,36 30,38.25 28.125,40.125 C25.125,37.5 22.5,34.5 19.875,31.875 L21.375,30.375 L27.75,24 C28.5,23.25 28.5,22.125 27.75,21.375 C27.375,20.625 26.25,20.625 25.5,21.375 C25.125,21.75 24.75,22.125 24.375,22.125 L16.875,29.625 C16.125,28.5 15.375,27.75 14.25,26.625 C12,29.25 9.375,31.5 7.5,34.125 C5.625,36.375 5.25,39 5.625,42 C5.625,44.25 6.75,46.5 7.875,48.375 L0.375,55.875 L4.125,59.625 L11.625,52.125 C16.125,54.75 20.625,55.125 25.5,52.5 C28.875,50.625 30.75,47.625 33.75,45 C32.625,44.25 31.875,43.125 30.75,42.375 L34.125,39 C35.625,37.5 37.125,36 39,34.5 C39.75,33.75 40.125,32.625 39.375,31.875 C37.875,31.5 36.75,31.5 36,32.25 L36,32.25 Z" id="Shape"></path>
+                    <path d="M60,3.75 L56.25,0 L48.75,7.5 C48.375,7.5 48.375,7.125 48,7.125 C43.5,4.875 38.625,4.5 34.125,7.5 C31.5,9.375 29.25,12 27,14.25 L45.75,33 C47.625,31.125 49.5,29.625 51.375,27.375 C53.625,24.75 54.75,21.375 54.375,18 C54.375,15.75 53.625,13.5 52.125,11.625 L60,3.75 L60,3.75 Z" id="Shape"></path>
+                </g>
+            </g>
+            <g id="Layer_55"></g>
+            <g id="Layer_56"></g>
+            <g id="Layer_57"></g>
+            <g id="Layer_58"></g>
+            <g id="Layer_59"></g>
+            <g id="Layer_60"></g>
+            <g id="Layer_61"></g>
+            <g id="Layer_62"></g>
+            <g id="Layer_63"></g>
+            <g id="Layer_64"></g>
+            <g id="Layer_65"></g>
+            <g id="Layer_66"></g>
+            <g id="Layer_50"></g>
        </g>
    </g>
 </svg>
--- a/data/images/add.png
+++ b/data/images/add.png
--- a/data/images/add.svg
+++ b/data/images/add.svg
@@ -1,10 +1,82 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="82px" height="82px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>add</title>
+<svg width="68px" height="68px" viewBox="0 0 68 68" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>Slice 1</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M41,71 C57.5685433,71 71,57.5685433 71,41 C71,24.4314567 57.5685433,11 41,11 C24.4314567,11 11,24.4314567 11,41 C11,57.5685433 24.4314567,71 41,71 Z M41,71" id="Oval 1" fill="rgb(154,170,198)"></path>
-        <path d="M45.1402321,37.4080257 L45.1402321,25.8322088 C45.1402321,24.8210227 44.3242652,24 43.3216195,24 L39.6753614,24 C38.6787375,24 37.8567488,24.8210228 37.8567488,25.8322088 L37.8567488,37.4080257 L26.8246346,37.4080257 C25.812956,37.4080257 25,38.22603 25,39.2372161 L25,42.6541194 C25,43.6653056 25.8159669,44.4833098 26.8246346,44.4833098 L37.8567488,44.4833098 L37.8567488,56.1738281 C37.8567488,57.1819957 38.6787376,58 39.6753614,58 L43.3216195,58 C44.3272762,58 45.1402321,57.1819957 45.1402321,56.1738281 L45.1402321,44.4833098 L56.1783677,44.4833098 C57.1840244,44.4833098 57.9999914,43.6653056 57.9999914,42.6541194 L57.9999914,39.2372161 C58.0030567,38.2230705 57.1840693,37.4080257 56.1783677,37.4080257 L45.1402321,37.4080257 Z M45.1402321,37.4080257" id="Shape" fill="rgb(254,255,254)"></path>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="list-remove" sketch:type="MSLayerGroup" transform="translate(34.500000, 33.500000) rotate(-45.000000) translate(-34.500000, -33.500000) translate(6.000000, 5.000000)">
+            <g id="Page-1">
+                <g id="list-remove">
+                    <g id="Page-1">
+                        <g id="icon_Cross">
+                            <g id="Layer_2"></g>
+                            <g id="Layer_3"></g>
+                            <g id="Layer_4"></g>
+                            <g id="Layer_5"></g>
+                            <g id="Layer_6"></g>
+                            <g id="Layer_8"></g>
+                            <g id="Layer_9"></g>
+                            <g id="Layer_10"></g>
+                            <g id="Layer_11"></g>
+                            <g id="Layer_12"></g>
+                            <g id="Layer_13"></g>
+                            <g id="Layer_14"></g>
+                            <g id="Layer_15"></g>
+                            <g id="Layer_16"></g>
+                            <g id="Layer_17"></g>
+                            <g id="Layer_18"></g>
+                            <g id="Layer_19"></g>
+                            <g id="Layer_20"></g>
+                            <g id="Layer_21"></g>
+                            <g id="Layer_24"></g>
+                            <g id="Layer_25"></g>
+                            <g id="Layer_26"></g>
+                            <g id="Layer_27"></g>
+                            <g id="Layer_28"></g>
+                            <g id="Layer_29"></g>
+                            <g id="Layer_47"></g>
+                            <g id="Layer_30"></g>
+                            <g id="Layer_31"></g>
+                            <g id="Layer_32"></g>
+                            <g id="Layer_33"></g>
+                            <g id="Layer_34"></g>
+                            <g id="Layer_35"></g>
+                            <g id="Layer_36"></g>
+                            <g id="Layer_37"></g>
+                            <g id="Layer_38"></g>
+                            <g id="Layer_39"></g>
+                            <g id="Layer_40"></g>
+                            <g id="Layer_41"></g>
+                            <g id="Layer_42"></g>
+                            <g id="Layer_43"></g>
+                            <g id="Layer_44" fill="#000000" sketch:type="MSShapeGroup">
+                                <path d="M56.6666667,9.33333333 L47.3333333,0 L28,18.6666667 L9.33333333,0 L0,9.33333333 L18.6666667,28 L0,47.3333333 L9.33333333,56.6666667 L28,38 L47.3333333,56.6666667 L56.6666667,47.3333333 L38,28 L56.6666667,9.33333333 L56.6666667,9.33333333 Z" id="Shape"></path>
+                            </g>
+                            <g id="Layer_45"></g>
+                            <g id="Layer_46"></g>
+                            <g id="Layer_48"></g>
+                            <g id="Layer_49"></g>
+                            <g id="Layer_51"></g>
+                            <g id="Layer_52"></g>
+                            <g id="Layer_53"></g>
+                            <g id="Layer_54"></g>
+                            <g id="Layer_55"></g>
+                            <g id="Layer_56"></g>
+                            <g id="Layer_57"></g>
+                            <g id="Layer_58"></g>
+                            <g id="Layer_59"></g>
+                            <g id="Layer_60"></g>
+                            <g id="Layer_61"></g>
+                            <g id="Layer_62"></g>
+                            <g id="Layer_63"></g>
+                            <g id="Layer_64"></g>
+                            <g id="Layer_65"></g>
+                            <g id="Layer_66"></g>
+                            <g id="Layer_50"></g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
    </g>
 </svg>
--- a/data/images/advanced-settings.png
+++ b/data/images/advanced-settings.png
--- a/data/images/advanced-settings.svg
+++ b/data/images/advanced-settings.svg
@@ -1,16 +1,74 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="79px" height="79px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>advanced-settings</title>
+<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>Slice 1</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="173.920641%" id="linearGradient-1">
-            <stop stop-color="rgb(123,125,121)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" stroke="rgb(150,150,150)" stroke-width="1">
-            <path d="M77.0386845,38.7883065 L71.392233,37.998629 C71.2219104,34.1354033 70.388362,30.4270161 68.9173943,26.9457258 L73.6038458,23.410242 C73.9057813,23.1779839 74.1070716,22.8321774 74.1612652,22.4579839 C74.2154588,22.0786291 74.112233,21.6915323 73.8825555,21.3844355 L67.3612653,12.7573389 C67.1315879,12.4528228 66.7883621,12.2541131 66.4090073,12.1973389 C66.0244912,12.1431454 65.6451363,12.2463712 65.3406202,12.4760486 L61.0154589,15.7457259 C58.1509427,13.1031452 54.8786847,11.0283067 51.2606203,9.56766127 L52.0322332,4.03217745 C52.0864267,3.65282261 51.9832009,3.26830647 51.7561041,2.96120973 C51.5264267,2.6566936 51.1832009,2.45798394 50.8064267,2.40120975 L40.1044916,0.914758202 C39.7070723,0.860564654 39.3380401,0.961209812 39.0335239,1.19346789 C38.7290078,1.42056466 38.5302981,1.76637112 38.4735239,2.14572592 L37.7638465,7.28120981 C33.7715883,7.44895174 29.9419113,8.32637111 26.3522338,9.89540339 L23.0877177,5.58314532 C22.6077177,4.94830659 21.7070725,4.82443564 21.0670725,5.301855 L12.4477179,11.8128227 C12.1432018,12.0450808 11.9419115,12.3883066 11.8877179,12.7650808 C11.8335244,13.1444356 11.9367502,13.5289518 12.1664276,13.8360485 L15.2528792,17.9263712 C12.5767503,20.8889518 10.5173952,24.233468 9.11094341,27.8954032 L3.70707218,27.1470161 C3.3251367,27.0928226 2.9457819,27.1960484 2.63868508,27.4231452 C2.3367496,27.6554033 2.13287864,27.9960484 2.08126571,28.3754032 L0.599975382,39.0747578 C0.489007636,39.8644352 1.03868506,40.5921772 1.82836251,40.7005643 L7.0541692,41.4283062 C7.28900791,45.3354031 8.21029827,49.1005644 9.80771767,52.6566929 L5.25804022,56.0941123 C4.6283628,56.5741123 4.49674994,57.4773381 4.98191119,58.1147574 L11.4954594,66.734112 C11.9754594,67.3715314 12.8786852,67.4902411 13.5109433,67.0128217 L17.9548143,63.6605636 C20.8193305,66.1870151 24.1328789,68.202499 27.6425561,69.5599185 L26.8322335,75.4592733 C26.7212657,76.2489507 27.2761045,76.9741121 28.0632012,77.0850798 L38.7625558,78.5715313 C38.827072,78.5818539 38.8967494,78.5870152 38.9638461,78.5870152 C39.6709429,78.5870152 40.2902978,78.0657248 40.3909429,77.3457249 L41.1961042,71.6089505 C44.9793299,71.3895957 48.6335234,70.5224989 52.0838457,69.0257246 L55.769007,73.9031439 C56.2541682,74.5405633 57.157394,74.6566923 57.7896521,74.1844342 L66.4167487,67.678628 C66.7238455,67.4489506 66.9225552,67.1005635 66.9767487,66.7237893 C67.0309422,66.3444345 66.9277164,65.9599183 66.7006197,65.6528216 L63.1728778,60.981854 C65.7122327,58.1766927 67.7070712,54.9947574 69.113523,51.5005636 L75.1522325,52.3392732 C75.9161035,52.4347571 76.6696519,51.8979829 76.7832003,51.1083055 L78.2722326,40.4063704 C78.3779927,39.6272051 77.82844,38.8966734 77.0386845,38.7883065 C77.0386845,38.7883065 77.82844,38.8966734 77.0386845,38.7883065 L77.0386845,38.7883065 M47.570281,50.5303679 C45.1444746,52.3652067 42.2541521,53.3355293 39.2218942,53.3355293 C34.8270556,53.3355293 30.785765,51.3303679 28.1406035,47.8284323 C23.5341519,41.730368 24.7496357,33.0206906 30.8554423,28.4064968 C33.2812487,26.571658 36.1715712,25.6039162 39.2012487,25.6039162 C43.5960872,25.6039162 47.6296358,27.6064969 50.2696358,31.1006907 C54.8812689,37.2012349 53.6734816,45.921308 47.570281,50.5303679 C47.570281,50.5303679 53.6734816,45.921308 47.570281,50.5303679 L47.570281,50.5303679" id="Shape" fill="url(#linearGradient-1)"></path>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="icon_Settings" sketch:type="MSLayerGroup">
+            <g id="Layer_2"></g>
+            <g id="Layer_3"></g>
+            <g id="Layer_4"></g>
+            <g id="Layer_5"></g>
+            <g id="Layer_6"></g>
+            <g id="Layer_8"></g>
+            <g id="Layer_9"></g>
+            <g id="Layer_10"></g>
+            <g id="Layer_11"></g>
+            <g id="Layer_12"></g>
+            <g id="Layer_13"></g>
+            <g id="Layer_14"></g>
+            <g id="Layer_15"></g>
+            <g id="Layer_16"></g>
+            <g id="Layer_17"></g>
+            <g id="Layer_18"></g>
+            <g id="Layer_19"></g>
+            <g id="Layer_20"></g>
+            <g id="Layer_21"></g>
+            <g id="Layer_24"></g>
+            <g id="Layer_25"></g>
+            <g id="Layer_26"></g>
+            <g id="Layer_27"></g>
+            <g id="Layer_28"></g>
+            <g id="Layer_29"></g>
+            <g id="Layer_47"></g>
+            <g id="Layer_30"></g>
+            <g id="Layer_31"></g>
+            <g id="Layer_32"></g>
+            <g id="Layer_33"></g>
+            <g id="Layer_34"></g>
+            <g id="Layer_35"></g>
+            <g id="Layer_36"></g>
+            <g id="Layer_37"></g>
+            <g id="Layer_38"></g>
+            <g id="Layer_39"></g>
+            <g id="Layer_40"></g>
+            <g id="Layer_41"></g>
+            <g id="Layer_42"></g>
+            <g id="Layer_43"></g>
+            <g id="Layer_44"></g>
+            <g id="Layer_45"></g>
+            <g id="Layer_46"></g>
+            <g id="Layer_48"></g>
+            <g id="Layer_49"></g>
+            <g id="Layer_51"></g>
+            <g id="Layer_52"></g>
+            <g id="Layer_53"></g>
+            <g id="Layer_54"></g>
+            <g id="Layer_55"></g>
+            <g id="Layer_56"></g>
+            <g id="Layer_57"></g>
+            <g id="Layer_58"></g>
+            <g id="Layer_59"></g>
+            <g id="Layer_60"></g>
+            <g id="Layer_61"></g>
+            <g id="Layer_62"></g>
+            <g id="Layer_63" fill="#000000" sketch:type="MSShapeGroup">
+                <path d="M39.5,9.5 C39,9.5 38.5,9 38,9 C37.5,9 37,8.5 36.5,8.5 L34.5,0.5 C31,1.38777878e-17 28,1.38777878e-17 24.5,0.5 L22.5,9 C21.5,9 20.5,9.5 19.5,10 L12,6 C9.5,8 7,10 5.5,13 L10,20.5 C10,21 9.5,21.5 9.5,22 C9.5,22.5 9,23 9,23.5 L0.5,25.5 C1.38777878e-17,29 1.38777878e-17,32 0.5,35.5 L9,37.5 C9,38.5 9.5,39.5 10,40.5 L6,48 C8,50.5 10.5,53 13,55 L20.5,50.5 C21,50.5 21.5,51 22,51 C22.5,51 23,51.5 23.5,51.5 L26,59.5 C29.5,60 32.5,60 35.5,59.5 L37.5,51 L40.5,49.5 L48,53.5 C50.5,51.5 53,49 55,46.5 L50.5,39 C50.5,38.5 51,38 51,37.5 C51,37 51.5,36.5 51.5,36 L59.5,33.5 C60,30 60,27 59.5,24 L51,22 L49.5,19 L53.5,11.5 C51.5,9 49,6.5 46.5,4.5 L39.5,9.5 L39.5,9.5 Z M40.5,34 C38,39.5 31.5,42.5 26,40.5 C20.5,38 17.5,31.5 19.5,26 C21.5,20.5 28,17.5 34,20 C39.5,22 42.5,28.5 40.5,34 L40.5,34 Z" id="Shape"></path>
+            </g>
+            <g id="Layer_64"></g>
+            <g id="Layer_65"></g>
+            <g id="Layer_66"></g>
+            <g id="Layer_50"></g>
        </g>
    </g>
 </svg>
--- a/data/images/album-icon.png
+++ b/data/images/album-icon.png
--- a/data/images/album-icon.svg
+++ b/data/images/album-icon.svg
@@ -1,20 +1,78 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="365px" height="365px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>album-icon</title>
+<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>Slice 1</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="70.6690133%" id="radialGradient-1">
-            <stop stop-color="rgb(187,190,185)" offset="0%"></stop>
-            <stop stop-color="rgb(213,211,209)" offset="0.923389476%"></stop>
-            <stop stop-color="rgb(241,240,240)" offset="100%"></stop>
-        </radialGradient>
-        <path d="M183,243 C216.137087,243 243,216.137087 243,183 C243,149.862913 216.137087,123 183,123 C149.862913,123 123,149.862913 123,183 C123,216.137087 149.862913,243 183,243 Z M182.5,360 C84.4694521,360 5,280.530548 5,182.5 C5,84.4694521 84.4694521,5 182.5,5 C280.530548,5 360,84.4694521 360,182.5 C360,280.530548 280.530548,360 182.5,360 Z M182.5,360" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group">
-            <use id="Oval 1" stroke="rgb(49,54,58)" stroke-width="5" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
-            <use id="Oval 1-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-            <path d="M183,243 C149.862913,243 123,216.137087 123,183 C123,149.862913 149.862913,123 183,123 C216.137087,123 243,149.862913 243,183 C243,216.137087 216.137087,243 183,243 Z M183.5,209 C198.135547,209 210,197.359404 210,183 C210,168.640596 198.135547,157 183.5,157 C168.864453,157 157,168.640596 157,183 C157,197.359404 168.864453,209 183.5,209 Z M183.5,209" id="Oval 2" stroke="rgb(150,150,150)" stroke-width="1" fill="rgb(137,137,137)"></path>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="album-icon" sketch:type="MSLayerGroup">
+            <g id="Page-1">
+                <g id="icon_Playlist">
+                    <g id="Layer_2"></g>
+                    <g id="Layer_3"></g>
+                    <g id="Layer_4"></g>
+                    <g id="Layer_5"></g>
+                    <g id="Layer_6"></g>
+                    <g id="Layer_8"></g>
+                    <g id="Layer_9"></g>
+                    <g id="Layer_10"></g>
+                    <g id="Layer_11"></g>
+                    <g id="Layer_12"></g>
+                    <g id="Layer_13"></g>
+                    <g id="Layer_14"></g>
+                    <g id="Layer_15"></g>
+                    <g id="Layer_16"></g>
+                    <g id="Layer_17"></g>
+                    <g id="Layer_18"></g>
+                    <g id="Layer_19"></g>
+                    <g id="Layer_20"></g>
+                    <g id="Layer_21"></g>
+                    <g id="Layer_24"></g>
+                    <g id="Layer_25"></g>
+                    <g id="Layer_26"></g>
+                    <g id="Layer_27"></g>
+                    <g id="Layer_28"></g>
+                    <g id="Layer_29"></g>
+                    <g id="Layer_47"></g>
+                    <g id="Layer_30"></g>
+                    <g id="Layer_31"></g>
+                    <g id="Layer_32"></g>
+                    <g id="Layer_33"></g>
+                    <g id="Layer_34"></g>
+                    <g id="Layer_35"></g>
+                    <g id="Layer_36"></g>
+                    <g id="Layer_37"></g>
+                    <g id="Layer_38"></g>
+                    <g id="Layer_39"></g>
+                    <g id="Layer_40" fill="#000000" sketch:type="MSShapeGroup">
+                        <path d="M30,0 C13.5,0 0,13.5 0,30 C0,46.5 13.5,60 30,60 C46.5,60 60,46.5 60,30 C59.5,13.5 46.5,0 30,0 L30,0 L30,0 Z M30,40 C24.5,40 20,35.5 20,30 C20,24.5 24.5,20 30,20 C35.5,20 39.5,24.5 39.5,30 C39.5,35.5 35,40 30,40 L30,40 L30,40 Z" id="Shape"></path>
+                    </g>
+                    <g id="Layer_41"></g>
+                    <g id="Layer_42"></g>
+                    <g id="Layer_43"></g>
+                    <g id="Layer_44"></g>
+                    <g id="Layer_45"></g>
+                    <g id="Layer_46"></g>
+                    <g id="Layer_48"></g>
+                    <g id="Layer_49"></g>
+                    <g id="Layer_51"></g>
+                    <g id="Layer_52"></g>
+                    <g id="Layer_53"></g>
+                    <g id="Layer_54"></g>
+                    <g id="Layer_55"></g>
+                    <g id="Layer_56"></g>
+                    <g id="Layer_57"></g>
+                    <g id="Layer_58"></g>
+                    <g id="Layer_59"></g>
+                    <g id="Layer_60"></g>
+                    <g id="Layer_61"></g>
+                    <g id="Layer_62"></g>
+                    <g id="Layer_63"></g>
+                    <g id="Layer_64"></g>
+                    <g id="Layer_65"></g>
+                    <g id="Layer_66"></g>
+                    <g id="Layer_50"></g>
+                </g>
+            </g>
        </g>
    </g>
 </svg>
--- a/data/images/album-placeholder-grid.png
+++ b/data/images/album-placeholder-grid.png
--- a/data/images/album-placeholder-grid.svg
+++ b/data/images/album-placeholder-grid.svg
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="400px" height="400px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
    <title>album-placeholder-grid</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="70.6690133%" id="radialGradient-1">
-            <stop stop-color="rgb(187,190,185)" offset="0%"></stop>
-            <stop stop-color="rgb(213,211,209)" offset="0.923389476%"></stop>
-            <stop stop-color="rgb(241,240,240)" offset="100%"></stop>
-        </radialGradient>
-        <path d="M201,260 C234.137087,260 261,233.137087 261,200 C261,166.862913 234.137087,140 201,140 C167.862913,140 141,166.862913 141,200 C141,233.137087 167.862913,260 201,260 Z M200.5,377 C102.469452,377 23,297.530548 23,199.5 C23,101.469452 102.469452,22 200.5,22 C298.530548,22 378,101.469452 378,199.5 C378,297.530548 298.530548,377 200.5,377 Z M200.5,377" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M0,0 L0,400 L400,400 L400,0 L0,0 Z M0,0" id="Rectangle 1" fill="rgb(0,0,0)"></path>
-        <g id="Group">
-            <use id="Oval 1" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
-            <use id="Oval 1-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-            <path d="M201,260 C167.862913,260 141,233.137087 141,200 C141,166.862913 167.862913,140 201,140 C234.137087,140 261,166.862913 261,200 C261,233.137087 234.137087,260 201,260 Z M201.5,226 C216.135547,226 228,214.359404 228,200 C228,185.640596 216.135547,174 201.5,174 C186.864453,174 175,185.640596 175,200 C175,214.359404 186.864453,226 201.5,226 Z M201.5,226" id="Oval 2" stroke="rgb(150,150,150)" stroke-width="1" fill="rgb(137,137,137)"></path>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <rect id="Rectangle-1" fill="#D8D8D8" sketch:type="MSShapeGroup" x="0" y="0" width="200" height="200"></rect>
+        <g id="icon_Playlist" sketch:type="MSLayerGroup" transform="translate(70.000000, 70.000000)">
+            <path id="Shape" stroke="#449FDB" opacity="0" fill="#000000" sketch:type="MSShapeGroup"></path>
+            <path d="M30,0 C13.5,0 0,13.5 0,30 C0,46.5 13.5,60 30,60 C46.5,60 60,46.5 60,30 C59.499375,13.5 46.5,0 30,0 L30,0 Z M30,39.999375 C24.500625,39.999375 20.000625,35.499375 20.000625,30 C20.000625,24.500625 24.500625,20.000625 30,20.000625 C35.499375,20.000625 39.500625,24.500625 39.500625,30 C39.500625,35.499375 35.000625,39.999375 30,39.999375 L30,39.999375 Z" id="Shape" fill="#606060" sketch:type="MSShapeGroup"></path>
        </g>
    </g>
 </svg>
--- a/data/images/apply-check.png
+++ b/data/images/apply-check.png
--- a/data/images/apply-check.svg
+++ b/data/images/apply-check.svg
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="51px" height="50px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
+<svg width="51px" height="50px" viewBox="0 0 51 50" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>apply-check</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
    <defs></defs>
-    <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M46,0.75402832 L5.24000168,0.75402832 C2.78800178,0.75402832 0.791001797,2.74902833 0.791001797,5.2030282 L0.791001797,44.8820291 C0.791001797,47.3350291 2.78800178,49.3320289 5.24000168,49.3320289 L46,49.3320289 C48.4519999,49.3320289 50.4489999,47.3350289 50.4489999,44.8820291 L50.4489999,5.2030282 C50.4489746,2.74902344 48.4520264,0.75402832 46,0.75402832 L46,0.75402832 L46,0.75402832 M46.5689697,44.881958 C46.5689697,45.197958 46.3149697,45.451958 45.9999697,45.451958 L5.2399714,45.451958 C4.9249714,45.451958 4.67097139,45.197958 4.67097139,44.881958 L4.67097139,5.20295715 C4.67097139,4.88895714 4.9249714,4.63095713 5.2399714,4.63095713 L46,4.63095713 C46.315,4.63095713 46.569,4.88895711 46.569,5.20295715 L46.569,44.881958 L46.569,44.881958 L46.5689697,44.881958" id="Shape" fill="rgb(62,115,0)"></path>
-            <path d="M39.992981,11.0159912 C39.112981,10.3459912 37.857981,10.5139912 37.1889811,11.3919912 L20.0559816,33.827992 L13.6759815,26.2839919 C12.9629815,25.4409919 11.6999816,25.3349919 10.8579814,26.0479919 C10.0139815,26.7619919 9.90898144,28.0239918 10.6219814,28.865992 L18.6079815,38.3099922 C18.9889815,38.7599922 19.5469815,39.0189922 20.1349815,39.0189922 C20.1519815,39.0189922 20.1679815,39.0189922 20.1849815,39.0179922 C20.7899815,39.0029922 21.3569815,38.7139922 21.7249814,38.2329922 L40.3689805,13.8199921 C41.0390015,12.94104 40.8709717,11.6870117 39.992981,11.0159912 C39.992981,11.0159912 40.8709717,11.6870117 39.992981,11.0159912 L39.992981,11.0159912" id="Shape" fill="rgb(62,115,0)"></path>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="apply-check" sketch:type="MSLayerGroup" transform="translate(1.000000, 1.000000)">
+            <g id="Page-1" sketch:type="MSShapeGroup">
+                <g id="apply-check">
+                    <g id="Page-1">
+                        <g id="Group">
+                            <path d="M4.24000168,-0.24597168 C1.78800178,-0.24597168 -0.208998203,1.74902833 -0.208998203,4.2030282 L-0.208998203,43.8820291 C-0.208998203,46.3350291 1.78800178,48.3320289 4.24000168,48.3320289 L45,48.3320289 C47.4519999,48.3320289 49.4489999,46.3350289 49.4489999,43.8820291 L49.4489999,4.2030282 C49.4489746,1.74902344 47.4520264,-0.24597168 45,-0.24597168 L4.24000168,-0.24597168 Z" id="Shape" fill="#000000"></path>
+                            <path d="M38.992981,10.0159912 C38.112981,9.3459912 36.857981,9.5139912 36.1889811,10.3919912 L19.0559816,32.827992 L12.6759815,25.2839919 C11.9629815,24.4409919 10.6999816,24.3349919 9.8579814,25.0479919 C9.0139815,25.7619919 8.90898144,27.0239918 9.6219814,27.865992 L17.6079815,37.3099922 C17.9889815,37.7599922 18.5469815,38.0189922 19.1349815,38.0189922 C19.1519815,38.0189922 19.1679815,38.0189922 19.1849815,38.0179922 C19.7899815,38.0029922 20.3569815,37.7139922 20.7249814,37.2329922 L39.3689805,12.8199921 C40.0390015,11.94104 39.8709717,10.6870117 38.992981,10.0159912 C38.992981,10.0159912 39.8709717,10.6870117 38.992981,10.0159912 L38.992981,10.0159912" id="Shape" fill="#FFFFFF"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
        </g>
    </g>
 </svg>
--- a/data/images/arrow-down-double.png
+++ b/data/images/arrow-down-double.png
--- a/data/images/arrow-down-double.svg
+++ b/data/images/arrow-down-double.svg
@@ -1,11 +1,74 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="42px" height="42px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>arrow-up-double</title>
+<svg width="9px" height="9px" viewBox="0 0 9 9" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>Slice 1</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
    <defs></defs>
-    <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M2.35400391,38.0279541 L39.5150032,38.0279541 C40.6710032,38.0279541 41.7310033,37.3789541 42.2560031,36.3469541 C42.4830031,35.9079541 42.5930032,35.4279541 42.5930032,34.9499542 C42.5930032,34.3129541 42.3930032,33.6759541 42.0040032,33.1419542 L23.4220024,7.55995345 C22.8430024,6.76095343 21.9170024,6.2909534 20.9320024,6.2909534 C19.9470024,6.2909534 19.0210024,6.7629534 18.4430023,7.55995345 L-0.137997031,33.1419542 C-0.817997038,34.0769542 -0.912997007,35.3199542 -0.388997018,36.3469541 C0.135986328,37.3790283 1.19702148,38.0279541 2.35400391,38.0279541 C2.35400391,38.0279541 1.19702148,38.0279541 2.35400391,38.0279541 L2.35400391,38.0279541" id="Shape" fill="rgb(100,100,100)" transform="translate(-207.065652, -202.840546) rotate(-180) translate(207.065652, 202.840546)"></path>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="icon_chev_up" sketch:type="MSLayerGroup" transform="translate(4.500000, 4.500000) scale(1, -1) translate(-4.500000, -4.500000) translate(0.000000, 2.000000)">
+            <g id="Layer_2"></g>
+            <g id="Layer_3"></g>
+            <g id="Layer_4"></g>
+            <g id="Layer_5"></g>
+            <g id="Layer_6"></g>
+            <g id="Layer_8"></g>
+            <g id="Layer_9"></g>
+            <g id="Layer_10"></g>
+            <g id="Layer_11"></g>
+            <g id="Layer_12"></g>
+            <g id="Layer_13"></g>
+            <g id="Layer_14"></g>
+            <g id="Layer_15"></g>
+            <g id="Layer_16"></g>
+            <g id="Layer_17"></g>
+            <g id="Layer_18"></g>
+            <g id="Layer_19"></g>
+            <g id="Layer_20"></g>
+            <g id="Layer_21"></g>
+            <g id="Layer_24"></g>
+            <g id="Layer_25"></g>
+            <g id="Layer_26"></g>
+            <g id="Layer_27"></g>
+            <g id="Layer_28"></g>
+            <g id="Layer_29"></g>
+            <g id="Layer_47"></g>
+            <g id="Layer_30"></g>
+            <g id="Layer_31"></g>
+            <g id="Layer_32"></g>
+            <g id="Layer_33"></g>
+            <g id="Layer_34"></g>
+            <g id="Layer_35"></g>
+            <g id="Layer_36"></g>
+            <g id="Layer_37"></g>
+            <g id="Layer_38"></g>
+            <g id="Layer_39" fill="#000000" sketch:type="MSShapeGroup">
+                <path d="M0.724137931,5 L0,4.33962264 L4.55172414,0 L9,4.33962264 L8.27586207,5 L4.55172414,1.41509434 L0.724137931,5 Z" id="Shape"></path>
+            </g>
+            <g id="Layer_40"></g>
+            <g id="Layer_41"></g>
+            <g id="Layer_42"></g>
+            <g id="Layer_43"></g>
+            <g id="Layer_44"></g>
+            <g id="Layer_45"></g>
+            <g id="Layer_46"></g>
+            <g id="Layer_48"></g>
+            <g id="Layer_49"></g>
+            <g id="Layer_51"></g>
+            <g id="Layer_52"></g>
+            <g id="Layer_53"></g>
+            <g id="Layer_54"></g>
+            <g id="Layer_55"></g>
+            <g id="Layer_56"></g>
+            <g id="Layer_57"></g>
+            <g id="Layer_58"></g>
+            <g id="Layer_59"></g>
+            <g id="Layer_60"></g>
+            <g id="Layer_61"></g>
+            <g id="Layer_62"></g>
+            <g id="Layer_63"></g>
+            <g id="Layer_64"></g>
+            <g id="Layer_65"></g>
+            <g id="Layer_66"></g>
+            <g id="Layer_50"></g>
        </g>
    </g>
 </svg>
--- a/data/images/arrow-right-double.png
+++ b/data/images/arrow-right-double.png
--- a/data/images/arrow-right-double.svg
+++ b/data/images/arrow-right-double.svg
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="42px" height="42px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>arrow-right-double</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M7.32121281,41.8181084 L34.5477114,41.8181084 C35.3946701,41.8181084 36.1712932,40.932299 36.5559413,39.5237392 C36.7222559,38.9245553 36.8028488,38.2694112 36.8028488,37.616997 C36.8028488,36.7475662 36.6563162,35.8781353 36.3713102,35.1492876 L22.7569611,0.232836341 C22.3327491,-0.857705628 21.6543029,-1.49920092 20.9326296,-1.49920092 C20.2109563,-1.49920092 19.5325101,-0.854975896 19.1090307,0.232836341 L5.4954153,35.1492876 C4.99720429,36.4254537 4.9276013,38.1220039 5.31151684,39.5237392 C5.69615284,40.9324003 6.47353431,41.8181084 7.32121281,41.8181084 C7.32121281,41.8181084 6.47353431,41.8181084 7.32121281,41.8181084 L7.32121281,41.8181084" id="Shape" fill="rgb(100,100,100)" transform="translate(-213.065652, -198.840546) rotate(-270) translate(213.065652, 198.840546)"></path>
-        </g>
-    </g>
-</svg>
--- a/data/images/arrow-up-double.png
+++ b/data/images/arrow-up-double.png
--- a/data/images/arrow-up-double.svg
+++ b/data/images/arrow-up-double.svg
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="42px" height="42px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>arrow-up-double</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M2.35400391,38.0279541 L39.5150032,38.0279541 C40.6710032,38.0279541 41.7310033,37.3789541 42.2560031,36.3469541 C42.4830031,35.9079541 42.5930032,35.4279541 42.5930032,34.9499542 C42.5930032,34.3129541 42.3930032,33.6759541 42.0040032,33.1419542 L23.4220024,7.55995345 C22.8430024,6.76095343 21.9170024,6.2909534 20.9320024,6.2909534 C19.9470024,6.2909534 19.0210024,6.7629534 18.4430023,7.55995345 L-0.137997031,33.1419542 C-0.817997038,34.0769542 -0.912997007,35.3199542 -0.388997018,36.3469541 C0.135986328,37.3790283 1.19702148,38.0279541 2.35400391,38.0279541 C2.35400391,38.0279541 1.19702148,38.0279541 2.35400391,38.0279541 L2.35400391,38.0279541" id="Shape" fill="rgb(100,100,100)"></path>
-        </g>
-    </g>
-</svg>
--- a/data/images/artist-icon.png
+++ b/data/images/artist-icon.png
--- a/data/images/artist-icon.svg
+++ b/data/images/artist-icon.svg
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>artist-icon</title>
+<svg width="62px" height="61px" viewBox="0 0 62 61" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>Slice 1</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g fill="rgb(214,215,214)">
-            <path d="M50,100 C22.3857613,100 0,77.6142426 0,50 C0,22.3857613 22.3857613,0 50,0 C77.6142426,0 100,22.3857613 100,50 C100,77.6142426 77.6142426,100 50,100 Z M82.8845366,40.0616913 C82.6247859,39.2104401 81.8853522,38.6282177 81.0378485,38.608139 L69.8079269,38.3672203 L66.5070209,38.2989613 L63.2061065,38.2246765 L60.3886715,38.1684605 L59.0690692,38.1383488 L58.3713459,36.0323051 L51.8586343,16.399342 C51.5799267,15.5641537 50.8310125,15 49.9910932,15 C49.1511697,15 48.4003593,15.5641537 48.1216517,16.399342 L41.6108363,36.0323051 L40.9112168,38.1383488 L39.5897184,38.1684605 L36.7722834,38.2246765 L33.4732693,38.2989613 L30.1742552,38.3672203 L18.9424397,38.608139 C18.09683,38.6282177 17.3555002,39.2104401 17.0957495,40.0616913 C16.8360009,40.9149483 17.1166067,41.8444958 17.7934729,42.3805435 L35.2877277,56.2816223 L28.928593,78.2916595 C28.6840112,79.1469223 28.9740976,80.0684425 29.654756,80.596463 C29.8272897,80.7289612 30.0130961,80.8273445 30.2102814,80.8935936 C30.2728489,80.917688 30.3392045,80.9156822 30.4074604,80.9337509 C30.5401799,80.9618568 30.6747955,80.9959885 30.8113072,80.9979942 C30.8169956,80.9979942 30.8226839,81 30.8264761,81 C30.9516112,81 31.0748501,80.9678741 31.1999852,80.941774 C31.266345,80.9277252 31.3345966,80.9337509 31.3990603,80.9096565 C31.5924512,80.847419 31.7763616,80.7570755 31.9470033,80.6305862 L49.9929851,67.4703407 L68.0389711,80.6305862 C68.3783501,80.8775307 68.7689242,81 69.1613944,81 C69.5728257,81 69.984257,80.8674934 70.3331166,80.596463 C71.0118747,80.0664368 71.3019632,79.140905 71.0573814,78.2916595 L64.6963506,56.2816223 L82.1943935,42.3805435 C82.8656762,41.8424145 83.1443292,40.9128418 82.8845366,40.0616913 Z M82.8845366,40.0616913" id="Oval 1" fill="rgb(69,73,82)"></path>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="artist-icon" sketch:type="MSLayerGroup" transform="translate(1.000000, 1.000000)" fill="#000000">
+            <g id="Page-1" sketch:type="MSShapeGroup">
+                <path d="M59.9125522,22.5833558 C59.6763462,21.809491 59.0039372,21.2801979 58.2332538,21.2619446 L48.0212482,21.0429275 L45.0195468,20.9808738 L42.0178377,20.9133423 L39.4557841,20.8622368 L38.2557947,20.8348625 L37.6213153,18.9202774 L31.6989366,1.072129 C31.445492,0.31286692 30.7644617,-0.2 30.0006754,-0.2 C29.2368853,-0.2 28.5541307,0.31286692 28.3006861,1.072129 L22.3800317,18.9202774 L21.7438279,20.8348625 L20.5421144,20.8622368 L17.9800607,20.9133423 L14.9800797,20.9808738 L11.9800988,21.0429275 L1.7663707,21.2619446 C0.9974098,21.2801979 0.3232765,21.809491 0.0870705,22.5833558 C-0.14913376,23.3590439 0.1060371,24.204087 0.72155,24.6914032 L16.6300698,37.3287476 L10.8473473,57.3378723 C10.6249352,58.115384 10.8887273,58.9531295 11.5076885,59.4331482 C11.6645833,59.5536011 11.8335477,59.6430405 12.0128594,59.7032669 C12.0697556,59.7251709 12.1300964,59.7233475 12.1921654,59.7397736 C12.3128548,59.7653244 12.4352685,59.7963532 12.5594063,59.7981766 L12.5732002,59.8 C12.6869927,59.8 12.7990609,59.7707946 12.9128532,59.7470673 C12.973198,59.7342957 13.0352631,59.7397736 13.0938836,59.7178696 C13.269745,59.66129 13.4369851,59.5791596 13.5921594,59.4641693 L30.0023958,47.5003097 L46.4126361,59.4641693 C46.7212527,59.6886642 47.076424,59.8 47.4333194,59.8 C47.8074573,59.8 48.1815952,59.6795394 48.4988329,59.4331482 C49.1160663,58.9513061 49.3798602,58.1099136 49.1574481,57.3378723 L43.3730013,37.3287476 L59.2849659,24.6914032 C59.8954014,24.202195 60.1487964,23.357129 59.9125522,22.5833558 L59.9125522,22.5833558 L59.9125522,22.5833558 Z" id="Path"></path>
+            </g>
        </g>
    </g>
 </svg>
--- a/data/images/artist-placeholder-grid.png
+++ b/data/images/artist-placeholder-grid.png
--- a/data/images/artist-placeholder-grid.svg
+++ b/data/images/artist-placeholder-grid.svg
@@ -3,11 +3,76 @@
    <title>artist-placeholder-grid</title>
    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="artist-placeholder" fill="rgb(0,0,0)">
-            <g id="Page 1" fill="rgb(214,215,214)">
-                <path d="M0,200 L200,200 L200,0 L0,0 L0,200 Z M0,200" id="Rectangle 4" fill="rgb(0,0,0)"></path>
-                <path d="M187,78 C187,76 185,74 182,74 L125,73 L107,16 C106,14 104,13 102,13 C99,13 98,14 97,16 L78,73 L21,74 C19,74 17,76 16,78 C16,80 16,83 18,84 L63,120 L47,178 C46,180 47,182 49,184 C51,185 53,185 55,184 L102,149 L149,184 C149,184 150,185 152,185 C153,185 154,184 155,184 C156,182 157,180 156,178 L140,120 L185,84 C187,83 188,80 187,78 C187,78 188,80 187,78 L187,78 M131,114 C129,115 128,117 129,120 L142,166 L105,138 C103,137 101,137 99,138 L61,166 L74,120 C75,117 74,115 73,114 L36,85 L82,84 C84,84 86,82 87,80 L102,34 L117,80 C117,82 119,84 122,84 L167,85 L131,114" id="Shape" fill="rgb(254,254,254)"></path>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="artist-placeholder-grid" sketch:type="MSLayerGroup">
+            <g id="Page-1">
+                <rect id="Rectangle-1" fill="#D8D8D8" sketch:type="MSShapeGroup" x="0" y="0" width="200" height="200"></rect>
+                <g id="icon_Star" transform="translate(70.000000, 70.000000)">
+                    <g id="Layer_2"></g>
+                    <g id="Layer_3"></g>
+                    <g id="Layer_4"></g>
+                    <g id="Layer_5"></g>
+                    <g id="Layer_6"></g>
+                    <g id="Layer_8"></g>
+                    <g id="Layer_9"></g>
+                    <g id="Layer_10"></g>
+                    <g id="Layer_11"></g>
+                    <g id="Layer_12"></g>
+                    <g id="Layer_13"></g>
+                    <g id="Layer_14"></g>
+                    <g id="Layer_15"></g>
+                    <g id="Layer_16"></g>
+                    <g id="Layer_17"></g>
+                    <g id="Layer_18"></g>
+                    <g id="Layer_19"></g>
+                    <g id="Layer_20"></g>
+                    <g id="Layer_21"></g>
+                    <g id="Layer_24"></g>
+                    <g id="Layer_25"></g>
+                    <g id="Layer_26"></g>
+                    <g id="Layer_27"></g>
+                    <g id="Layer_28"></g>
+                    <g id="Layer_29"></g>
+                    <g id="Layer_47"></g>
+                    <g id="Layer_30"></g>
+                    <g id="Layer_31"></g>
+                    <g id="Layer_32"></g>
+                    <g id="Layer_33"></g>
+                    <g id="Layer_34"></g>
+                    <g id="Layer_35"></g>
+                    <g id="Layer_36"></g>
+                    <g id="Layer_37"></g>
+                    <g id="Layer_38"></g>
+                    <g id="Layer_39"></g>
+                    <g id="Layer_40"></g>
+                    <g id="Layer_41"></g>
+                    <g id="Layer_42"></g>
+                    <g id="Layer_43"></g>
+                    <g id="Layer_44"></g>
+                    <g id="Layer_45"></g>
+                    <g id="Layer_46"></g>
+                    <g id="Layer_48"></g>
+                    <g id="Layer_49"></g>
+                    <g id="Layer_51"></g>
+                    <g id="Layer_52"></g>
+                    <g id="Layer_53"></g>
+                    <g id="Layer_54"></g>
+                    <g id="Layer_55"></g>
+                    <g id="Layer_56"></g>
+                    <g id="Layer_57"></g>
+                    <g id="Layer_58"></g>
+                    <g id="Layer_59"></g>
+                    <g id="Layer_60"></g>
+                    <g id="Layer_61"></g>
+                    <g id="Layer_62"></g>
+                    <g id="Layer_63"></g>
+                    <g id="Layer_64" fill="#606060" sketch:type="MSShapeGroup">
+                        <path d="M37,22.9090909 L30,0 L23,22.9090909 L0,22.9090909 L19,37.0909091 L11.5,60 L30,45.8181818 L48.5,60 L41,37.0909091 L60,22.9090909 L37,22.9090909 L37,22.9090909 Z" id="Shape"></path>
+                    </g>
+                    <g id="Layer_65"></g>
+                    <g id="Layer_66"></g>
+                    <g id="Layer_50"></g>
+                </g>
            </g>
        </g>
    </g>
--- a/Show More
+++ b/Show More