Revert "Miscellaneous cppcheck fixes"

Miscellaneous cppcheck fixes

.gitignore

@@ -12,7 +12,6 @@ Makefile*
 moc_*
 *~
 /tomahawk
-thirdparty/qtweetlib/WARNING-twitter-api-keys
 .kdev4
 *.kdev4
 *.kate-swp

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "thirdparty/libcrashreporter-qt"]
+	path = thirdparty/libcrashreporter-qt
+	url = https://github.com/dschmidt/libcrashreporter-qt

.tx/config

@@ -1,5 +1,5 @@
 [main]
-host = https://www.transifex.net
+host = https://www.transifex.com
 
 [tomahawk.tomahawk-master]
 file_filter = lang/tomahawk_<lang>.ts

AUTHORS

@@ -14,6 +14,7 @@ Contributors include:
 * 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:
 

CMakeLists.txt

@@ -32,16 +32,24 @@ ELSE()
 ENDIF()
 
 SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 7 )
-SET( TOMAHAWK_VERSION_PATCH 100 )
-#SET( TOMAHAWK_VERSION_RC 0 )
+SET( TOMAHAWK_VERSION_MINOR 8 )
+SET( TOMAHAWK_VERSION_PATCH 0 )
+SET( TOMAHAWK_VERSION_RC 1 )
 
 SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs de en el es fi fr hi_IN hu gl it ja lt pl pt_BR ro 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)
@@ -50,32 +58,25 @@ option(BUILD_TESTS "Build Tomahawk with unit tests" ON)
 option(BUILD_HATCHET "Build the Hatchet plugin" OFF)
 option(BUILD_WITH_QT4 "Build Tomahawk with Qt4 no matter if Qt5 was found" ON)
 
-option(WITH_BREAKPAD "Build with breakpad integration" 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)
 
+# 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" )
-    message(STATUS "Build of breakpad library disabled on this platform.")
-    SET(WITH_BREAKPAD 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
@@ -102,7 +103,7 @@ ENDIF()
 
 
 # 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}" )
@@ -117,25 +118,25 @@ INCLUDE( TomahawkCPack.cmake )
 INCLUDE( MacroOptionalFindPackage )
 INCLUDE( MacroLogFeature )
 
-# headless mode
-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 ***" )
-endif()
+message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} ***" )
 
 if( NOT BUILD_WITH_QT4 )
     find_package(Qt5Core QUIET)
     if( Qt5Core_DIR )
-        find_package(Qt5Widgets QUIET)
+        # 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!")
 
         if( UNIX AND NOT APPLE )
             # We need this to find the paths to qdbusxml2cpp and co
             find_package(Qt5DBus REQUIRED)
         endif()
-        
+
         if(WIN32)
             find_package(Qt5WinExtras REQUIRED)
         endif()
@@ -220,6 +221,11 @@ if( NOT Qt5Core_DIR )
 
         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()
 
 if( Qt5Core_DIR )
@@ -232,22 +238,47 @@ if( BUILD_GUI AND UNIX AND NOT APPLE )
     find_package( X11 )
 endif()
 
+# 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(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")
 
-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")
+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(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")
+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.6.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 )
 
-find_package(Boost REQUIRED)
-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(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 necessary for some resolvers and accounts" "http://delta.affinix.com/qca/" TRUE "" "")
@@ -269,9 +300,6 @@ 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(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")
-
 macro_optional_find_package(LibLastFm 1.0.0)
 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")
 
@@ -303,7 +331,15 @@ if( WIN32 )
     macro_log_feature(QTSPARKLE_FOUND "qtsparkle" "Library for creating auto updaters written in Qt" "https://github.com/davidsansome/qtsparkle" FALSE "" "")
 endif( WIN32 )
 
-#TODO: support external qxt
+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})
@@ -371,10 +407,19 @@ CONFIGURE_FILE(
 #     ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 # ENDIF()
 
-IF( NOT APPLE )
+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
-    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
-ENDIF( NOT APPLE )
+    #
+    # 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 ( 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)
@@ -389,6 +434,11 @@ ADD_SUBDIRECTORY( thirdparty )
 ADD_SUBDIRECTORY( src )
 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}")

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()
+

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()
+

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
-  )

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)
-

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}

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}

CMakeModules/FindLibLastFm.cmake

@@ -7,6 +7,10 @@
 # (c) Dominik Schmidt <dev@dominik-schmidt.de>
 #
 
+if( TOMAHAWK_QT5 )
+    set(LASTFM_LIB_SUFFIX "5")
+endif()
+
 # Include dir
 find_path(LIBLASTFM_INCLUDE_DIR
   # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
@@ -16,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}
 )
 

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
+       	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
+  )

CMakeModules/FindQTweetLib.cmake

