Index: head/audio/picard-plugins/Makefile
===================================================================
--- head/audio/picard-plugins/Makefile	(revision 496238)
+++ head/audio/picard-plugins/Makefile	(revision 496239)
@@ -1,69 +1,76 @@
 # $FreeBSD$
 
 PORTNAME=	picard-plugins
-PORTVERSION=	2.0.20190212
+PORTVERSION=	2.0.20190312
 CATEGORIES=	audio python
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Plugins for Picard tagger
 
 LICENSE=	GPLv2+ GPLv3+ MIT WTFPL
 LICENSE_COMB=	multi
 
 USES=		python:3.5+
 USE_PYTHON=	noflavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	metabrainz
-GH_TAGNAME=	e67ac70
+GH_TAGNAME=	8cb6013
 
 PORTSCOUT=	limit:^2\.
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	GCC_VER=${GCC_DEFAULT:S/.//}
 
+BUILD_WRKSRC=	${WRKSRC}/build
 PLUGINSDIR=	${PYTHON_SITELIBDIR}/picard/plugins
 
-OPTIONS_DEFINE=		BPM MOODBAR
+OPTIONS_DEFINE=		ALBUM_COLUMN BPM MOODBAR
 OPTIONS_GROUP=		REPLAYGAIN
 OPTIONS_GROUP_REPLAYGAIN=	FLAC MP3 VORBIS WAVPACK
 OPTIONS_SUB=		yes
 
+ALBUM_COLUMN_DESC=	Adds album column to main window (can't be disabled)
+
 BPM_DESC=		Beats per minute
 BPM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aubio>=0.4.5:audio/py-aubio@${PY_FLAVOR}
 
 MOODBAR_DESC=		Generate moodbar files
 MOODBAR_RUN_DEPENDS=	moodbar:audio/moodbar
 
 REPLAYGAIN_DESC=	ReplayGain audio normalization
 FLAC_RUN_DEPENDS=	metaflac:audio/flac
 MP3_RUN_DEPENDS=	mp3gain:audio/mp3gain
 VORBIS_RUN_DEPENDS=	vorbisgain:audio/vorbisgain
 WAVPACK_RUN_DEPENDS=	wvgain:audio/wavpack
 
 do-build:
 # Plugins that include a separate UI (those with an __init__.py) must
 # be installed into their own subdirectories under PLUGINSDIR. Plugins
 # written as a single .py file must be installed directly in PLUGINSDIR.
 # We copy them into the correct hierarchy and compile them here.
-	@${MKDIR} ${WRKSRC}/build
+	@${MKDIR} ${BUILD_WRKSRC}
 	@(cd ${WRKSRC}/plugins; \
 	   for dir in *; \
 	   do \
 	      if [ -f $${dir}/__init__.py ]; \
-		 then ${CP} -R $${dir} ${WRKSRC}/build; \
-		 else ${CP} -R $${dir}/* ${WRKSRC}/build; \
+		 then ${CP} -R $${dir} ${BUILD_WRKSRC}; \
+		 else ${CP} -R $${dir}/* ${BUILD_WRKSRC}; \
 	      fi; \
 	   done;)
-	${PYTHON_CMD} -m compileall ${WRKSRC}/build
-	${PYTHON_CMD} -O -m compileall ${WRKSRC}/build
+	${FIND} ${BUILD_WRKSRC} -type f \( -name '.*' -o -name '*.bak' -o -name '*.orig' \) -exec ${RM} {} \;
+	${PYTHON_CMD} -m compileall ${BUILD_WRKSRC}
+	${PYTHON_CMD} -O -m compileall ${BUILD_WRKSRC}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PLUGINSDIR}
-	(cd ${WRKSRC}/build; ${COPYTREE_SHARE} . ${STAGEDIR}${PLUGINSDIR})
+	(cd ${BUILD_WRKSRC}; ${COPYTREE_SHARE} . ${STAGEDIR}${PLUGINSDIR})
+
+post-install-ALBUM_COLUMN-off:
+	@${RM} -r ${STAGEDIR}${PLUGINSDIR}/add_album_column
 
 post-install-BPM-off:
 	@${RM} -r ${STAGEDIR}${PLUGINSDIR}/bpm
 
 .include <bsd.port.mk>
Index: head/audio/picard-plugins/distinfo
===================================================================
--- head/audio/picard-plugins/distinfo	(revision 496238)
+++ head/audio/picard-plugins/distinfo	(revision 496239)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550129398
-SHA256 (metabrainz-picard-plugins-2.0.20190212-e67ac70_GH0.tar.gz) = dc9211c4f0c64120dfadb5d290c60007d4a60ab66c764467935dabe5dcc8e540
-SIZE (metabrainz-picard-plugins-2.0.20190212-e67ac70_GH0.tar.gz) = 362357
+TIMESTAMP = 1552816314
+SHA256 (metabrainz-picard-plugins-2.0.20190312-8cb6013_GH0.tar.gz) = 4d43b3fb888f0c60b379f45941dfe8b5d1b442d7d13e04a8a06dfb05d355d3c0
+SIZE (metabrainz-picard-plugins-2.0.20190312-8cb6013_GH0.tar.gz) = 371062
Index: head/audio/picard-plugins/pkg-plist
===================================================================
--- head/audio/picard-plugins/pkg-plist	(revision 496238)
+++ head/audio/picard-plugins/pkg-plist	(revision 496239)
@@ -1,244 +1,258 @@
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/abbreviate_artistsort.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/abbreviate_artistsort.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/acousticbrainz.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/acousticbrainz.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/acousticbrainz_tonal-rhythm.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/acousticbrainz_tonal-rhythm.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/addrelease.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/addrelease.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartist_website.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartist_website.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartistextension.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/albumartistextension.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/amazon.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/amazon.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/apiseeds_lyrics.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/apiseeds_lyrics.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/classicdiscnumber.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/classicdiscnumber.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/compatible_TXXX.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/compatible_TXXX.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/cuesheet.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/cuesheet.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/decode_cyrillic.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/decode_cyrillic.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/discnumber.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/discnumber.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartist.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartist.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartistsintitles.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/featartistsintitles.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/fix_tracknums.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/fix_tracknums.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/instruments.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/instruments.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/keep.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/keep.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/loadasnat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/loadasnat.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/no_release.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/no_release.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/non_ascii_equivalents.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/non_ascii_equivalents.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/padded.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/padded.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/papercdcase.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/papercdcase.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/playlist.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/playlist.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/release_type.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/release_type.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/remove_perfect_albums.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/remove_perfect_albums.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/reorder_sides.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/reorder_sides.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/save_and_rewrite_header.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/save_and_rewrite_header.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/smart_title_case.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/smart_title_case.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/sort_multivalue_tags.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/sort_multivalue_tags.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/soundtrack.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/soundtrack.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_feat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_feat.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_performers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/standardise_performers.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/tangoinfo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/tangoinfo.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/titlecase.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/titlecase.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/tracks2clipboard.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/tracks2clipboard.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/wikidata.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/picard/plugins/__pycache__/wikidata.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/abbreviate_artistsort.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/acousticbrainz_tonal-rhythm.py
+%%ALBUM_COLUMN%%%%PYTHON_SITELIBDIR%%/picard/plugins/add_album_column/__init__.py
+%%ALBUM_COLUMN%%%%PYTHON_SITELIBDIR%%/picard/plugins/add_album_column/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%ALBUM_COLUMN%%%%PYTHON_SITELIBDIR%%/picard/plugins/add_album_column/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/addrelease.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/albumartist_website.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/albumartistextension.py
+%%PYTHON_SITELIBDIR%%/picard/plugins/amazon.py
+%%PYTHON_SITELIBDIR%%/picard/plugins/apiseeds_lyrics.py
 %%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__init__.py
 %%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/ui_options_bpm.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/__pycache__/ui_options_bpm.cpython-%%PYTHON_SUFFIX%%.pyc
 %%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/options_bpm.ui
 %%BPM%%%%PYTHON_SITELIBDIR%%/picard/plugins/bpm/ui_options_bpm.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/Readme.md
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/suffixtree.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/suffixtree.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/ui_options_classical_extras.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/__pycache__/ui_options_classical_extras.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/const.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/options_classical_extras.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/suffixtree.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/classical_extras/ui_options_classical_extras.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/classicdiscnumber.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/compatible_TXXX.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/cuesheet.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/decode_cyrillic.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/discnumber.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/ui_options_fanarttv.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/__pycache__/ui_options_fanarttv.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/options_fanarttv.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/fanarttv/ui_options_fanarttv.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/featartist.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/featartistsintitles.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/fix_tracknums.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/ui_options_format_performer_tags.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/__pycache__/ui_options_format_performer_tags.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/docs/HISTORY.md
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/docs/README.md
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/docs/default_settings.jpg
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/options_format_performer_tags.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/format_performer_tags/ui_options_format_performer_tags.py
+%%PYTHON_SITELIBDIR%%/picard/plugins/instruments.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/keep.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/ui_options_lastfm.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/__pycache__/ui_options_lastfm.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/options_lastfm.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/lastfm/ui_options_lastfm.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/loadasnat.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/ui_options_moodbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/__pycache__/ui_options_moodbar.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/options_moodbar.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/moodbars/ui_options_moodbar.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/README
 %%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/ui_options_musixmatch.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/__pycache__/ui_options_musixmatch.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/musixmatch/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/musixmatch/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/musixmatch/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/musixmatch/__pycache__/track.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/musixmatch/__pycache__/track.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/musixmatch/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/musixmatch/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/musixmatch/track.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/musixmatch/util.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/musixmatch/ui_options_musixmatch.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/no_release.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/non_ascii_equivalents.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/padded.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/papercdcase.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/playlist.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/release_type.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/remove_perfect_albums.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/reorder_sides.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/replaygain/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/replaygain/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/replaygain/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/replaygain/__pycache__/ui_options_replaygain.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/replaygain/__pycache__/ui_options_replaygain.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/replaygain/options_replaygain.ui
 %%PYTHON_SITELIBDIR%%/picard/plugins/replaygain/ui_options_replaygain.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/save_and_rewrite_header.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/smart_title_case.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/sort_multivalue_tags.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/soundtrack.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/standardise_feat.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/standardise_performers.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/tangoinfo.py
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__init__.py
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/ui_options_theaudiodb.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/__pycache__/ui_options_theaudiodb.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/options_theaudiodb.ui
+%%PYTHON_SITELIBDIR%%/picard/plugins/theaudiodb/ui_options_theaudiodb.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/titlecase.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/tracks2clipboard.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/__pycache__/formats.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/__pycache__/formats.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/__pycache__/script.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/asf.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/asf.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/core.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/core.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/flv.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/flv.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/fourcc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/fourcc.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/infos.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/infos.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/language.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/language.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/mkv.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/mkv.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/mp4.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/mp4.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/mpeg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/mpeg.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/ogm.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/ogm.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/real.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/real.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/riff.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/riff.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/strutils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/__pycache__/strutils.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/asf.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/core.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/exceptions.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/flv.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/fourcc.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/infos.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/language.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/mkv.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/mp4.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/mpeg.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/ogm.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/real.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/riff.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/enzyme/strutils.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/formats.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/videotools/script.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/ui_variables_dialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/__pycache__/ui_variables_dialog.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/ui_variables_dialog.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/viewvariables/variables_dialog.ui
-%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata.py
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__init__.py
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/ui_options_wikidata.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/__pycache__/ui_options_wikidata.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/options_wikidata.ui
+%%PYTHON_SITELIBDIR%%/picard/plugins/wikidata/ui_options_wikidata.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__init__.py
 %%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/roman.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/__pycache__/roman.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/picard/plugins/workandmovement/roman.py