diff --git a/.gitignore b/.gitignore
index 36704c2..f4ed717 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,13 +9,3 @@
 /cozy-0.9.3.tar.gz
 /cozy-0.9.4.tar.gz
 /cozy-0.9.5.tar.gz
-/cozy-1.0.1.tar.gz
-/cozy-1.0.3.tar.gz
-/cozy-1.0.4.tar.gz
-/cozy-1.1.0.tar.gz
-/cozy-1.1.1.tar.gz
-/cozy-1.1.2.tar.gz
-/cozy-1.1.3.tar.gz
-/cozy-1.2.0.tar.gz
-/cozy-1.2.1.tar.gz
-/cozy-1.3.0.tar.gz
diff --git a/0000--unbundle-inject.patch b/0000--unbundle-inject.patch
deleted file mode 100644
index a618e10..0000000
--- a/0000--unbundle-inject.patch
+++ /dev/null
@@ -1,667 +0,0 @@
-diff -r -U4 cozy-1.3.0--orig/cozy/app_controller.py cozy-1.3.0--patched/cozy/app_controller.py
---- cozy-1.3.0--orig/cozy/app_controller.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/app_controller.py	2024-03-03 11:51:34.062151406 +0100
-@@ -1,7 +1,7 @@
- from gi.repository import Gio
- 
--import cozy.ext.inject as inject
-+import inject
- from peewee import SqliteDatabase
- 
- from cozy.control.offline_cache import OfflineCache
- from cozy.media.files import Files
-diff -r -U4 cozy-1.3.0--orig/cozy/application_settings.py cozy-1.3.0--patched/cozy/application_settings.py
---- cozy-1.3.0--orig/cozy/application_settings.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/application_settings.py	2024-03-03 11:52:23.623579214 +0100
-@@ -1,8 +1,8 @@
- from gi.repository import Gio
- 
- from cozy.architecture.event_sender import EventSender
--from cozy.ext import inject
-+import inject
- 
- 
- class ApplicationSettings(EventSender):
-     _settings: Gio.Settings = inject.attr(Gio.Settings)
-diff -r -U4 cozy-1.3.0--orig/cozy/control/artwork_cache.py cozy-1.3.0--patched/cozy/control/artwork_cache.py
---- cozy-1.3.0--orig/cozy/control/artwork_cache.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/control/artwork_cache.py	2024-03-03 11:52:23.625579231 +0100
-@@ -6,9 +6,9 @@
- 
- from cozy.application_settings import ApplicationSettings
- from cozy.control.application_directories import get_cache_dir
- from cozy.db.artwork_cache import ArtworkCache as ArtworkCacheModel
--from cozy.ext import inject
-+import inject
- from cozy.media.importer import Importer, ScanStatus
- from cozy.report import reporter
- 
- log = logging.getLogger("artwork_cache")
-diff -r -U4 cozy-1.3.0--orig/cozy/control/filesystem_monitor.py cozy-1.3.0--patched/cozy/control/filesystem_monitor.py
---- cozy-1.3.0--orig/cozy/control/filesystem_monitor.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/control/filesystem_monitor.py	2024-03-03 11:51:34.062151406 +0100
-@@ -1,8 +1,8 @@
- import logging
- from typing import List
- 
--import cozy.ext.inject as inject
-+import inject
- from gi.repository import Gio
- 
- from cozy.architecture.event_sender import EventSender
- from cozy.model.book import Book
-diff -r -U4 cozy-1.3.0--orig/cozy/control/mpris.py cozy-1.3.0--patched/cozy/control/mpris.py
---- cozy-1.3.0--orig/cozy/control/mpris.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/control/mpris.py	2024-03-03 11:52:23.625579231 +0100
-@@ -15,9 +15,9 @@
- from gi.repository import Gio, GLib
- 
- from cozy.application_settings import ApplicationSettings
- from cozy.control.artwork_cache import ArtworkCache
--from cozy.ext import inject
-+import inject
- from cozy.media.player import NS_TO_SEC, US_TO_SEC, Player
- from cozy.model.book import Book
- from cozy.report import reporter
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/control/offline_cache.py cozy-1.3.0--patched/cozy/control/offline_cache.py
---- cozy-1.3.0--orig/cozy/control/offline_cache.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/control/offline_cache.py	2024-03-03 11:52:23.624579222 +0100
-@@ -12,9 +12,9 @@
- 
- from cozy.db.file import File
- from cozy.db.offline_cache import OfflineCache as OfflineCacheModel
- from cozy.db.track_to_file import TrackToFile
--from cozy.ext import inject
-+import inject
- from cozy.model.book import Book
- from cozy.model.chapter import Chapter
- from cozy.report import reporter
- from cozy.view_model.settings_view_model import SettingsViewModel
-diff -r -U4 cozy-1.3.0--orig/cozy/media/files.py cozy-1.3.0--patched/cozy/media/files.py
---- cozy-1.3.0--orig/cozy/media/files.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/media/files.py	2024-03-03 11:52:23.626579240 +0100
-@@ -5,9 +5,9 @@
- 
- from gi.repository import Gio
- 
- from cozy.architecture.event_sender import EventSender
--from cozy.ext import inject
-+import inject
- from cozy.media.importer import Importer
- from cozy.model.settings import Settings
- from cozy.report import reporter
- from cozy.ui.toaster import ToastNotifier
-diff -r -U4 cozy-1.3.0--orig/cozy/media/importer.py cozy-1.3.0--patched/cozy/media/importer.py
---- cozy-1.3.0--orig/cozy/media/importer.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/media/importer.py	2024-03-03 11:52:23.626579240 +0100
-@@ -9,9 +9,9 @@
- 
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.profiler import timing
- from cozy.control.filesystem_monitor import FilesystemMonitor, StorageNotFound
--from cozy.ext import inject
-+import inject
- from cozy.media.media_detector import MediaDetector, NotAnAudioFile, AudioFileCouldNotBeDiscovered
- from cozy.media.media_file import MediaFile
- from cozy.model.database_importer import DatabaseImporter
- from cozy.model.library import Library
-diff -r -U4 cozy-1.3.0--orig/cozy/media/player.py cozy-1.3.0--patched/cozy/media/player.py
---- cozy-1.3.0--orig/cozy/media/player.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/media/player.py	2024-03-03 11:52:23.626579240 +0100
-@@ -9,9 +9,9 @@
- 
- from cozy.application_settings import ApplicationSettings
- from cozy.architecture.event_sender import EventSender
- from cozy.control.offline_cache import OfflineCache
--from cozy.ext import inject
-+import inject
- from cozy.media.gst_player import GstPlayer, GstPlayerState
- from cozy.model.book import Book
- from cozy.model.chapter import Chapter
- from cozy.model.library import Library
-diff -r -U4 cozy-1.3.0--orig/cozy/model/book.py cozy-1.3.0--patched/cozy/model/book.py
---- cozy-1.3.0--orig/cozy/model/book.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/model/book.py	2024-03-03 11:52:23.624579222 +0100
-@@ -10,9 +10,9 @@
- from cozy.db.collation import collate_natural
- from cozy.db.book import Book as BookModel
- from cozy.db.track import Track as TrackModel
- from cozy.db.track_to_file import TrackToFile
--from cozy.ext import inject
-+import inject
- from cozy.model.chapter import Chapter
- from cozy.model.settings import Settings
- from cozy.model.track import Track, TrackInconsistentData
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/model/database_importer.py cozy-1.3.0--patched/cozy/model/database_importer.py
---- cozy-1.3.0--orig/cozy/model/database_importer.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/model/database_importer.py	2024-03-03 11:52:23.624579222 +0100
-@@ -6,9 +6,9 @@
- from cozy.db.book import Book as BookModel
- from cozy.db.file import File
- from cozy.db.track import Track
- from cozy.db.track_to_file import TrackToFile
--from cozy.ext import inject
-+import inject
- from cozy.extensions.is_same_book import is_same_book
- from cozy.media.media_file import MediaFile
- from cozy.model.book import Book, BookIsEmpty
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/model/library.py cozy-1.3.0--patched/cozy/model/library.py
---- cozy-1.3.0--orig/cozy/model/library.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/model/library.py	2024-03-03 11:52:23.624579222 +0100
-@@ -6,9 +6,9 @@
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.profiler import timing
- from cozy.db.book import Book as BookModel
- from cozy.db.file import File
--from cozy.ext import inject
-+import inject
- from cozy.extensions.set import split_strings_to_set
- from cozy.model.book import Book, BookIsEmpty
- from cozy.model.chapter import Chapter
- from cozy.model.settings import Settings
-diff -r -U4 cozy-1.3.0--orig/cozy/model/settings.py cozy-1.3.0--patched/cozy/model/settings.py
---- cozy-1.3.0--orig/cozy/model/settings.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/model/settings.py	2024-03-03 11:51:34.061151397 +0100
-@@ -3,9 +3,9 @@
- 
- import peewee
- from peewee import SqliteDatabase
- 
--import cozy.ext.inject as inject
-+import inject
- from cozy.db.book import Book
- from cozy.db.settings import Settings as SettingsModel
- from cozy.db.storage import Storage as StorageModel
- from cozy.model.storage import InvalidPath, Storage
-diff -r -U4 cozy-1.3.0--orig/cozy/power_manager.py cozy-1.3.0--patched/cozy/power_manager.py
---- cozy-1.3.0--orig/cozy/power_manager.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/power_manager.py	2024-03-03 11:52:23.627579248 +0100
-@@ -1,9 +1,9 @@
- import logging
- 
- from gi.repository import Gtk
- 
--from cozy.ext import inject
-+import inject
- from cozy.media.player import Player
- 
- log = logging.getLogger("power_mgr")
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/report/report_to_loki.py cozy-1.3.0--patched/cozy/report/report_to_loki.py
---- cozy-1.3.0--orig/cozy/report/report_to_loki.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/report/report_to_loki.py	2024-03-03 11:52:23.625579231 +0100
-@@ -6,9 +6,9 @@
- import distro
- import platform
- 
- from cozy.application_settings import ApplicationSettings
--from cozy.ext import inject
-+import inject
- from cozy.report.log_level import LogLevel
- from cozy.version import __version__ as CozyVersion
- from peewee import __version__ as PeeweeVersion
- from mutagen import version_string as MutagenVersion
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/app_view.py cozy-1.3.0--patched/cozy/ui/app_view.py
---- cozy-1.3.0--orig/cozy/ui/app_view.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/app_view.py	2024-03-03 11:52:23.629579266 +0100
-@@ -1,7 +1,7 @@
- from gi.repository import Gtk, Adw
- 
--from cozy.ext import inject
-+import inject
- from cozy.view_model.app_view_model import AppViewModel
- from cozy.view import View
- 
- LIBRARY = "main"
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/book_detail_view.py cozy-1.3.0--patched/cozy/ui/book_detail_view.py
---- cozy-1.3.0--orig/cozy/ui/book_detail_view.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/book_detail_view.py	2024-03-03 11:52:23.630579274 +0100
-@@ -5,9 +5,9 @@
- 
- import gi
- 
- from cozy.control.artwork_cache import ArtworkCache
--from cozy.ext import inject
-+import inject
- from cozy.model.book import Book
- from cozy.model.chapter import Chapter
- from cozy.report import reporter
- from cozy.ui.chapter_element import ChapterElement
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/delete_book_view.py cozy-1.3.0--patched/cozy/ui/delete_book_view.py
---- cozy-1.3.0--orig/cozy/ui/delete_book_view.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/delete_book_view.py	2024-03-03 11:52:23.629579266 +0100
-@@ -1,7 +1,7 @@
- from gi.repository import Adw, Gtk
- 
--from cozy.ext import inject
-+import inject
- from cozy.model.book import Book
- from cozy.ui.widgets.book_row import BookRow
- 
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/file_not_found_dialog.py cozy-1.3.0--patched/cozy/ui/file_not_found_dialog.py
---- cozy-1.3.0--orig/cozy/ui/file_not_found_dialog.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/file_not_found_dialog.py	2024-03-03 11:52:23.627579248 +0100
-@@ -1,9 +1,9 @@
- from pathlib import Path
- 
- from gi.repository import Adw, Gio, GLib, Gtk
- 
--from cozy.ext import inject
-+import inject
- from cozy.media.importer import Importer
- from cozy.model.chapter import Chapter
- 
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/headerbar.py cozy-1.3.0--patched/cozy/ui/headerbar.py
---- cozy-1.3.0--orig/cozy/ui/headerbar.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/headerbar.py	2024-03-03 11:52:23.631579283 +0100
-@@ -1,15 +1,15 @@
- import logging
- 
- import gi
- 
--from cozy.ext import inject
-+import inject
- from cozy.ui.widgets.progress_popover import ProgressPopover
- from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState
- 
- from gi.repository import Adw, Gtk, GObject
- 
--from cozy.ext import inject
-+import inject
- from cozy.ui.widgets.progress_popover import ProgressPopover
- from cozy.view_model.headerbar_view_model import HeaderBarState, HeaderbarViewModel
- 
- log = logging.getLogger("Headerbar")
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/import_failed_dialog.py cozy-1.3.0--patched/cozy/ui/import_failed_dialog.py
---- cozy-1.3.0--orig/cozy/ui/import_failed_dialog.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/import_failed_dialog.py	2024-03-03 11:52:23.630579274 +0100
-@@ -1,9 +1,9 @@
- from gettext import gettext as _
- 
- from gi.repository import Adw, Gtk
- 
--from cozy.ext import inject
-+import inject
- 
- 
- HEADER = _("This can have multiple reasons:")
- POSSIBILITIES = "\n     • ".join((  # yes, it is a hack, because \t would be too wide
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/library_view.py cozy-1.3.0--patched/cozy/ui/library_view.py
---- cozy-1.3.0--orig/cozy/ui/library_view.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/library_view.py	2024-03-03 11:52:23.629579266 +0100
-@@ -2,9 +2,9 @@
- from typing import Optional
- 
- from gi.repository import Adw, Gtk
- 
--from cozy.ext import inject
-+import inject
- from cozy.ui.widgets.book_element import BookElement
- from cozy.ui.delete_book_view import DeleteBookView
- from cozy.ui.widgets.filter_list_box import FilterListBox
- from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/main_view.py cozy-1.3.0--patched/cozy/ui/main_view.py
---- cozy-1.3.0--orig/cozy/ui/main_view.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/main_view.py	2024-03-03 11:51:34.062151406 +0100
-@@ -6,9 +6,9 @@
- 
- from gi.repository import Adw, Gdk, Gio, GLib, Gtk
- 
- import cozy.control.filesystem_monitor as fs_monitor
--import cozy.ext.inject as inject
-+import inject
- import cozy.report.reporter as report
- from cozy.application_settings import ApplicationSettings
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.singleton import Singleton
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/media_controller.py cozy-1.3.0--patched/cozy/ui/media_controller.py
---- cozy-1.3.0--orig/cozy/ui/media_controller.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/media_controller.py	2024-03-03 11:52:23.631579283 +0100
-@@ -3,9 +3,9 @@
- import gi
- 
- from cozy.control.artwork_cache import ArtworkCache
- from cozy.db.book import Book
--from cozy.ext import inject
-+import inject
- from cozy.ui.widgets.playback_speed_popover import PlaybackSpeedPopover
- from cozy.ui.widgets.seek_bar import SeekBar
- from cozy.ui.widgets.sleep_timer import SleepTimer
- from cozy.view_model.playback_control_view_model import PlaybackControlViewModel
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/preferences_view.py cozy-1.3.0--patched/cozy/ui/preferences_view.py
---- cozy-1.3.0--orig/cozy/ui/preferences_view.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/preferences_view.py	2024-03-03 11:52:23.630579274 +0100
-@@ -1,8 +1,8 @@
- from typing import Any
- from gi.repository import Adw, Gio, Gtk
- 
--from cozy.ext import inject
-+import inject
- from cozy.ui.widgets.error_reporting import ErrorReporting
- 
- from cozy.ui.widgets.storages import StorageLocations
- from cozy.view_model.settings_view_model import SettingsViewModel
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/search_view.py cozy-1.3.0--patched/cozy/ui/search_view.py
---- cozy-1.3.0--orig/cozy/ui/search_view.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/search_view.py	2024-03-03 11:52:23.631579283 +0100
-@@ -2,9 +2,9 @@
- from typing import Callable, Sequence
- 
- from gi.repository import Adw, Gtk
- 
--from cozy.ext import inject
-+import inject
- from cozy.model.book import Book
- from cozy.ui.headerbar import Headerbar
- from cozy.ui.widgets.book_row import BookRow
- from cozy.ui.widgets.search_results import ArtistResultRow
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/toaster.py cozy-1.3.0--patched/cozy/ui/toaster.py
---- cozy-1.3.0--orig/cozy/ui/toaster.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/toaster.py	2024-03-03 11:52:23.631579283 +0100
-@@ -1,7 +1,7 @@
- from gi.repository import Adw, Gtk
- 
--from cozy.ext import inject
-+import inject
- 
- 
- class ToastNotifier:
-     _builder: Gtk.Builder = inject.attr("MainWindowBuilder")
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/album_element.py cozy-1.3.0--patched/cozy/ui/widgets/album_element.py
---- cozy-1.3.0--orig/cozy/ui/widgets/album_element.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/widgets/album_element.py	2024-03-03 11:52:23.627579248 +0100
-@@ -4,9 +4,9 @@
- import cairo
- 
- from cozy.control.artwork_cache import ArtworkCache
- from cozy.model.book import Book
--from cozy.ext import inject
-+import inject
- 
- from gi.repository import Gtk, GObject, Gdk
- 
- ALBUM_ART_SIZE = 200
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/book_row.py cozy-1.3.0--patched/cozy/ui/widgets/book_row.py
---- cozy-1.3.0--orig/cozy/ui/widgets/book_row.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/widgets/book_row.py	2024-03-03 11:52:23.628579257 +0100
-@@ -2,9 +2,9 @@
- 
- from gi.repository import Adw, Gtk
- 
- from cozy.control.artwork_cache import ArtworkCache
--from cozy.ext import inject
-+import inject
- from cozy.model.book import Book
- 
- BOOK_ICON_SIZE = 52
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/error_reporting.py cozy-1.3.0--patched/cozy/ui/widgets/error_reporting.py
---- cozy-1.3.0--orig/cozy/ui/widgets/error_reporting.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/widgets/error_reporting.py	2024-03-03 11:52:23.628579257 +0100
-@@ -2,9 +2,9 @@
- 
- import gi
- 
- from cozy.application_settings import ApplicationSettings
--from cozy.ext import inject
-+import inject
- 
- from gi.repository import Gtk
- 
- LEVELS = [
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.3.0--patched/cozy/ui/widgets/playback_speed_popover.py
---- cozy-1.3.0--orig/cozy/ui/widgets/playback_speed_popover.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/widgets/playback_speed_popover.py	2024-03-03 11:52:23.628579257 +0100
-@@ -1,5 +1,5 @@
--from cozy.ext import inject
-+import inject
- from cozy.view_model.playback_speed_view_model import PlaybackSpeedViewModel
- 
- from gi.repository import Gtk
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/sleep_timer.py cozy-1.3.0--patched/cozy/ui/widgets/sleep_timer.py
---- cozy-1.3.0--orig/cozy/ui/widgets/sleep_timer.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/widgets/sleep_timer.py	2024-03-03 11:52:23.627579248 +0100
-@@ -1,5 +1,5 @@
--from cozy.ext import inject
-+import inject
- from cozy.view_model.sleep_timer_view_model import SleepTimerViewModel, SystemPowerControl
- 
- from gi.repository import Gtk
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/storages.py cozy-1.3.0--patched/cozy/ui/widgets/storages.py
---- cozy-1.3.0--orig/cozy/ui/widgets/storages.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/ui/widgets/storages.py	2024-03-03 11:52:23.628579257 +0100
-@@ -1,9 +1,9 @@
- from typing import Callable
- 
- from gi.repository import Adw, Gio, GLib, GObject, Gtk
- 
--from cozy.ext import inject
-+import inject
- from cozy.model.storage import Storage
- from cozy.view_model.storages_view_model import StoragesViewModel
- 
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/view_model/book_detail_view_model.py cozy-1.3.0--patched/cozy/view_model/book_detail_view_model.py
---- cozy-1.3.0--orig/cozy/view_model/book_detail_view_model.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/view_model/book_detail_view_model.py	2024-03-03 11:52:23.623579214 +0100
-@@ -3,9 +3,9 @@
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.observable import Observable
- from cozy.control.filesystem_monitor import FilesystemMonitor
- from cozy.control.offline_cache import OfflineCache
--from cozy.ext import inject
-+import inject
- from cozy.media.player import Player
- from cozy.model.book import Book
- from cozy.model.chapter import Chapter
- from cozy.model.library import Library
-diff -r -U4 cozy-1.3.0--orig/cozy/view_model/headerbar_view_model.py cozy-1.3.0--patched/cozy/view_model/headerbar_view_model.py
---- cozy-1.3.0--orig/cozy/view_model/headerbar_view_model.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/view_model/headerbar_view_model.py	2024-03-03 11:52:23.623579214 +0100
-@@ -2,9 +2,9 @@
- 
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.observable import Observable
- from cozy.control.offline_cache import OfflineCache
--from cozy.ext import inject
-+import inject
- from cozy.media.files import Files
- from cozy.media.importer import Importer, ScanStatus
- from cozy.model.library import Library
- from cozy.open_view import OpenView
-diff -r -U4 cozy-1.3.0--orig/cozy/view_model/library_view_model.py cozy-1.3.0--patched/cozy/view_model/library_view_model.py
---- cozy-1.3.0--orig/cozy/view_model/library_view_model.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/view_model/library_view_model.py	2024-03-03 11:51:34.061151397 +0100
-@@ -2,9 +2,9 @@
- import os
- from enum import Enum, auto
- from typing import Optional
- 
--import cozy.ext.inject as inject
-+import inject
- from cozy.application_settings import ApplicationSettings
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.observable import Observable
- from cozy.control.filesystem_monitor import FilesystemMonitor
-diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_control_view_model.py cozy-1.3.0--patched/cozy/view_model/playback_control_view_model.py
---- cozy-1.3.0--orig/cozy/view_model/playback_control_view_model.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/view_model/playback_control_view_model.py	2024-03-03 11:52:23.622579205 +0100
-@@ -1,7 +1,7 @@
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.observable import Observable
--from cozy.ext import inject
-+import inject
- from cozy.media.player import Player
- from cozy.model.book import Book
- from cozy.open_view import OpenView
- 
-diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_speed_view_model.py cozy-1.3.0--patched/cozy/view_model/playback_speed_view_model.py
---- cozy-1.3.0--orig/cozy/view_model/playback_speed_view_model.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/view_model/playback_speed_view_model.py	2024-03-03 11:52:23.622579205 +0100
-@@ -1,8 +1,8 @@
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.observable import Observable
- from cozy.db.book import Book
--from cozy.ext import inject
-+import inject
- from cozy.media.player import Player
- 
- 
- class PlaybackSpeedViewModel(Observable, EventSender):
-diff -r -U4 cozy-1.3.0--orig/cozy/view_model/search_view_model.py cozy-1.3.0--patched/cozy/view_model/search_view_model.py
---- cozy-1.3.0--orig/cozy/view_model/search_view_model.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/view_model/search_view_model.py	2024-03-03 11:51:34.061151397 +0100
-@@ -1,9 +1,9 @@
- from typing import Callable
- 
- from gi.repository import GLib
- 
--import cozy.ext.inject as inject
-+import inject
- from cozy.application_settings import ApplicationSettings
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.observable import Observable
- from cozy.control.filesystem_monitor import FilesystemMonitor
-diff -r -U4 cozy-1.3.0--orig/cozy/view_model/settings_view_model.py cozy-1.3.0--patched/cozy/view_model/settings_view_model.py
---- cozy-1.3.0--orig/cozy/view_model/settings_view_model.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/view_model/settings_view_model.py	2024-03-03 11:52:23.621579196 +0100
-@@ -4,9 +4,9 @@
- 
- from cozy.application_settings import ApplicationSettings
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.observable import Observable
--from cozy.ext import inject
-+import inject
- from cozy.media.importer import Importer
- from cozy.model.settings import Settings
- 
- log = logging.getLogger("settings_view_model")
-diff -r -U4 cozy-1.3.0--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.3.0--patched/cozy/view_model/sleep_timer_view_model.py
---- cozy-1.3.0--orig/cozy/view_model/sleep_timer_view_model.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/view_model/sleep_timer_view_model.py	2024-03-03 11:52:23.622579205 +0100
-@@ -5,9 +5,9 @@
- 
- from cozy import tools
- from cozy.application_settings import ApplicationSettings
- from cozy.architecture.observable import Observable
--from cozy.ext import inject
-+import inject
- from cozy.media.player import Player
- from cozy.tools import IntervalTimer
- 
- log = logging.getLogger("sleep_timer_view_model")
-diff -r -U4 cozy-1.3.0--orig/cozy/view_model/storages_view_model.py cozy-1.3.0--patched/cozy/view_model/storages_view_model.py
---- cozy-1.3.0--orig/cozy/view_model/storages_view_model.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/cozy/view_model/storages_view_model.py	2024-03-03 11:52:23.621579196 +0100
-@@ -6,9 +6,9 @@
- from cozy.application_settings import ApplicationSettings
- from cozy.architecture.event_sender import EventSender
- from cozy.architecture.observable import Observable
- from cozy.control.filesystem_monitor import FilesystemMonitor
--from cozy.ext import inject
-+import inject
- from cozy.media.importer import Importer
- from cozy.model.library import Library
- from cozy.model.settings import Settings
- from cozy.model.storage import Storage
-diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_importer.py cozy-1.3.0--patched/test/cozy/media/test_importer.py
---- cozy-1.3.0--orig/test/cozy/media/test_importer.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/test/cozy/media/test_importer.py	2024-03-03 11:52:23.633579300 +0100
-@@ -2,9 +2,9 @@
- 
- import pytest
- from peewee import SqliteDatabase
- 
--from cozy.ext import inject
-+import inject
- from cozy.media.media_file import MediaFile
- from cozy.model.library import Library
- 
- 
-diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_player.py cozy-1.3.0--patched/test/cozy/media/test_player.py
---- cozy-1.3.0--orig/test/cozy/media/test_player.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/test/cozy/media/test_player.py	2024-03-03 11:52:23.633579300 +0100
-@@ -3,9 +3,9 @@
- import pytest
- from peewee import SqliteDatabase
- 
- from cozy.application_settings import ApplicationSettings
--from cozy.ext import inject
-+import inject
- from cozy.media.gst_player import GstPlayer
- from cozy.model.library import Library
- from cozy.model.settings import Settings
- 
-diff -r -U4 cozy-1.3.0--orig/test/cozy/model/storage_block_list.py cozy-1.3.0--patched/test/cozy/model/storage_block_list.py
---- cozy-1.3.0--orig/test/cozy/model/storage_block_list.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/test/cozy/model/storage_block_list.py	2024-03-03 11:52:23.632579291 +0100
-@@ -1,8 +1,8 @@
- import pytest
- from peewee import SqliteDatabase
- 
--from cozy.ext import inject
-+import inject
- 
- 
- @pytest.fixture(autouse=True)
- def setup_inject(peewee_database_storage):
-diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_book.py cozy-1.3.0--patched/test/cozy/model/test_book.py
---- cozy-1.3.0--orig/test/cozy/model/test_book.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/test/cozy/model/test_book.py	2024-03-03 11:52:23.633579300 +0100
-@@ -1,9 +1,9 @@
- import pytest
- from peewee import SqliteDatabase
- 
- from cozy.application_settings import ApplicationSettings
--from cozy.ext import inject
-+import inject
- from test.cozy.mocks import ApplicationSettingsMock
- 
- 
- @pytest.fixture(autouse=True)
-diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_database_importer.py cozy-1.3.0--patched/test/cozy/model/test_database_importer.py
---- cozy-1.3.0--orig/test/cozy/model/test_database_importer.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/test/cozy/model/test_database_importer.py	2024-03-03 11:52:23.632579291 +0100
-@@ -1,8 +1,8 @@
- import pytest
- from peewee import SqliteDatabase
- 
--from cozy.ext import inject
-+import inject
- 
- 
- @pytest.fixture(autouse=True)
- def setup_inject(peewee_database):
-diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_library.py cozy-1.3.0--patched/test/cozy/model/test_library.py
---- cozy-1.3.0--orig/test/cozy/model/test_library.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/test/cozy/model/test_library.py	2024-03-03 11:52:23.632579291 +0100
-@@ -1,9 +1,9 @@
- import pytest
- from peewee import SqliteDatabase
- 
- from cozy.application_settings import ApplicationSettings
--from cozy.ext import inject
-+import inject
- from cozy.extensions.set import split_strings_to_set
- from cozy.model.settings import Settings
- from test.cozy.mocks import ApplicationSettingsMock
- 
-diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_settings.py cozy-1.3.0--patched/test/cozy/model/test_settings.py
---- cozy-1.3.0--orig/test/cozy/model/test_settings.py	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/test/cozy/model/test_settings.py	2024-03-03 11:51:34.063151414 +0100
-@@ -1,7 +1,7 @@
- import pytest
- 
--import cozy.ext.inject as inject
-+import inject
- from peewee import SqliteDatabase
- 
- 
- @pytest.fixture(autouse=True)
diff --git a/0001-fix-appdata-file.patch b/0001-fix-appdata-file.patch
deleted file mode 100644
index 576f10d..0000000
--- a/0001-fix-appdata-file.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cozy-1.3.0--orig/data/com.github.geigi.cozy.appdata.xml	2024-03-01 15:44:03.000000000 +0100
-+++ cozy-1.3.0--patched/data/com.github.geigi.cozy.appdata.xml	2024-03-03 11:55:41.260289799 +0100
-@@ -67,8 +67,9 @@
-       </description>
-     </release>
-     <release version="1.2.1" date="2022-08-21">
-       <description translatable="no">
-+		<p>This minor release includes various assorted fixes.</p>
-         <ul>
-           <li>Support for GTK style manager (thanks A6GibKm)</li>
-           <li>Use natural sorting for chapter titles</li>
-           <li>As always, updated translations thanks to all the translators!</li>
diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch
new file mode 100644
index 0000000..3684644
--- /dev/null
+++ b/cozy--unbundle-inject.patch
@@ -0,0 +1,631 @@
+diff -U4 -rN cozy-0.9.1--orig/cozy/app_controller.py cozy-0.9.1--patched/cozy/app_controller.py
+--- cozy-0.9.1--orig/cozy/app_controller.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/app_controller.py	2021-04-19 01:31:38.733519002 +0200
+@@ -1,7 +1,7 @@
+ from gi.repository import Gio
+ 
+-import cozy.ext.inject as inject
++import inject
+ from peewee import SqliteDatabase
+ 
+ from cozy.control.offline_cache import OfflineCache
+ from cozy.media.files import Files
+diff -U4 -rN cozy-0.9.1--orig/cozy/application_settings.py cozy-0.9.1--patched/cozy/application_settings.py
+--- cozy-0.9.1--orig/cozy/application_settings.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/application_settings.py	2021-04-19 01:31:38.716518967 +0200
+@@ -1,8 +1,8 @@
+ from gi.repository import Gio
+ 
+ from cozy.architecture.event_sender import EventSender
+-from cozy.ext import inject
++import inject
+ 
+ 
+ class ApplicationSettings(EventSender):
+     _settings: Gio.Settings = inject.attr(Gio.Settings)
+diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/cozy/control/artwork_cache.py
+--- cozy-0.9.1--orig/cozy/control/artwork_cache.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/control/artwork_cache.py	2021-04-19 01:31:38.583518698 +0200
+@@ -7,9 +7,9 @@
+ from cozy.application_settings import ApplicationSettings
+ from cozy.control.application_directories import get_cache_dir
+ from cozy.db.artwork_cache import ArtworkCache as ArtworkCacheModel
+-from cozy.ext import inject
++import inject
+ from cozy.media.importer import Importer, ScanStatus
+ from cozy.report import reporter
+ 
+ log = logging.getLogger("artwork_cache")
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/control/db.py cozy-0.9.1--patched/cozy/control/db.py
+--- cozy-0.9.1--orig/cozy/control/db.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/control/db.py	2021-04-19 01:31:38.586518704 +0200
+@@ -1,9 +1,9 @@
+ import logging
+ import os
+ import time
+ 
+-import cozy.ext.inject as inject
++import inject
+ 
+ from cozy.control.db_updater import update_db
+ from cozy.db.artwork_cache import ArtworkCache
+ from cozy.db.book import Book
+diff -U4 -rN cozy-0.9.1--orig/cozy/control/filesystem_monitor.py cozy-0.9.1--patched/cozy/control/filesystem_monitor.py
+--- cozy-0.9.1--orig/cozy/control/filesystem_monitor.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/control/filesystem_monitor.py	2021-04-19 01:31:38.577518686 +0200
+@@ -1,8 +1,8 @@
+ import logging
+ from typing import List
+ 
+-import cozy.ext.inject as inject
++import inject
+ from gi.repository import Gio
+ 
+ from cozy.architecture.event_sender import EventSender
+ from cozy.model.book import Book
+diff -U4 -rN cozy-0.9.1--orig/cozy/control/mpris.py cozy-0.9.1--patched/cozy/control/mpris.py
+--- cozy-0.9.1--orig/cozy/control/mpris.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/control/mpris.py	2021-04-19 01:31:38.592518716 +0200
+@@ -22,9 +22,9 @@
+ 
+ import cozy.ui
+ from cozy.application_settings import ApplicationSettings
+ from cozy.control.artwork_cache import ArtworkCache
+-from cozy.ext import inject
++import inject
+ from cozy.media.player import Player
+ from cozy.model.book import Book
+ from cozy.report import reporter
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/control/offline_cache.py cozy-0.9.1--patched/cozy/control/offline_cache.py
+--- cozy-0.9.1--orig/cozy/control/offline_cache.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/control/offline_cache.py	2021-04-19 01:31:38.600518733 +0200
+@@ -12,9 +12,9 @@
+ 
+ from cozy.db.track import Track
+ from cozy.db.offline_cache import OfflineCache as OfflineCacheModel
+ from cozy.db.book import Book as BookDB
+-from cozy.ext import inject
++import inject
+ from cozy.model.book import Book
+ from cozy.model.chapter import Chapter
+ from cozy.report import reporter
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/media/files.py cozy-0.9.1--patched/cozy/media/files.py
+--- cozy-0.9.1--orig/cozy/media/files.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/media/files.py	2021-04-19 01:31:38.606518745 +0200
+@@ -5,9 +5,9 @@
+ 
+ from gi.repository import Gio
+ 
+ from cozy.architecture.event_sender import EventSender
+-from cozy.ext import inject
++import inject
+ from cozy.media.importer import Importer
+ from cozy.model.settings import Settings
+ from cozy.report import reporter
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/media/importer.py cozy-0.9.1--patched/cozy/media/importer.py
+--- cozy-0.9.1--orig/cozy/media/importer.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/media/importer.py	2021-04-19 01:31:38.622518777 +0200
+@@ -9,9 +9,9 @@
+ 
+ from cozy.architecture.event_sender import EventSender
+ from cozy.architecture.profiler import timing
+ from cozy.control.filesystem_monitor import FilesystemMonitor, StorageNotFound
+-from cozy.ext import inject
++import inject
+ from cozy.media.media_detector import MediaDetector, NotAnAudioFile, AudioFileCouldNotBeDiscovered
+ from cozy.media.media_file import MediaFile
+ from cozy.model.library import Library
+ from cozy.model.settings import Settings
+diff -U4 -rN cozy-0.9.1--orig/cozy/media/player.py cozy-0.9.1--patched/cozy/media/player.py
+--- cozy-0.9.1--orig/cozy/media/player.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/media/player.py	2021-04-19 01:31:38.611518755 +0200
+@@ -6,9 +6,9 @@
+ 
+ from cozy.application_settings import ApplicationSettings
+ from cozy.architecture.event_sender import EventSender
+ from cozy.control.offline_cache import OfflineCache
+-from cozy.ext import inject
++import inject
+ from cozy.media.gst_player import GstPlayer, GstPlayerState
+ from cozy.model.book import Book
+ from cozy.model.chapter import Chapter
+ from cozy.model.library import Library
+diff -U4 -rN cozy-0.9.1--orig/cozy/model/book.py cozy-0.9.1--patched/cozy/model/book.py
+--- cozy-0.9.1--orig/cozy/model/book.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/model/book.py	2021-04-19 01:31:38.730518995 +0200
+@@ -6,9 +6,9 @@
+ from cozy.architecture.event_sender import EventSender
+ from cozy.architecture.observable import Observable
+ from cozy.db.book import Book as BookModel
+ from cozy.db.track import Track as TrackModel
+-from cozy.ext import inject
++import inject
+ from cozy.model.chapter import Chapter
+ from cozy.model.settings import Settings
+ from cozy.model.track import Track
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/model/library.py cozy-0.9.1--patched/cozy/model/library.py
+--- cozy-0.9.1--orig/cozy/model/library.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/model/library.py	2021-04-19 01:31:38.721518977 +0200
+@@ -6,9 +6,9 @@
+ from cozy.architecture.event_sender import EventSender
+ from cozy.architecture.profiler import timing
+ from cozy.db.book import Book as BookModel
+ from cozy.db.track import Track
+-from cozy.ext import inject
++import inject
+ from cozy.extensions.set import split_strings_to_set
+ from cozy.media.media_file import MediaFile
+ 
+ from cozy.model.book import Book, BookIsEmpty
+diff -U4 -rN cozy-0.9.1--orig/cozy/model/settings.py cozy-0.9.1--patched/cozy/model/settings.py
+--- cozy-0.9.1--orig/cozy/model/settings.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/model/settings.py	2021-04-19 01:31:38.718518971 +0200
+@@ -2,9 +2,9 @@
+ from typing import List, Optional
+ 
+ import peewee
+ 
+-import cozy.ext.inject as inject
++import inject
+ from peewee import SqliteDatabase
+ 
+ from cozy.db.book import Book
+ from cozy.db.settings import Settings as SettingsModel
+diff -U4 -rN cozy-0.9.1--orig/cozy/model/storage_block_list.py cozy-0.9.1--patched/cozy/model/storage_block_list.py
+--- cozy-0.9.1--orig/cozy/model/storage_block_list.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/model/storage_block_list.py	2021-04-19 01:31:38.732519000 +0200
+@@ -1,9 +1,9 @@
+ from peewee import SqliteDatabase
+ 
+ from cozy.db.storage_blacklist import StorageBlackList
+ from cozy.db.track import Track as TrackModel
+-from cozy.ext import inject
++import inject
+ from cozy.model.book import Book
+ 
+ 
+ class StorageBlockList:
+diff -U4 -rN cozy-0.9.4--orig/cozy/power_manager.py cozy-0.9.4--patched/cozy/power_manager.py
+--- cozy-0.9.4--orig/cozy/power_manager.py	2021-04-24 13:52:19.000000000 +0200
++++ cozy-0.9.4--patched/cozy/power_managerpatched.py	2021-04-25 12:39:28.447341956 +0200
+@@ -1,9 +1,9 @@
+ import logging
+ 
+ from gi.repository import Gtk
+ 
+-from cozy.ext import inject
++import inject
+ from cozy.media.player import Player
+ 
+ log = logging.getLogger("power_mgr")
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/report/report_to_loki.py cozy-0.9.1--patched/cozy/report/report_to_loki.py
+--- cozy-0.9.1--orig/cozy/report/report_to_loki.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/report/report_to_loki.py	2021-04-19 01:31:38.747519030 +0200
+@@ -6,9 +6,9 @@
+ import distro
+ import platform
+ 
+ from cozy.application_settings import ApplicationSettings
+-from cozy.ext import inject
++import inject
+ from cozy.report.log_level import LogLevel
+ from cozy.version import __version__ as CozyVersion
+ from peewee import __version__ as PeeweeVersion
+ from mutagen import version_string as MutagenVersion
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/album_element.py cozy-0.9.1--patched/cozy/ui/album_element.py
+--- cozy-0.9.1--orig/cozy/ui/album_element.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/album_element.py	2021-04-19 01:31:38.637518807 +0200
+@@ -2,9 +2,9 @@
+ 
+ from gi.repository import Gtk, Gdk, GdkPixbuf, GObject
+ 
+ from cozy.control.artwork_cache import ArtworkCache
+-from cozy.ext import inject
++import inject
+ from cozy.model.book import Book
+ 
+ log = logging.getLogger("album_element")
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_detail_view.py cozy-0.9.1--patched/cozy/ui/book_detail_view.py
+--- cozy-0.9.1--orig/cozy/ui/book_detail_view.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/book_detail_view.py	2021-04-19 01:31:38.648518830 +0200
+@@ -3,9 +3,9 @@
+ 
+ import gi
+ 
+ from cozy.control.artwork_cache import ArtworkCache
+-from cozy.ext import inject
++import inject
+ from cozy.model.book import Book
+ from cozy.model.chapter import Chapter
+ from cozy.report import reporter
+ from cozy.ui.disk_element import DiskElement
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_element.py cozy-0.9.1--patched/cozy/ui/book_element.py
+--- cozy-0.9.1--orig/cozy/ui/book_element.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/book_element.py	2021-04-19 01:31:38.627518787 +0200
+@@ -1,8 +1,8 @@
+ import os
+ import subprocess
+ 
+-import cozy.ext.inject as inject
++import inject
+ from gi.repository import Gtk, Gdk, Pango, GObject
+ 
+ import cozy.tools as tools
+ import cozy.ui
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/delete_book_view.py cozy-0.9.1--patched/cozy/ui/delete_book_view.py
+--- cozy-0.9.1--orig/cozy/ui/delete_book_view.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/delete_book_view.py	2021-04-19 01:31:38.628518789 +0200
+@@ -1,7 +1,7 @@
+ import gi
+ 
+-from cozy.ext import inject
++import inject
+ 
+ gi.require_version('Gtk', '3.0')
+ from gi.repository import Gtk
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.9.1--patched/cozy/ui/file_not_found_dialog.py
+--- cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/file_not_found_dialog.py	2021-04-19 01:31:38.632518797 +0200
+@@ -2,9 +2,9 @@
+ 
+ from gi.repository import Gtk
+ 
+ import cozy.ui
+-from cozy.ext import inject
++import inject
+ from cozy.media.importer import Importer
+ from cozy.model.chapter import Chapter
+ from cozy.model.library import Library
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/headerbar.py cozy-0.9.1--patched/cozy/ui/headerbar.py
+--- cozy-0.9.1--orig/cozy/ui/headerbar.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/headerbar.py	2021-04-19 01:31:38.630518793 +0200
+@@ -3,9 +3,9 @@
+ import gi
+ 
+ from cozy.control.artwork_cache import ArtworkCache
+ from cozy.db.book import Book
+-from cozy.ext import inject
++import inject
+ from cozy.ui.widgets.playback_speed_popover import PlaybackSpeedPopover
+ from cozy.ui.widgets.seek_bar import SeekBar
+ from cozy.ui.widgets.sleep_timer import SleepTimer
+ from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/library_view.py cozy-0.9.1--patched/cozy/ui/library_view.py
+--- cozy-0.9.1--orig/cozy/ui/library_view.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/library_view.py	2021-04-19 01:31:38.641518815 +0200
+@@ -2,9 +2,9 @@
+ 
+ from gi.repository import Gtk
+ from gi.repository.Gtk import Builder
+ 
+-from cozy.ext import inject
++import inject
+ from cozy.model.book import Book
+ from cozy.ui.book_element import BookElement
+ from cozy.ui.delete_book_view import DeleteBookView
+ from cozy.ui.widgets.filter_list_box import FilterListBox
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/main_view.py cozy-0.9.1--patched/cozy/ui/main_view.py
+--- cozy-0.9.1--orig/cozy/ui/main_view.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/main_view.py	2021-04-19 01:31:38.653518840 +0200
+@@ -1,7 +1,7 @@
+ import webbrowser
+ 
+-import cozy.ext.inject as inject
++import inject
+ from cozy.application_settings import ApplicationSettings
+ from cozy.architecture.event_sender import EventSender
+ 
+ from cozy.control.db import books, close_db
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/search_view.py cozy-0.9.1--patched/cozy/ui/search_view.py
+--- cozy-0.9.1--orig/cozy/ui/search_view.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/search_view.py	2021-04-19 01:31:38.643518819 +0200
+@@ -1,8 +1,8 @@
+ import threading
+ from threading import Thread
+ 
+-from cozy.ext import inject
++import inject
+ from cozy.ui.widgets.search_results import BookSearchResult, ArtistSearchResult
+ 
+ import gi
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/settings.py cozy-0.9.1--patched/cozy/ui/settings.py
+--- cozy-0.9.1--orig/cozy/ui/settings.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/settings.py	2021-04-19 01:31:38.625518783 +0200
+@@ -4,9 +4,9 @@
+ 
+ from cozy.control.db import remove_tracks_with_path
+ from cozy.db.storage import Storage
+ from cozy.db.storage_blacklist import StorageBlackList
+-from cozy.ext import inject
++import inject
+ from cozy.model.library import Library
+ from cozy.ui.widgets.ScrollWrapper import ScrollWrapper
+ from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow
+ from cozy.view_model.settings_view_model import SettingsViewModel
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/warnings.py cozy-0.9.1--patched/cozy/ui/warnings.py
+--- cozy-0.9.1--orig/cozy/ui/warnings.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/warnings.py	2021-04-19 01:31:38.634518801 +0200
+@@ -1,8 +1,8 @@
+ from gettext import gettext
+ 
+ import gi
+-import cozy.ext.inject as inject
++import inject
+ 
+ from cozy.control.filesystem_monitor import FilesystemMonitor
+ 
+ gi.require_version('Gtk', '3.0')
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.9.1--patched/cozy/ui/widgets/error_reporting.py
+--- cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/widgets/error_reporting.py	2021-04-19 01:31:38.672518878 +0200
+@@ -2,9 +2,9 @@
+ 
+ import gi
+ 
+ from cozy.application_settings import ApplicationSettings
+-from cozy.ext import inject
++import inject
+ 
+ gi.require_version('Gtk', '3.0')
+ from gi.repository import Gtk
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.9.1--patched/cozy/ui/widgets/playback_speed_popover.py
+--- cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/widgets/playback_speed_popover.py	2021-04-19 01:31:38.660518854 +0200
+@@ -1,7 +1,7 @@
+ import gi
+ 
+-from cozy.ext import inject
++import inject
+ from cozy.view_model.playback_speed_view_model import PlaybackSpeedViewModel
+ 
+ gi.require_version('Gtk', '3.0')
+ from gi.repository import Gtk
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/search_results.py cozy-0.9.1--patched/cozy/ui/widgets/search_results.py
+--- cozy-0.9.1--orig/cozy/ui/widgets/search_results.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/widgets/search_results.py	2021-04-19 01:31:38.656518846 +0200
+@@ -1,8 +1,8 @@
+ from gi.repository import Gtk, Gdk
+ import cozy.tools as tools
+ from cozy.control.artwork_cache import ArtworkCache
+-from cozy.ext import inject
++import inject
+ from cozy.model.book import Book
+ 
+ MAX_BOOK_LENGTH = 80
+ BOOK_ICON_SIZE = 40
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.9.1--patched/cozy/ui/widgets/sleep_timer.py
+--- cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/widgets/sleep_timer.py	2021-04-19 01:31:38.668518870 +0200
+@@ -1,7 +1,7 @@
+ import gi
+ 
+-from cozy.ext import inject
++import inject
+ from cozy.view_model.sleep_timer_view_model import SleepTimerViewModel, SystemPowerControl
+ 
+ gi.require_version('Gtk', '3.0')
+ from gi.repository import Gtk
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.9.1--patched/cozy/ui/widgets/storage_list_box_row.py
+--- cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/widgets/storage_list_box_row.py	2021-04-19 01:31:38.661518856 +0200
+@@ -6,9 +6,9 @@
+ import cozy.ui
+ from cozy.control.filesystem_monitor import FilesystemMonitor
+ from cozy.db.storage import Storage
+ from cozy.model.settings import Settings
+-from cozy.ext import inject
++import inject
+ from cozy.model.library import Library
+ from cozy.model.storage_block_list import StorageBlockList
+ 
+ log = logging.getLogger("settings")
+diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.9.1--patched/cozy/ui/widgets/whats_new_window.py
+--- cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/ui/widgets/whats_new_window.py	2021-04-19 01:31:38.677518888 +0200
+@@ -3,9 +3,9 @@
+ 
+ import gi
+ 
+ from cozy.application_settings import ApplicationSettings
+-from cozy.ext import inject
++import inject
+ from cozy.ui.main_view import CozyUI
+ from cozy.version import __version__ as CozyVersion
+ 
+ gi.require_version('Gtk', '3.0')
+diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.9.1--patched/cozy/view_model/book_detail_view_model.py
+--- cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/view_model/book_detail_view_model.py	2021-04-19 01:31:38.693518921 +0200
+@@ -5,9 +5,9 @@
+ from cozy.architecture.event_sender import EventSender
+ from cozy.architecture.observable import Observable
+ from cozy.control.filesystem_monitor import FilesystemMonitor
+ from cozy.control.offline_cache import OfflineCache
+-from cozy.ext import inject
++import inject
+ from cozy.media.player import Player
+ from cozy.model.book import Book
+ from cozy.model.chapter import Chapter
+ from cozy.model.library import Library
+diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.9.1--patched/cozy/view_model/headerbar_view_model.py
+--- cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/view_model/headerbar_view_model.py	2021-04-19 01:31:38.689518912 +0200
+@@ -2,9 +2,9 @@
+ 
+ from cozy.architecture.event_sender import EventSender
+ from cozy.architecture.observable import Observable
+ from cozy.control.offline_cache import OfflineCache
+-from cozy.ext import inject
++import inject
+ from cozy.media.files import Files
+ from cozy.media.importer import Importer, ScanStatus
+ from cozy.model.library import Library
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/library_view_model.py cozy-0.9.1--patched/cozy/view_model/library_view_model.py
+--- cozy-0.9.1--orig/cozy/view_model/library_view_model.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/view_model/library_view_model.py	2021-04-19 01:31:38.694518923 +0200
+@@ -2,9 +2,9 @@
+ import os
+ from enum import Enum, auto
+ from typing import Optional
+ 
+-import cozy.ext.inject as inject
++import inject
+ from cozy.application_settings import ApplicationSettings
+ from cozy.architecture.event_sender import EventSender
+ from cozy.architecture.observable import Observable
+ from cozy.control.filesystem_monitor import FilesystemMonitor
+diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py cozy-0.9.1--patched/cozy/view_model/playback_control_view_model.py
+--- cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/view_model/playback_control_view_model.py	2021-04-19 01:31:38.687518908 +0200
+@@ -1,9 +1,9 @@
+ from typing import Optional
+ 
+ from cozy.architecture.event_sender import EventSender
+ from cozy.architecture.observable import Observable
+-from cozy.ext import inject
++import inject
+ from cozy.media.player import Player
+ from cozy.model.book import Book
+ from cozy.open_view import OpenView
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0.9.1--patched/cozy/view_model/playback_speed_view_model.py
+--- cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/view_model/playback_speed_view_model.py	2021-04-19 01:31:38.682518898 +0200
+@@ -1,8 +1,8 @@
+ from cozy.architecture.event_sender import EventSender
+ from cozy.architecture.observable import Observable
+ from cozy.db.book import Book
+-from cozy.ext import inject
++import inject
+ from cozy.media.player import Player
+ 
+ 
+ class PlaybackSpeedViewModel(Observable, EventSender):
+diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/search_view_model.py cozy-0.9.1--patched/cozy/view_model/search_view_model.py
+--- cozy-0.9.1--orig/cozy/view_model/search_view_model.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/view_model/search_view_model.py	2021-04-19 01:31:38.686518906 +0200
+@@ -1,5 +1,5 @@
+-import cozy.ext.inject as inject
++import inject
+ 
+ from cozy.extensions.set import split_strings_to_set
+ from cozy.open_view import OpenView
+ from cozy.application_settings import ApplicationSettings
+diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/settings_view_model.py cozy-0.9.1--patched/cozy/view_model/settings_view_model.py
+--- cozy-0.9.1--orig/cozy/view_model/settings_view_model.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/view_model/settings_view_model.py	2021-04-19 01:31:38.684518902 +0200
+@@ -1,6 +1,6 @@
+ from cozy.architecture.observable import Observable
+-from cozy.ext import inject
++import inject
+ from cozy.media.importer import Importer
+ from cozy.model.settings import Settings
+ 
+ 
+diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.9.1--patched/cozy/view_model/sleep_timer_view_model.py
+--- cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/cozy/view_model/sleep_timer_view_model.py	2021-04-19 01:31:38.680518894 +0200
+@@ -5,9 +5,9 @@
+ 
+ from cozy import tools
+ from cozy.application_settings import ApplicationSettings
+ from cozy.architecture.observable import Observable
+-from cozy.ext import inject
++import inject
+ from cozy.media.player import Player
+ from cozy.tools import IntervalTimer
+ 
+ log = logging.getLogger("sleep_timer_view_model")
+diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_importer.py cozy-0.9.1--patched/test/cozy/media/test_importer.py
+--- cozy-0.9.1--orig/test/cozy/media/test_importer.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/test/cozy/media/test_importer.py	2021-04-19 01:31:38.756519048 +0200
+@@ -2,9 +2,9 @@
+ 
+ import pytest
+ from peewee import SqliteDatabase
+ 
+-from cozy.ext import inject
++import inject
+ from cozy.media.media_file import MediaFile
+ from cozy.model.library import Library
+ 
+ 
+diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_player.py cozy-0.9.1--patched/test/cozy/media/test_player.py
+--- cozy-0.9.1--orig/test/cozy/media/test_player.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/test/cozy/media/test_player.py	2021-04-19 01:31:38.761519058 +0200
+@@ -3,9 +3,9 @@
+ import pytest
+ from peewee import SqliteDatabase
+ 
+ from cozy.application_settings import ApplicationSettings
+-from cozy.ext import inject
++import inject
+ from cozy.media.gst_player import GstPlayer
+ from cozy.model.library import Library
+ from cozy.model.settings import Settings
+ 
+diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/storage_block_list.py cozy-0.9.1--patched/test/cozy/model/storage_block_list.py
+--- cozy-0.9.1--orig/test/cozy/model/storage_block_list.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/test/cozy/model/storage_block_list.py	2021-04-19 01:31:38.776519088 +0200
+@@ -1,8 +1,8 @@
+ import pytest
+ from peewee import SqliteDatabase
+ 
+-from cozy.ext import inject
++import inject
+ 
+ 
+ @pytest.fixture(autouse=True)
+ def setup_inject(peewee_database_storage):
+diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_book.py cozy-0.9.1--patched/test/cozy/model/test_book.py
+--- cozy-0.9.1--orig/test/cozy/model/test_book.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/test/cozy/model/test_book.py	2021-04-19 01:31:38.778519093 +0200
+@@ -1,9 +1,9 @@
+ import pytest
+ from peewee import SqliteDatabase
+ 
+ from cozy.application_settings import ApplicationSettings
+-from cozy.ext import inject
++import inject
+ from test.cozy.mocks import ApplicationSettingsMock
+ 
+ 
+ @pytest.fixture(autouse=True)
+diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_library.py cozy-0.9.1--patched/test/cozy/model/test_library.py
+--- cozy-0.9.1--orig/test/cozy/model/test_library.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/test/cozy/model/test_library.py	2021-04-19 01:31:38.775519087 +0200
+@@ -1,9 +1,9 @@
+ import pytest
+ from peewee import SqliteDatabase
+ 
+ from cozy.application_settings import ApplicationSettings
+-from cozy.ext import inject
++import inject
+ from cozy.extensions.set import split_strings_to_set
+ from cozy.model.settings import Settings
+ from test.cozy.mocks import ApplicationSettingsMock
+ 
+diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_settings.py cozy-0.9.1--patched/test/cozy/model/test_settings.py
+--- cozy-0.9.1--orig/test/cozy/model/test_settings.py	2021-04-18 22:50:27.000000000 +0200
++++ cozy-0.9.1--patched/test/cozy/model/test_settings.py	2021-04-19 01:31:38.771519079 +0200
+@@ -1,7 +1,7 @@
+ import pytest
+ 
+-import cozy.ext.inject as inject
++import inject
+ from peewee import SqliteDatabase
+ 
+ 
+ @pytest.fixture(autouse=True)
diff --git a/cozy.spec b/cozy.spec
index cc6fc31..8c76dbf 100644
--- a/cozy.spec
+++ b/cozy.spec
@@ -2,34 +2,28 @@ Name: cozy
 %global rtld_name com.github.geigi.cozy
 
 Summary: Modern audiobook player
-License: GPL-3.0-or-later
+License: GPLv3+
 
-Version: 1.3.0
-Release: 11%{?dist}
+Version: 0.9.5
+Release: 1%{?dist}
 
 URL: https://cozy.geigi.de
 Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
 Source99: find-unpatched-imports.sh
 
-# Unbundle python-inject
-Patch0: 0000--unbundle-inject.patch
-
-# The appdata XML file does not pass validation
-Patch1: 0001-fix-appdata-file.patch
+Patch0: %{name}--unbundle-inject.patch
 
 BuildArch: noarch
 
-%global req_adwaita 1.4.0
-%global req_py_inject 4.3.1
-%global req_py_peewee 3.9.6
-
 BuildRequires: desktop-file-utils
 BuildRequires: glib2-devel
+BuildRequires: gtk3-devel >= 3.22
 BuildRequires: libappstream-glib
-BuildRequires: libadwaita-devel >= %{req_adwaita}
-BuildRequires: meson >= 0.59.0
+BuildRequires: libhandy1-devel >= 1.0.0
+BuildRequires: meson >= 0.40.0
 BuildRequires: python3-devel
+BuildRequires: xmlstarlet
 
 %global with_tests 1
 
@@ -37,10 +31,12 @@ BuildRequires: python3-devel
 BuildRequires: gstreamer1-plugins-base
 
 BuildRequires: python3dist(distro)
-BuildRequires: python3dist(inject) >= %{req_py_inject}
+BuildRequires: python3dist(inject) >= 4.3.1
 BuildRequires: python3dist(mutagen)
-BuildRequires: python3dist(peewee) >= %{req_py_peewee}
+BuildRequires: python3dist(packaging)
+BuildRequires: python3dist(peewee) >= 3.9.6
 BuildRequires: python3dist(pygobject)
+BuildRequires: python3dist(pytest-runner)
 BuildRequires: python3dist(pytest-mock)
 BuildRequires: python3dist(pytz)
 BuildRequires: python3dist(requests)
@@ -48,17 +44,18 @@ BuildRequires: python3dist(requests)
 
 Requires: file
 Requires: glib2
-Requires: libadwaita >= %{req_adwaita}
 Requires: gstreamer1-plugins-bad-free
 Requires: gstreamer1-plugins-good
+Requires: gstreamer1-plugins-ugly-free
 Requires: hicolor-icon-theme
 
 # For whatever reason, the Python dependency generator doesn't seem to work
 # for this RPM, so we'll just copy-paste the BuildRequires list
 Requires: python3dist(distro)
-Requires: python3dist(inject) >= %{req_py_inject}
+Requires: python3dist(inject) >= 4.3.1
 Requires: python3dist(mutagen)
-Requires: python3dist(peewee) >= %{req_py_peewee}
+Requires: python3dist(packaging)
+Requires: python3dist(peewee) >= 3.9.6
 Requires: python3dist(pygobject)
 Requires: python3dist(pytz)
 Requires: python3dist(requests)
@@ -90,14 +87,19 @@ Here are some of the current features:
 %setup -q
 
 # Unbundle inject
-%patch 0 -p1
+%patch0 -p1
 rm -rf cozy/ext/inject
 
 # Run the "find unpatched imports" script
-"%{SOURCE99}" "$(pwd)"
+%{SOURCE99} $(pwd)
 
-# Apply other patches
-%patch 1 -p1
+# Add a nonsensical <p> tag at the beginning of <description> for every
+# <release> in the appdata XML - needed to pass validation
+xmlstarlet ed \
+	--insert component/releases/release/description/ul \
+	--type elem -n p -v 'List of changes:' \
+	< "data/%{rtld_name}.appdata.xml" > appdata.patched
+mv ./appdata.patched "data/%{rtld_name}.appdata.xml"
 
 
 %build
@@ -111,13 +113,6 @@ rm -rf cozy/ext/inject
 %meson_install
 %find_lang %{rtld_name}
 
-# Move "actions" icons out of /usr/share/icons/ to avoid conflicts with other packages
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=2120689
-#      https://github.com/geigi/cozy/issues/710
-COZY_ICON_DIR="%{buildroot}%{_datadir}/%{rtld_name}/icons/hicolor/scalable"
-install -m 755 -d "${COZY_ICON_DIR}"
-mv %{buildroot}%{_datadir}/icons/hicolor/scalable/actions "${COZY_ICON_DIR}/actions"
-
 # Remove the "devel" icon
 rm %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{rtld_name}.Devel.svg
 
@@ -139,114 +134,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop
 %{_datadir}/applications/%{rtld_name}.desktop
 %{_datadir}/glib-2.0/schemas/%{rtld_name}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{rtld_name}.svg
+%{_datadir}/icons/hicolor/scalable/actions/*-symbolic.svg
 %{_datadir}/icons/hicolor/symbolic/apps/%{rtld_name}-symbolic.svg
 %{_metainfodir}/%{rtld_name}.appdata.xml
 %{python3_sitelib}/%{name}/
 
 
 %changelog
-* Fri Dec 12 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 1.3.0-11
-- Drop gstreamer1-plugins-ugly-free dependency
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.3.0-10
-- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.3.0-9
-- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Jun 17 2025 Python Maint <python-maint@redhat.com> - 1.3.0-7
-- Rebuilt for Python 3.14
-
-* Wed Mar 12 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.3.0-6
-- gstreamer1-plugins-bad-free rebuild
-
-* Wed Feb 12 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 1.3.0-5
-- Remove spurious BuildRequires on python-pytest-runner
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 1.3.0-2
-- Rebuilt for Python 3.13
-
-* Sun Mar 03 2024 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.3.0-1
-- Update to v1.3.0
-- Drop Patch2 (fix crash at startup - merged upstream)
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jul 06 2023 Python Maint <python-maint@redhat.com> - 1.2.1-5
-- Rebuilt for Python 3.12
-
-* Sun May 28 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.2.1-4
-- Modify Patch2 to fix yet another crash at startup
-
-* Tue Mar 28 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.2.1-3
-- Move "actions" icons out of /usr/share/icons to avoid conflicts with other packages
-- Add a patch to fix crash at startup
-- Convert License tag to SPDX
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sun Aug 21 2022 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.2.1-1
-- Update to v1.2.1
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sun Jan 09 2022 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.2.0-1
-- Update to v1.2.0
-
-* Fri Dec 31 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.1.3-1
-- Update to v1.1.3
-
-* Mon Oct 11 2021 Neal Gompa <ngompa@fedoraproject.org> - 1.1.2-2
-- Add missing dependencies to fix launching the app
-  Resolves: #2013040, #2013041, #2013042
-
-* Fri Aug 20 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.1.2-1
-- Update to v1.1.2
-
-* Fri Aug 20 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.1.1-1
-- Update to v1.1.1
-- Drop Patch1 (POTFILES references non-existent file - fixed upsteam)
-- Don't modify the appdata file in %%prep - no longer needed to pass validation
-
-* Mon Aug 09 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.1.0-1
-- Update to v1.1.0
-
-* Thu Jul 29 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.0.4-1
-- Update to v1.0.4
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jun 17 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.0.3-1
-- Update to v1.0.3
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.0.1-2
-- Rebuilt for Python 3.10
-
-* Sun May 30 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.0.1-1
-- Update to v1.0.1
-
 * Mon May 10 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.9.5-1
 - Update to latest release
 
@@ -267,9 +161,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop
 - Fix license tag - cozy is GPLv3, the "and ASL 2.0" part
   came from a bundled library, which has been un-bundled
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
 * Sun Dec 20 2020 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.7.8-1
 - Update to latest release
 
diff --git a/sources b/sources
index 2230c1d..8957c41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cozy-1.3.0.tar.gz) = 2e7ca481bb3ed3813814640e2685ef666063d9614cf2cfb6db9ca2f0db61f0883c8415506c3cb84b88b20e7dbf768b4cc587b5c69ea15c9db0b3411c4ea83f2d
+SHA512 (cozy-0.9.5.tar.gz) = 70ef0dae1623af1bed8aa1aa6f3e70a81e985cf64b238b1cd430f46cc989859bed6961e5688c78a4f3a3fe23ad9caa0d5091104bd1f56fa4747089f3920b4015