@@ -1,28 +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>
-#
-
-# 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)
-

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)

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
 ;-----------------------------------------------------------------------------
@@ -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,18 +352,41 @@ 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"
@@ -365,8 +394,14 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${MING_BIN}\libssl-10.dll"
    File "${MING_BIN}\libcrypto-10.dll"
 
-   File "${MING_BIN}\libclucene-core.dll"
-   File "${MING_BIN}\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"
@@ -385,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
@@ -465,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
@@ -524,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

ChangeLog

@@ -1,3 +1,5 @@
+Version 0.9.0:
+
 Version 0.8.0:
     * Playback Queue now saves its state across sessions.
     * Added "Inbox" feature, showing incoming song recommendations. Dropping
@@ -5,28 +7,26 @@ Version 0.8.0:
     * You will now be asked whether you want to trust invalid SSL certificates.
     * Improved connecting between Tomahawk peers and support having multiple IPs
       (including IPv6).
-    * Added Trending page, showing you the most played tracks of your friends recently,
-      trending songs and playlists.
     * Removed Top Loved from sidebar.
     * JavaScript-Resolver can now handle URLs (e.g. when dropped from a browser)
       and resolve them to Playlists/Tracks/Artists/Albums.
     * 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.
-    * New Loved widget shows what friends have loved tracks throughout the app.
-    * New Artist, Album and Track page design - new fonts, colors, layout.
     * Retina display and DPI scaling fixes.
-    * New Dashboard layout.
-    * New Stats widget.
     * New Collection views.
     * Added Telepathy support.
     * Plugin refactoring (and .AXE resolver binaries).
     * Removed Twitter due to change in Twitter's API.
     * Improved error messages.
-    * Support drag & drop of items from Artist and Album page headers.
-    * Added basic remote control API
-    * Add support for Opus codec in local files (requires TagLib 1.9)
-    * Support rtmp:// streams
+    * Added basic remote control API.
+    * Add support for Opus codec (requires TagLib 1.9).
+    * Support rtmp:// streams.
+    * Dropped QJson as a dependency for Qt5.
+    * Support additional headers in CustomUrlHandler.
+    * Fuzzy search indices for JS Resolvers.
+    * Add metadata retrieval of HTTP(S) streams in JavaScript resolvers.
+    * Support for Windows, OS X and Growl notifications.
 
 Version 0.7.0:
     * JavaScript Resolvers can now expose collections.

README.md

@@ -1,68 +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) | *N/A* |
+|**STABLE** | [**0.7**](http://download.tomahawk-player.org/Tomahawk-0.7.0.dmg) | [**0.7**](http://download.tomahawk-player.org/tomahawk-0.7.0.exe) | [**0.7**](http://www.tomahawk-player.org/download.html#linux) (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
+**LINUX**
 
-Start the application on OS X:
+* [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)
 
-    $ open tomahawk.app
+**MAC**
 
+* [OS X](http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bunde)
 
-Detailed building instructions for Ubuntu
------------------------------------------
-See: http://wiki.tomahawk-player.org/index.php/Building_Binary_on_Ubuntu_Precise_(12.04)
+**WINDOWS**
 
-Detailed building instructions for OS X
----------------------------------------
-See: http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle
+* [Windows](http://wiki.tomahawk-player.org/index.php/Building_Windows_Binary)
 
-Doxygen Documentation
----------------------
-See: http://dev.tomahawk-player.org/api/classes.html
-
-Dependencies
-------------
+### Dependencies
 
 Required dependencies:
 
-* 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.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.2.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 - https://github.com/lastfm/liblastfm/
-* QtKeychain 0.1 - https://github.com/frankosterfeld/qtkeychain/
+* [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 (1.1.0 will fail, 1.1.1 is fine) - http://qutim.org/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/
-* Qocoa - https://github.com/mikemcquaid/Qocoa/
-* libqnetwm - http://code.google.com/p/libqnetwm/
-* libqxt (QxtWeb module) - http://libqxt.org/
-* SPMediaKeyTap - https://github.com/nevyn/SPMediaKeyTap/
-* kdSingleApplicationGuard - http://www.kdab.com/
+* [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
+
+* [Open 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!**

TomahawkAddLibrary.cmake

@@ -52,6 +52,7 @@ function(tomahawk_add_library)
     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()
@@ -61,6 +62,9 @@ function(tomahawk_add_library)
         # 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})

admin/mac/Info.plist

@@ -23,7 +23,7 @@
 	<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>
@@ -63,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>

admin/mac/macdeploy.py

@@ -26,20 +26,20 @@ FRAMEWORK_SEARCH_PATH=[
     os.path.join(os.environ['HOME'], 'Library/Frameworks')
 ]
 
-LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.3.2/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.']
 
 VLC_PLUGINS=[
-  'access/libaccess_attachment_plugin.dylib',
+  'access/libattachment_plugin.dylib',
   #'access/libaccess_avio_plugin.dylib',
   #'access/libaccess_fake_plugin.dylib',
-  'access/libaccess_ftp_plugin.dylib',
-  'access/libaccess_http_plugin.dylib',
-  'access/libaccess_imem_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/libaccess_tcp_plugin.dylib',
-  'access/libaccess_udp_plugin.dylib',
+  'access/libtcp_plugin.dylib',
+  'access/libudp_plugin.dylib',
   'access/libcdda_plugin.dylib',
   'access/libfilesystem_plugin.dylib',
   'access/libqtcapture_plugin.dylib',
@@ -109,7 +109,7 @@ VLC_PLUGINS=[
   'demux/libavi_plugin.dylib',
   'demux/libdemux_cdg_plugin.dylib',
   'demux/libdemuxdump_plugin.dylib',
-  'demux/libdirac_plugin.dylib',
+  'demux/libdiracsys_plugin.dylib',
   'demux/libes_plugin.dylib',
   'demux/libflacsys_plugin.dylib',
   'access/liblive555_plugin.dylib',
@@ -144,7 +144,7 @@ VLC_PLUGINS=[
   'misc/libexport_plugin.dylib',
   #'libfreetype_plugin.dylib',
   #'libgnutls_plugin.dylib',
-  #'liblogger_plugin.dylib',
+  'misc/liblogger_plugin.dylib',
   'lua/liblua_plugin.dylib',
   #'libosd_parser_plugin.dylib',
   #'libquartztext_plugin.dylib',
@@ -152,9 +152,9 @@ VLC_PLUGINS=[
   'misc/libvod_rtsp_plugin.dylib',
   'misc/libxml_plugin.dylib',
   #'libxtag_plugin.dylib',
-  'mmx/libi420_rgb_mmx_plugin.dylib',
-  'mmx/libi420_yuy2_mmx_plugin.dylib',
-  'mmx/libi422_yuy2_mmx_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',
@@ -175,11 +175,11 @@ VLC_PLUGINS=[
   'packetizer/libpacketizer_mpeg4video_plugin.dylib',
   'packetizer/libpacketizer_mpegvideo_plugin.dylib',
   'packetizer/libpacketizer_vc1_plugin.dylib',
-  'sse2/libi420_rgb_sse2_plugin.dylib',
-  'sse2/libi420_yuy2_sse2_plugin.dylib',
-  'sse2/libi422_yuy2_sse2_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',
+  #'access/libstream_filter_rar_plugin.dylib',
   'stream_filter/librecord_plugin.dylib',
   #'libvisual_plugin.dylib',
 ]
@@ -199,11 +199,16 @@ QT_PLUGINS = [
     'imageformats/libqmng.dylib',
 ]
 
+SNORE_PLUGINS = [
+    'libsnore_backend_growl.so',
+    'libsnore_backend_osxnotificationcenter.so',
+]
+
 TOMAHAWK_PLUGINS = [
   '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,15 +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_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.5/plugins',
+    '/usr/local/Cellar/qt/4.8.6/plugins',
 ]
 
+SNORE_PLUGINS_SEARCH_PATH=[
+    '/usr/local/Cellar/snorenotify/HEAD/lib/libsnore',
+]
 
 class Error(Exception):
   pass
@@ -239,6 +251,10 @@ class CouldNotFindQtPluginError(Error):
   pass
 
 
+class CouldNotFindSnorePluginError(Error):
+  pass
+
+
 class CouldNotFindVLCPluginError(Error):
   pass
 
@@ -247,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 = []
@@ -260,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')
@@ -371,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]
@@ -491,6 +509,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:
@@ -502,11 +526,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:

admin/unix/tomahawk.desktop

@@ -10,7 +10,7 @@ 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
@@ -18,4 +18,4 @@ Comment[se]=Tomahawk — Den Sociala Musikspelaren
 Icon=tomahawk
 Terminal=false
 Categories=Qt;AudioVideo;Audio;Player;
-MimeType=x-scheme-handler/tomahawk;x-scheme-handler/spotify;
+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;

admin/win/update-vlc.sh

@@ -68,7 +68,6 @@ rm -rvf \
     services_discovery/ \
     visualization/ \
     control/ \
-    misc/ \
     **/libi420* \
     **/libi422* \
     mux/ \

data/icons/tomahawk-icon.svg

@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="3100px" height="3100px" viewBox="0 0 3100 3100" 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</title>
+<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>
-        <filter x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" id="filter-1">
-            <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.7 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-    </defs>
-    <g id="Page 1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <circle d="M1546,3051 C2374.42717,3051 3046,2379.42717 3046,1551 C3046,722.572834 2374.42717,51 1546,51 C717.572834,51 46,722.572834 46,1551 C46,2379.42717 717.572834,3051 1546,3051 Z M1546,3051" id="Oval 1" stroke="#979797" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="1546" cy="1551" r="1500"></circle>
-        <g id="Group" sketch:type="MSLayerGroup" transform="translate(46.000000, 48.000000)">
-            <path d="M1500.00026,326.562245 C852.333832,326.562245 325.623384,853.409757 325.623384,1501.14467 C325.623384,2148.84339 852.297589,2675.87184 1500.00026,2675.87184 C1592.85982,2675.87184 1682.97119,2664.36909 1769.71967,2643.75096 L1769.71967,1630.53256 L961.97175,2202.26973 C954.812018,2207.15297 945.916593,2209.9744 937.346612,2209.9744 C930.693123,2209.9744 923.894994,2208.56369 917.783909,2205.05499 C903.464446,2197.74821 894.56902,2183.06231 894.56902,2167.32742 L894.56902,827.040286 C894.56902,811.305396 903.464445,796.474809 917.783909,788.951001 C932.103373,781.969774 949.026377,783.199628 961.97175,792.27884 L1769.71967,1364.0522 L1769.71967,784.284802 L1804.10807,784.284802 L2127.56161,784.284802 L2127.56161,2492.84071 C2455.75216,2284.34437 2674.34095,1918.13743 2674.34095,1501.10857 C2674.34087,853.446289 2147.48558,326.562245 1500.00026,326.562245 L1500.00026,326.562245 L1500.00026,326.562245" id="Shape" sketch:type="MSShapeGroup"></path>
-            <path d="M1500.00026,0.904613118 C672.870406,0.904613118 0.0726019231,673.923876 0.0726019231,1501.14494 C0.0726019231,2328.4023 672.870475,3001.38527 1500.00026,3001.38527 C2326.94928,3001.38527 2999.78337,2328.40223 2999.78337,1501.14494 C2999.74681,673.923394 2326.94887,0.904613118 1500.00026,0.904613118 L1500.00026,0.904613118 L1500.00026,0.904613118 M2127.56146,2492.87708 L2127.56146,784.321176 L1804.10793,784.321176 L1769.71952,784.321176 L1769.71952,1364.08857 L961.971604,792.315213 C949.06239,783.236001 932.103228,782.006148 917.783763,788.987375 C903.464299,796.511184 894.568874,811.341769 894.568874,827.076659 L894.568874,2167.3638 C894.568874,2183.09869 903.464299,2197.78459 917.783763,2205.09136 C923.894847,2208.60006 930.692976,2210.01078 937.346465,2210.01078 C945.880287,2210.01078 954.775711,2207.18935 961.971604,2202.30611 L1769.71952,1630.56893 L1769.71952,2643.78733 C1682.97105,2664.36929 1592.85968,2675.90821 1500.00012,2675.90821 C852.333686,2675.90821 325.623237,2148.87983 325.623237,1501.18104 C325.623237,853.482317 852.297442,326.598618 1500.00012,326.598618 C2147.48578,326.598618 2674.377,853.44613 2674.377,1501.18104 C2674.34087,1918.17376 2455.75215,2284.38047 2127.56146,2492.87708 L2072.56159,399.051282" id="Shape" fill="#E63E30" filter="url(#filter-1)" sketch:type="MSShapeGroup"></path>
+    <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>

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>

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>

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>

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>

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>

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>

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>

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>

data/images/album-placeholder-grid.svg

@@ -1,26 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="355px" height="355px" viewBox="0 0 355 355" 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>
-        <path d="M177.5,219 C200.419818,219 219,200.419818 219,177.5 C219,154.580182 200.419818,136 177.5,136 C154.580182,136 136,154.580182 136,177.5 C136,200.419818 154.580182,219 177.5,219 Z M177.5,355 C79.4694521,355 0,275.530548 0,177.5 C0,79.4694521 79.4694521,0 177.5,0 C275.530548,0 355,79.4694521 355,177.5 C355,275.530548 275.530548,355 177.5,355 Z M177.5,355" id="path-1"></path>
-        <filter x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" id="filter-2">
-            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"></feOffset>
-            <feGaussianBlur stdDeviation="1.5" in="shadowOffsetInner1" result="shadowBlurInner1"></feGaussianBlur>
-            <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.7 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-                <feMergeNode in="shadowMatrixInner1"></feMergeNode>
-            </feMerge>
-        </filter>
-    </defs>
-    <g id="Page 1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <rect d="M-23,-22 L-23,378 L377,378 L377,-22 L-23,-22 Z M-23,-22" id="Rectangle 1" sketch:type="MSShapeGroup" x="-23" y="-22" width="400" height="400"></rect>
-        <g id="Oval 1">
-            <use fill="#0B0A0A" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
-            <use fill="none" xlink:href="#path-1"></use>
+    <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>
-        <circle d="M177.5,191 C184.40356,191 190,185.40356 190,178.5 C190,171.59644 184.40356,166 177.5,166 C170.59644,166 165,171.59644 165,178.5 C165,185.40356 170.59644,191 177.5,191 Z M177.5,191" id="Oval 2" stroke="#979797" fill-opacity="0.496897978" fill="#898989" filter="url(#filter-2)" sketch:type="MSShapeGroup" cx="177.5" cy="178.5" r="12.5"></circle>
     </g>
 </svg>

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>

data/images/arrow-down-double.svg

@@ -1,15 +1,74 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" 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-down-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(215,215,215)" fill-rule="evenodd">
-        <g id="arrow-up-double" fill="rgb(0,0,0)" transform="translate(22.000000, 23.500000) rotate(-180.000000) translate(-22.000000, -23.500000)">
-            <g id="Page 1" fill="rgb(222,223,222)">
-                <g id="Group" fill="rgb(0,0,0)">
-                    <path d="M3.48530778,39.7090464 L40.6463071,39.7090464 C41.8023053,39.7090464 42.8623067,39.0600481 43.3873082,38.0280466 C43.6143056,37.5890474 43.7243062,37.1090479 43.7243062,36.6310472 C43.7243062,35.9940462 43.5243054,35.3570452 43.1353055,34.8230448 L24.5533067,9.24104548 C23.9743062,8.44204569 23.0483056,7.9720459 22.0633069,7.9720459 C21.0783063,7.9720459 20.1523057,8.44404554 19.5743066,9.24104548 L0.993306841,34.8230448 C0.313306834,35.7580462 0.218306865,37.0010462 0.742306854,38.0280466 C1.2672902,39.0601206 2.32832536,39.7090464 3.48530778,39.7090464 C3.48530778,39.7090464 2.32832536,39.7090464 3.48530778,39.7090464 L3.48530778,39.7090464" id="Shape" fill="rgb(99,100,99)"></path>
-                </g>
+    <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>

data/images/arrow-right-double.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" 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(215,215,215)" fill-rule="evenodd">
-        <g id="arrow-up-double" fill="rgb(0,0,0)" transform="translate(22.000000, 22.500000) rotate(-270.000000) translate(-22.000000, -22.500000)">
-            <g id="Page 1" fill="rgb(222,223,222)">
-                <g id="Group" fill="rgb(0,0,0)">
-                    <path d="M3.76020197,38.3028483 L40.9212013,38.3028483 C42.0771995,38.3028483 43.1372009,37.65385 43.6622024,36.6218485 C43.8891998,36.1828494 43.9992004,35.7028498 43.9992004,35.2248492 C43.9992004,34.5878481 43.7991996,33.9508471 43.4101997,33.4168467 L24.8282009,7.83484741 C24.2492004,7.03584762 23.3231998,6.56584783 22.3382011,6.56584783 C21.3532005,6.56584783 20.4271999,7.03784748 19.8492008,7.83484741 L1.26820104,33.4168467 C0.588201029,34.3518481 0.49320106,35.5948481 1.01720105,36.6218485 C1.5421844,37.6539225 2.60321955,38.3028483 3.76020197,38.3028483 C3.76020197,38.3028483 2.60321955,38.3028483 3.76020197,38.3028483 L3.76020197,38.3028483" id="Shape" fill="rgb(99,100,99)"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

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>

data/images/artist-icon.svg

@@ -1,9 +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">
-        <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 M74.9125277,41.9861298 C74.7157469,41.3412425 74.1555699,40.9001649 73.5135216,40.8849538 L65.0060053,40.7024396 L62.5053189,40.6507282 L60.0046261,40.5944519 L57.8702057,40.551864 L56.870507,40.5290521 L56.3419287,38.9335645 L51.4080563,24.0601075 C51.1969142,23.4273891 50.6295549,23 49.9932524,23 C49.3569468,23 48.788151,23.4273891 48.5770089,24.0601075 L43.644573,38.9335645 L43.1145582,40.5290521 L42.1134231,40.551864 L39.9790026,40.5944519 L37.4797495,40.6507282 L34.9804964,40.7024396 L26.4715452,40.8849538 C25.8309318,40.9001649 25.2693183,41.3412425 25.0725375,41.9861298 C24.8757582,42.6325366 25.0883384,43.3367392 25.6011158,43.742836 L38.8543392,54.2739563 L34.0368129,70.9482269 C33.8515236,71.5961533 34.0712861,72.2942746 34.5869363,72.6942902 C34.7176437,72.7946676 34.8584062,72.8692004 35.0077889,72.9193891 C35.0551886,72.9376424 35.1054579,72.9361229 35.1571669,72.9498113 C35.257712,72.9711037 35.3596936,72.996961 35.4631115,72.9984805 L35.4746031,73 C35.5694024,73 35.6627653,72.9756622 35.7575645,72.9558894 C35.8078371,72.9452464 35.8595429,72.9498113 35.908379,72.931558 C36.0548873,72.8844083 36.1942133,72.8159663 36.3234874,72.7201411 L49.9946857,62.7502581 L63.6658872,72.7201411 C63.9229925,72.9072202 64.218882,73 64.5162079,73 C64.8278983,73 65.1395887,72.8996162 65.4038762,72.6942902 C65.9180869,72.2927551 66.1378509,71.5915947 65.9525617,70.9482269 L61.1335989,54.2739563 L74.389692,43.742836 C74.8982395,43.3351625 75.1093403,42.6309408 74.9125277,41.9861298 Z M74.9125277,41.9861298" 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>

data/images/artist-placeholder-grid.svg

@@ -4,11 +4,74 @@
     <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">
-        <rect d="M0,0 L0,200 L200,200 L200,0 L0,0 Z M0,0" id="Rectangle-1" sketch:type="MSShapeGroup" x="0" y="0" width="200" height="200"></rect>
-        <g sketch:type="MSLayerGroup" transform="translate(14.000000, 6.000000)" id="artist-placeholder" fill="#9B9B9B">
-            <g sketch:type="MSShapeGroup">
-                <g id="Page-1">
-                    <path d="M171,65 C171,63 169,61 166,61 L109,60 L91,3 C90,1 88,0 86,0 C83,0 82,1 81,3 L62,60 L5,61 C3,61 1,63 0,65 C0,67 0,70 2,71 L47,107 L31,165 C30,167 31,169 33,171 C35,172 37,172 39,171 L86,136 L133,171 C133,171 134,172 136,172 C137,172 138,171 139,171 C140,169 141,167 140,165 L124,107 L169,71 C171,70 172,67 171,65 C171,65 172,67 171,65 L171,65 M115,101 C113,102 112,104 113,107 L126,153 L89,125 C87,124 85,124 83,125 L45,153 L58,107 C59,104 58,102 57,101 L20,72 L66,71 C68,71 70,69 71,67 L86,21 L101,67 C101,69 103,71 106,71 L151,72 L115,101" id="Shape"></path>
+        <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>

data/images/automatic-playlist.svg

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="107px" height="107px" 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>automatic-playlist</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="55.1087141%" cy="29.5365341%" fx="55.1087141%" fy="29.5365341%" r="100%" id="radialGradient-1">
-            <stop stop-color="rgb(149,198,243)" offset="0%"></stop>
-            <stop stop-color="rgb(124,142,212)" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="g2598" fill="rgb(0,0,0)">
-            <path d="M20.0684075,81.2901123 L20.9789657,80.3761627 L28.3736486,85.5563411 L26.3575333,87.5775429 C24.502504,89.429181 24.502504,92.4457232 26.354142,94.2990568 C28.2074758,96.1523906 31.2223223,96.1523906 33.0807429,94.2990568 L37.4521008,89.9260028 C43.0087105,84.3710886 43.9158777,78.5380895 44.0939198,74.0751679 C44.1176588,73.4715203 44.1312239,72.8729597 44.126137,72.2777904 C44.1227457,70.6414986 44.0396594,69.0238586 43.9599643,67.4604792 C43.8802693,65.9310126 43.8175306,64.566023 43.8073568,63.1908597 C43.8005742,62.5685601 43.8073568,61.9479562 43.8310957,61.3358304 C43.8972257,59.8487549 44.0633983,58.2497669 44.516134,56.5795623 L52.9519391,62.4854738 C50.8357813,63.3502498 48.8077968,63.6622475 46.9392023,63.7792466 C46.9561587,64.8831078 47.0172017,66.0293599 47.0799404,67.2807417 C47.1562441,68.7627304 47.2291566,70.2141976 47.2478087,71.7080559 C53.384327,71.8182724 59.8447124,70.9823223 65.7777551,65.0492805 C71.9193604,58.9059797 72.6027032,52.2065091 72.4263565,45.8834694 C72.4077045,45.2781262 72.3839656,44.6710873 72.358531,44.0742222 C72.334792,43.5638348 72.3093574,43.0619256 72.2822272,42.5634077 C72.1499673,39.9283843 72.0160118,37.203492 72.3127487,34.6159469 C72.3907481,33.9139523 72.4958778,33.2797832 72.6213551,32.67444 C72.9180919,31.2941897 73.364045,30.0071996 73.9575188,28.7829478 C73.9575188,28.7829478 79.759797,31.8201554 80.0533419,33.0525673 C80.3468867,34.2849792 77.0808863,34.5243821 75.4191598,34.919466 C75.1444662,37.2391005 75.2733348,39.7486466 75.4055946,42.4023221 L75.4496813,43.3298368 C79.8227349,43.089056 85.3674752,42.0089338 90.6561747,36.720235 L95.0326197,32.3488769 C96.8859535,30.4938476 96.8842578,27.4756096 95.0292285,25.6256675 C93.1758947,23.7689425 90.162744,23.7689425 88.3077145,25.6222762 L87.3140699,26.6176165 L79.9176915,21.4391344 L82.0219799,19.3365417 C83.873618,17.4832079 83.873618,14.4683613 82.0202843,12.6150278 C80.165255,10.7599985 77.1504084,10.7599985 75.2987703,12.6150278 L70.9240212,16.9880814 C65.3724985,22.5413 64.4619399,28.3692118 64.2838981,32.8372216 C64.2584636,33.4408692 64.2482897,34.0428211 64.251681,34.6362948 C64.2550723,36.2437608 64.3347673,37.8291835 64.4127667,39.3637372 C64.4924618,40.9101602 64.561983,42.320932 64.5721568,43.7181389 C64.5772437,44.3421341 64.5738524,44.9627381 64.5450266,45.5765594 C64.4755054,47.1518083 64.294072,48.8491431 63.7735107,50.6244775 L55.1087939,44.559176 C57.3385596,43.5943573 59.4784561,43.2552295 61.4386153,43.1314478 C61.4199633,41.9987608 61.3589203,40.8236829 61.2961816,39.6316486 C61.2232691,38.1852683 61.1469654,36.7236272 61.1334002,35.2026389 C54.9951864,35.0924223 48.5314091,35.9317638 42.5949771,41.8681967 C36.4550673,48.0081065 35.7734208,54.7024898 35.949767,61.0255295 C35.9650278,61.6376553 35.9955493,62.2396072 36.0175926,62.8415591 L36.0938963,64.350678 C36.2244606,66.9873969 36.3618074,69.7088981 36.0650705,72.2964433 C35.9853754,73.0001335 35.8819414,73.632607 35.7547685,74.2379502 C35.4495534,75.6605915 34.9883396,76.9797988 34.3677356,78.234572 L28.2159564,73.9293439 C29.6945537,73.040829 31.2528463,72.4015729 32.9569637,71.992924 C33.2333529,69.6715939 33.1044843,67.1603523 32.9722244,64.5134597 L32.9247465,63.5842494 C28.5567799,63.8216389 23.0086482,64.9017611 17.7199494,70.1921557 L13.3468958,74.5652093 C11.4901708,76.4185431 11.4935621,79.4384766 13.3468958,81.2901146 C15.2002268,83.1451418 18.2150736,83.1451418 20.0684075,81.2901123 Z M20.0684075,81.2901123" id="path2600" fill="url(#radialGradient-1)"></path>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="g2550-+-g2554" sketch:type="MSLayerGroup" transform="translate(0.000000, 2.000000)" fill="#000000">
+            <g id="g2550" sketch:type="MSShapeGroup">
+                <path d="M54.8541622,14.9280009 L43.0142092,21.7644343 L30.0939982,21.7644343 C27.0593814,21.7644343 24.590457,24.2070779 24.590457,27.2088415 C24.590457,30.2139034 27.0593816,32.6532486 30.0939982,32.6532486 L42.0098167,32.6532486 L54.8541622,40.0702432 C55.9509123,40.7035823 56.3252917,42.1055047 55.6919804,43.1990041 C55.0603183,44.2958023 53.6601065,44.6701981 52.5650056,44.036859 L34.7564225,33.7566447 L45.0378364,51.5643579 C45.6694985,52.6611561 45.2951191,54.0614293 44.2000183,54.6931189 C43.1049175,55.3248086 41.7030563,54.9504129 41.0713944,53.8536147 L30.9878908,36.3873104 L30.9878908,43.9593409 C30.9878908,45.2227204 29.9620585,46.2485978 28.6987342,46.2485978 C27.4337608,46.2485978 26.4079283,45.2227205 26.4079283,43.9593409 L26.4079283,35.7061409 L15.9286048,53.8536147 C15.2969427,54.9504129 13.896731,55.3248086 12.8016301,54.6931189 C11.7065293,54.0614291 11.3321499,52.661156 11.9638119,51.5643579 L22.246875,33.7549947 L4.43664347,44.035209 C3.33989335,44.6685481 1.93968152,44.2958016 1.30801961,43.1990035 C0.674708276,42.1038547 1.04908763,40.7035815 2.14583775,40.0702425 L19.5668466,30.0126861 L12.4602358,30.0126861 C11.1969117,30.0126861 10.1710792,28.9851594 10.1710792,27.7234292 C10.1710792,26.4551018 11.1969116,25.4308737 12.4602358,25.4308737 L20.3403438,25.4308737 L2.14748629,14.9280009 C1.05073617,14.2930125 0.676356815,12.8943886 1.30801892,11.79924 C1.73352495,11.063643 2.50207462,10.6529622 3.29371381,10.6529622 C3.6829364,10.6529622 4.07545749,10.7535708 4.43664288,10.9613852 L22.2452261,21.2415995 L11.965462,3.43388621 C11.3321507,2.33873744 11.70653,0.94176288 12.8016309,0.306774504 C13.1628163,0.0973107947 13.5553374,8.84764461e-07 13.94456,8.84764461e-07 C14.7361992,8.84764461e-07 15.5063981,0.410681685 15.9302549,1.14462932 L26.4079293,19.2937516 L26.4079293,11.4842188 C26.4079293,10.21919 27.4337617,9.19331255 28.6987352,9.19331255 C29.9620593,9.19331255 30.9878918,10.2191899 30.9878918,11.4842188 L30.9878918,18.612582 L41.0730445,1.14627773 C41.4969013,0.410680776 42.2671002,0 43.0587394,0 C43.4463127,0 43.8404831,0.0989592276 44.2000191,0.30677362 C45.2967693,0.941761995 45.6711486,2.34038586 45.0394865,3.43388533 L34.7580726,21.2415986 L52.5650058,10.9630335 C52.9245419,10.7535698 53.3187123,10.6546105 53.7079349,10.6546105 C54.499574,10.6546105 55.269773,11.0652913 55.6919805,11.799239 C56.3252917,12.896038 55.9509123,14.2946618 54.8541622,14.9280009" id="path2552"></path>
+            </g>
+            <g id="g2554" transform="translate(26.000000, 24.000000)" sketch:type="MSShapeGroup">
+                <path d="M1.88781858,7 C0.845060474,7 0,5.43204391 0,3.5 C0,1.56612642 0.845060474,0 1.88781858,0 L33,0 L33,7 L1.88781858,7 L1.88781858,7 L1.88781858,7" id="path2556"></path>
+            </g>
         </g>
     </g>
 </svg>

data/images/back-pressed.svg

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="122px" height="122px" 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>back-pressed</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="50%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="rgb(37,41,44)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <path d="M61,106 C85.852815,106 106,85.852815 106,61 C106,36.147185 85.852815,16 61,16 C36.147185,16 16,36.147185 16,61 C16,85.852815 36.147185,106 61,106 Z M61,121 C27.8629134,121 1,94.1370866 1,61 C1,27.8629134 27.8629134,1 61,1 C94.1370866,1 121,27.8629134 121,61 C121,94.1370866 94.1370866,121 61,121 Z M72.020667,47.866611 C72.5906846,47.4418988 73.3484729,47.3820274 73.9739682,47.7088251 C74.602506,48.0362617 74.9981666,48.6973776 75,49.4182771 L75,72.5816226 C75,73.3019496 74.603731,73.963029 73.9751875,74.2898267 C73.7063342,74.4307738 73.4155337,74.5 73.1241236,74.5 C72.7357801,74.5 72.3474365,74.3758917 72.0212766,74.1332881 L64.3385355,68.4243067 L64.3385355,72.5816224 C64.3385355,73.3019495 63.9416569,73.9630288 63.3131133,74.2898265 C63.0448697,74.4307736 62.7534596,74.4999998 62.4620495,74.4999998 C62.0737059,74.4999998 61.6853623,74.3758915 61.3598121,74.1332879 L45.773639,62.5513035 C45.2865329,62.1895808 45,61.6126956 45,60.9983907 C45,60.3847096 45.2877523,59.8072007 45.773639,59.4467253 L61.3598121,47.8666109 C61.9298299,47.4418986 62.6870084,47.3820273 63.3125037,47.708825 C63.941657,48.0362464 64.3379259,48.6973257 64.3379259,49.4189 L64.3379259,53.5737213 Z M72.020667,47.866611" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M61,121 C94.1370866,121 121,94.1370866 121,61 C121,27.8629134 94.1370866,1 61,1 C27.8629134,1 1,27.8629134 1,61 C1,94.1370866 27.8629134,121 61,121 Z M61,121" id="Oval 18" stroke="rgb(150,150,150)" stroke-width="1" fill-opacity="0.00241268382" fill="rgb(254,255,254)"></path>
-        <use id="Oval 33" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-        <use id="Oval 33-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-    </g>
-</svg>