From 3ff91be455e0728e6b586adbc8ad4d7550af7464 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 7 Mar 2022 20:15:21 +0100
Subject: [PATCH 01/17] Support PVT Artwork

---
 language/resource.language.en_gb/strings.po | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 5f6bb0fb9..f6bb2f5d3 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -2484,3 +2484,11 @@ msgstr ""
 msgctxt "#31674"
 msgid "Critics consensus"
 msgstr ""
+
+msgctxt "#31675"
+msgid "Enable PVR artwork module"
+msgstr ""
+
+msgctxt "#31676"
+msgid "Use PVR Artwork in PVR Channel Manager"
+msgstr "" 

From 56651025c92a29a5b91f34af955c3063c69aa028 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 7 Mar 2022 20:30:19 +0100
Subject: [PATCH 02/17] Support PVR Artwork

---
 1080i/Includes_Images.xml |  4 +++-
 1080i/Includes_PVR.xml    | 26 +++----------------------
 1080i/SkinSettings.xml    | 41 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index d4169056b..c0cf30b94 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -329,6 +329,8 @@
     </variable>
 
     <variable name="ChannelListEPGIconVar">
+        <value condition="Window.IsVisible(MyPVRChannels.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork_Channel_Manager)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
+        <value condition="Window.IsVisible(MyPVRChannels.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork_Channel_Manager)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
         <value condition="!String.IsEmpty(Listitem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
         <value>$INFO[ListItem.Icon]</value>
     </variable>
@@ -454,4 +456,4 @@
         <value condition="Skin.HasSetting(musicvis.fanartfallback) + !String.IsEmpty(Player.Art(fanart)) + [String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow.Image)) | !System.AddonIsEnabled(script.artistslideshow) | Skin.HasSetting(ArtistSlideShow.Disabled)]">$INFO[Player.Art(fanart)]</value>
         <value condition="!String.IsEmpty(Skin.String(fanart.fallback.music)) + [String.IsEmpty(Player.Art(fanart)) | !Skin.HasSetting(musicvis.fanartfallback)] + [String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow.Image)) | Skin.HasSetting(ArtistSlideShow.Disabled)]">$INFO[Skin.String(fanart.fallback.music)]</value>
     </variable>
-</includes>
\ No newline at end of file
+</includes>
diff --git a/1080i/Includes_PVR.xml b/1080i/Includes_PVR.xml
index d88887fa3..176a6c61b 100644
--- a/1080i/Includes_PVR.xml
+++ b/1080i/Includes_PVR.xml
@@ -178,33 +178,13 @@
                     <aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
                 </control>
                 <control type="image">
-                    <left>10</left>
-                    <top>10</top>
-                    <right>10</right>
-                    <bottom>10</bottom>
-                    <aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
-                    <texture diffuse="diffuse/pvrinfo.png" background="true">pvr/background.jpg</texture>
-                    <visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon) + String.IsEmpty(Listitem.Icon)</visible>
-                    <fadetime>PosterFanartFadetime</fadetime>
-                </control>
-                <control type="image">
-                    <visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon)</visible>
-                    <left>70</left>
-                    <top>30</top>
-                    <right>70</right>
-                    <bottom>30</bottom>
-                    <aspectratio align="center" aligny="center" scalediffuse="false">keep</aspectratio>
-                    <texture diffuse="diffuse/pvrinfo.png" background="true">$INFO[ListItem.Icon]</texture>
-                    <fadetime>PosterFanartFadetime</fadetime>
-                </control>
-                <control type="image">
-                    <visible>!Player.HasVideo + !String.IsEmpty(Listitem.EpgEventIcon)</visible>
+                    <visible>!Player.HasVideo</visible>
                     <left>10</left>
                     <top>10</top>
                     <right>10</right>
                     <bottom>10</bottom>
                     <aspectratio align="center" aligny="center" scalediffuse="false">keep</aspectratio>
-                    <texture diffuse="diffuse/pvrinfo.png" background="true">$INFO[ListItem.EpgEventIcon]</texture>
+                    <texture diffuse="diffuse/pvrinfo.png" background="true">$VAR[ChannelListEPGIconVar]</texture>
                     <fadetime>PosterFanartFadetime</fadetime>
                 </control>
                 <control type="image">
@@ -2235,4 +2215,4 @@
             </control>
         </control>
     </include>
-</includes>
\ No newline at end of file
+</includes>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 1aca71505..1a33d485f 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -2090,6 +2090,11 @@
                             <param name="visible" value="ControlGroup(9100).HasFocus(9113)"/>
                             <param name="addonname" value="script.module.animated_artwork"/>
                         </include>
+                        <include content="DefSkinAddons">
+                            <param name="id" value="11023"/>
+                            <param name="visible" value="ControlGroup(9100).HasFocus(9113)"/>
+                            <param name="addonname" value="script.module.pvr.artwork"/>
+                        </include>
                     </control>
 
                     <!-- Furniture -->
@@ -2598,6 +2603,42 @@
                             <onclick>Skin.SetPath(ap_source)</onclick>
                             <visible>System.AddonIsEnabled(script.module.animated_artwork)</visible>
                         </control>
+                        <control type="grouplist" id="11400">
+                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
+                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
+                            <orientation>horizontal</orientation>
+                            <enable>false</enable>
+                            <height>70</height>
+                            <control type="button">
+                                <enable>false</enable>
+                                <textoffsetx>30</textoffsetx>
+                                <font>Button</font>
+                                <align>left</align>
+                                <width>1310</width>
+                                <disabledcolor>PanelWhite30</disabledcolor>
+                                <height>70</height>
+                                <label>$ADDON[script.module.pvr.artwork 32000]</label>
+                            </control>
+                        </control>
+                        <control type="radiobutton" id="11401">
+                            <width>1360</width>
+                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
+                            <include>DefSettingsButtonGradientSkinSettings</include>
+                            <label>$LOCALIZE[31675]</label>
+                            <selected>Skin.HasSetting(Skin_enablePvrArtwork)</selected>
+                            <onclick>Skin.ToggleSetting(Skin_enablePvrArtwork)</onclick>
+                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
+                        </control>
+                        <control type="radiobutton" id="11402">
+                            <width>1360</width>
+                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
+                            <include>DefSettingsButtonGradientSkinSettings</include>
+                            <label>$LOCALIZE[31676]</label>
+                            <selected>Skin.HasSetting(Skin_enablePvrArtwork_Channel_Manager)</selected>
+                            <onclick>Skin.ToggleSetting(Skin_enablePvrArtwork_Channel_Manager)</onclick>
+                            <visible>Skin.HasSetting(Skin_enablePvrArtwork)</visible>
+                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
+                        </control>
                         <control type="grouplist" id="9296">
                             <visible>ControlGroup(9100).HasFocus(9106)</visible>
                             <orientation>horizontal</orientation>

From d91a45239e845fbc5b69685e6f6d89d2bd1ea57f Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 7 Mar 2022 20:44:41 +0100
Subject: [PATCH 03/17] Support PVR Artwork

---
 1080i/Includes_Images.xml |  2 ++
 1080i/MyPVRGuide.xml      |  2 +-
 1080i/SkinSettings.xml    | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index c0cf30b94..10e091a16 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -331,6 +331,8 @@
     <variable name="ChannelListEPGIconVar">
         <value condition="Window.IsVisible(MyPVRChannels.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork_Channel_Manager)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
         <value condition="Window.IsVisible(MyPVRChannels.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork_Channel_Manager)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
+        <value condition="Window.IsVisible(MyPVRGuide.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork_PVRGuide)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
+        <value condition="Window.IsVisible(MyPVRGuide.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork_PVRGuide)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
         <value condition="!String.IsEmpty(Listitem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
         <value>$INFO[ListItem.Icon]</value>
     </variable>
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 5f1c97694..cdb614858 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -73,7 +73,7 @@
                         <width>240</width>
                         <bottom>0</bottom>
                         <aspectratio align="center" aligny="center">keep</aspectratio>
-                        <texture>$INFO[ListItem.Icon]</texture>
+                        <texture>$VAR[ChannelListEPGIconVar]</texture>
                     </control>
                 </control>
                 <control type="radiobutton" id="11441">
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 1a33d485f..c1b27dc59 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -2639,6 +2639,16 @@
                             <visible>Skin.HasSetting(Skin_enablePvrArtwork)</visible>
                             <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
                         </control>
+                        <control type="radiobutton" id="11403">
+                            <width>1360</width>
+                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
+                            <include>DefSettingsButtonGradientSkinSettings</include>
+                            <label>$LOCALIZE[31677]</label>
+                            <selected>Skin.HasSetting(Skin_enablePvrArtwork_PVRGuide)</selected>
+                            <onclick>Skin.ToggleSetting(Skin_enablePvrArtwork_PVRGuide)</onclick>
+                            <visible>Skin.HasSetting(Skin_enablePvrArtwork)</visible>
+                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
+                        </control>
                         <control type="grouplist" id="9296">
                             <visible>ControlGroup(9100).HasFocus(9106)</visible>
                             <orientation>horizontal</orientation>

From 19ea2fbae9f7691add462a392c5dd7b5f7d0ce19 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 7 Mar 2022 20:48:05 +0100
Subject: [PATCH 04/17] Support PVR Artwork

---
 language/resource.language.en_gb/strings.po | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index f6bb2f5d3..7a8553cca 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -2492,3 +2492,7 @@ msgstr ""
 msgctxt "#31676"
 msgid "Use PVR Artwork in PVR Channel Manager"
 msgstr "" 
+
+msgctxt "#31677"
+msgid "Use PVR Artwork in PVR Guide"
+msgstr ""

From 773ab9df406c7dc778529f1e4833d08e2bfb34b7 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 7 Mar 2022 21:00:16 +0100
Subject: [PATCH 05/17] Support PVR Artwork

---
 1080i/Includes_Images.xml                   |  3 ++-
 1080i/SkinSettings.xml                      | 10 ++++++++++
 language/resource.language.en_gb/strings.po |  4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index 10e091a16..e229da384 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -323,7 +323,8 @@
     </variable>
 
     <variable name="PVRThumb">
-        <value condition="!String.IsEmpty(Window(Home).Property(SkinHelper.ListItem.Art.Fanart))">$INFO[Window(Home).Property(SkinHelper.ListItem.Art.Fanart)]</value>
+        <value condition="Window.IsVisible(DialogPVRInfo.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork_DialogPVRInfo)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
+        <value condition="Window.IsVisible(DialogPVRInfo.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork_DialogPVRInfo)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
         <value condition="Window.IsVisible(MyPVRRecordings.xml)">$INFO[ListItem.Icon]</value>
         <value condition="Window.IsVisible(DialogPVRInfo.xml)">$INFO[ListItem.Icon]</value>
     </variable>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index c1b27dc59..d276f9563 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -2649,6 +2649,16 @@
                             <visible>Skin.HasSetting(Skin_enablePvrArtwork)</visible>
                             <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
                         </control>
+                        <control type="radiobutton" id="11404">
+                            <width>1360</width>
+                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
+                            <include>DefSettingsButtonGradientSkinSettings</include>
+                            <label>$LOCALIZE[31678]</label>
+                            <selected>Skin.HasSetting(Skin_enablePvrArtwork_DialogPVRInfo)</selected>
+                            <onclick>Skin.ToggleSetting(Skin_enablePvrArtwork_DialogPVRInfo)</onclick>
+                            <visible>Skin.HasSetting(Skin_enablePvrArtwork)</visible>
+                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
+                        </control>
                         <control type="grouplist" id="9296">
                             <visible>ControlGroup(9100).HasFocus(9106)</visible>
                             <orientation>horizontal</orientation>
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 7a8553cca..2c6d50d36 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -2496,3 +2496,7 @@ msgstr ""
 msgctxt "#31677"
 msgid "Use PVR Artwork in PVR Guide"
 msgstr ""
+
+msgctxt "#31678"
+msgid "Use PVR Artwork in PVR Info Dialog"
+msgstr ""

From 8a7c6720f99da0bc4e9ae5d430a4047919076495 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Tue, 8 Mar 2022 20:19:05 +0100
Subject: [PATCH 06/17] Support PVR Artwork

---
 1080i/Includes_Images.xml                   | 11 ++--
 1080i/SkinSettings.xml                      | 66 +++------------------
 language/resource.language.en_gb/strings.po | 11 ----
 3 files changed, 14 insertions(+), 74 deletions(-)

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index e229da384..88fad0f90 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -323,17 +323,16 @@
     </variable>
 
     <variable name="PVRThumb">
-        <value condition="Window.IsVisible(DialogPVRInfo.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork_DialogPVRInfo)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
-        <value condition="Window.IsVisible(DialogPVRInfo.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork_DialogPVRInfo)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
+        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
+        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
+        <value condition="!String.IsEmpty(Window(Home).Property(SkinHelper.ListItem.Art.Fanart))">$INFO[Window(Home).Property(SkinHelper.ListItem.Art.Fanart)]</value>
         <value condition="Window.IsVisible(MyPVRRecordings.xml)">$INFO[ListItem.Icon]</value>
         <value condition="Window.IsVisible(DialogPVRInfo.xml)">$INFO[ListItem.Icon]</value>
     </variable>
 
     <variable name="ChannelListEPGIconVar">
-        <value condition="Window.IsVisible(MyPVRChannels.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork_Channel_Manager)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
-        <value condition="Window.IsVisible(MyPVRChannels.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork_Channel_Manager)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
-        <value condition="Window.IsVisible(MyPVRGuide.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork_PVRGuide)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
-        <value condition="Window.IsVisible(MyPVRGuide.xml) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork_PVRGuide)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
+        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
+        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
         <value condition="!String.IsEmpty(Listitem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
         <value>$INFO[ListItem.Icon]</value>
     </variable>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index d276f9563..07f4813ea 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -2471,6 +2471,15 @@
                             <selected>Skin.HasSetting(dontuselandscapemovies)</selected>
                             <onclick>Skin.ToggleSetting(dontuselandscapemovies)</onclick>
                         </control>
+                        <control type="radiobutton" id="11400">
+                            <width>1360</width>
+                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
+                            <include>DefSettingsButtonGradientSkinSettings</include>
+                            <label>$LOCALIZE[31675]</label>
+                            <selected>Skin.HasSetting(Skin_enablePvrArtwork)</selected>
+                            <onclick>Skin.ToggleSetting(Skin_enablePvrArtwork)</onclick>
+                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
+                        </control>
 
                         <!-- Indicators -->
                         <control type="button" id="9590">
@@ -2603,62 +2612,6 @@
                             <onclick>Skin.SetPath(ap_source)</onclick>
                             <visible>System.AddonIsEnabled(script.module.animated_artwork)</visible>
                         </control>
-                        <control type="grouplist" id="11400">
-                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
-                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
-                            <orientation>horizontal</orientation>
-                            <enable>false</enable>
-                            <height>70</height>
-                            <control type="button">
-                                <enable>false</enable>
-                                <textoffsetx>30</textoffsetx>
-                                <font>Button</font>
-                                <align>left</align>
-                                <width>1310</width>
-                                <disabledcolor>PanelWhite30</disabledcolor>
-                                <height>70</height>
-                                <label>$ADDON[script.module.pvr.artwork 32000]</label>
-                            </control>
-                        </control>
-                        <control type="radiobutton" id="11401">
-                            <width>1360</width>
-                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
-                            <include>DefSettingsButtonGradientSkinSettings</include>
-                            <label>$LOCALIZE[31675]</label>
-                            <selected>Skin.HasSetting(Skin_enablePvrArtwork)</selected>
-                            <onclick>Skin.ToggleSetting(Skin_enablePvrArtwork)</onclick>
-                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
-                        </control>
-                        <control type="radiobutton" id="11402">
-                            <width>1360</width>
-                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
-                            <include>DefSettingsButtonGradientSkinSettings</include>
-                            <label>$LOCALIZE[31676]</label>
-                            <selected>Skin.HasSetting(Skin_enablePvrArtwork_Channel_Manager)</selected>
-                            <onclick>Skin.ToggleSetting(Skin_enablePvrArtwork_Channel_Manager)</onclick>
-                            <visible>Skin.HasSetting(Skin_enablePvrArtwork)</visible>
-                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
-                        </control>
-                        <control type="radiobutton" id="11403">
-                            <width>1360</width>
-                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
-                            <include>DefSettingsButtonGradientSkinSettings</include>
-                            <label>$LOCALIZE[31677]</label>
-                            <selected>Skin.HasSetting(Skin_enablePvrArtwork_PVRGuide)</selected>
-                            <onclick>Skin.ToggleSetting(Skin_enablePvrArtwork_PVRGuide)</onclick>
-                            <visible>Skin.HasSetting(Skin_enablePvrArtwork)</visible>
-                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
-                        </control>
-                        <control type="radiobutton" id="11404">
-                            <width>1360</width>
-                            <visible>ControlGroup(9100).HasFocus(9106)</visible>
-                            <include>DefSettingsButtonGradientSkinSettings</include>
-                            <label>$LOCALIZE[31678]</label>
-                            <selected>Skin.HasSetting(Skin_enablePvrArtwork_DialogPVRInfo)</selected>
-                            <onclick>Skin.ToggleSetting(Skin_enablePvrArtwork_DialogPVRInfo)</onclick>
-                            <visible>Skin.HasSetting(Skin_enablePvrArtwork)</visible>
-                            <visible>System.AddonIsEnabled(script.module.pvr.artwork)</visible>
-                        </control>
                         <control type="grouplist" id="9296">
                             <visible>ControlGroup(9100).HasFocus(9106)</visible>
                             <orientation>horizontal</orientation>
@@ -3042,7 +2995,6 @@
                             <onclick>Skin.ToggleSetting(lock.skinsettings)</onclick>
                             <enable>!Skin.HasSetting(disable.startup.window)</enable>
                         </control>
-                        
                         <control type="grouplist" id="12100">
                             <visible>ControlGroup(9100).HasFocus(9107)</visible>
                             <orientation>horizontal</orientation>
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 2c6d50d36..a948e17e0 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -2489,14 +2489,3 @@ msgctxt "#31675"
 msgid "Enable PVR artwork module"
 msgstr ""
 
-msgctxt "#31676"
-msgid "Use PVR Artwork in PVR Channel Manager"
-msgstr "" 
-
-msgctxt "#31677"
-msgid "Use PVR Artwork in PVR Guide"
-msgstr ""
-
-msgctxt "#31678"
-msgid "Use PVR Artwork in PVR Info Dialog"
-msgstr ""

From db56e8383bfbb11cae443d184d3ec8c1613f3470 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Tue, 8 Mar 2022 22:44:50 +0100
Subject: [PATCH 07/17] Support PVR Artwork

---
 1080i/Includes_PVR.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/1080i/Includes_PVR.xml b/1080i/Includes_PVR.xml
index 176a6c61b..64fcf371b 100644
--- a/1080i/Includes_PVR.xml
+++ b/1080i/Includes_PVR.xml
@@ -178,7 +178,17 @@
                     <aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
                 </control>
                 <control type="image">
-                    <visible>!Player.HasVideo</visible>
+                    <visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + String.IsEmpty(Window(Home).Property(PVR.Artwork.poster))</visible>
+                    <left>70</left>
+                    <top>30</top>
+                    <right>70</right>
+                    <bottom>30</bottom>
+                    <aspectratio align="center" aligny="center" scalediffuse="false">keep</aspectratio>
+                    <texture diffuse="diffuse/pvrinfo.png" background="true">$INFO[ListItem.Icon]</texture>
+                    <fadetime>PosterFanartFadetime</fadetime>
+                </control>
+                <control type="image">
+                    <visible>!Player.HasVideo + !String.IsEmpty(Listitem.EpgEventIcon)</visible>
                     <left>10</left>
                     <top>10</top>
                     <right>10</right>

From 5c738850831aabbf167d057fdc6ccee2490e4f91 Mon Sep 17 00:00:00 2001
From: beatmasterRS <danysahne333@yahoo.de>
Date: Wed, 9 Mar 2022 09:00:06 +0100
Subject: [PATCH 08/17] Cleanup

---
 1080i/Includes_Images.xml | 2 +-
 1080i/Includes_PVR.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index 88fad0f90..6b52b8bb2 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -458,4 +458,4 @@
         <value condition="Skin.HasSetting(musicvis.fanartfallback) + !String.IsEmpty(Player.Art(fanart)) + [String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow.Image)) | !System.AddonIsEnabled(script.artistslideshow) | Skin.HasSetting(ArtistSlideShow.Disabled)]">$INFO[Player.Art(fanart)]</value>
         <value condition="!String.IsEmpty(Skin.String(fanart.fallback.music)) + [String.IsEmpty(Player.Art(fanart)) | !Skin.HasSetting(musicvis.fanartfallback)] + [String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow.Image)) | Skin.HasSetting(ArtistSlideShow.Disabled)]">$INFO[Skin.String(fanart.fallback.music)]</value>
     </variable>
-</includes>
+</includes>
\ No newline at end of file
diff --git a/1080i/Includes_PVR.xml b/1080i/Includes_PVR.xml
index 64fcf371b..08416d5a9 100644
--- a/1080i/Includes_PVR.xml
+++ b/1080i/Includes_PVR.xml
@@ -2225,4 +2225,4 @@
             </control>
         </control>
     </include>
-</includes>
+</includes>
\ No newline at end of file

From 8c25076c00fa652cc72ef9d29f91c74dd997fa87 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Wed, 9 Mar 2022 11:00:11 +0100
Subject: [PATCH 09/17] Support PVR Artwork

---
 language/resource.language.en_gb/strings.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index a948e17e0..6abde4909 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -2486,6 +2486,6 @@ msgid "Critics consensus"
 msgstr ""
 
 msgctxt "#31675"
-msgid "Enable PVR artwork module"
+msgid "Use artwork module for PVR artwork"
 msgstr ""
 

From 3ae59c07128198d167ac670cfff2fdf2a8dd23f7 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 21 Mar 2022 20:17:07 +0100
Subject: [PATCH 10/17] Support PVR Artwork

---
 1080i/Includes_Images.xml | 6 ++++++
 1080i/Includes_OSD.xml    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index 6b52b8bb2..eb272a668 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -208,6 +208,12 @@
         <value>$INFO[Player.Art(thumb)]</value>
     </variable>
 
+    <variable name="PlayerPosterPVR">
+        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
+        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
+        <value>$INFO[Player.Art(thumb)]</value>
+    </variable>
+
     <variable name="BannerImage">
         <value condition="!String.IsEmpty(ListItem.Art(banner))">$INFO[ListItem.Art(banner)]</value>
         <value condition="!String.IsEmpty(ListItem.Art(tvshow.banner))">$INFO[ListItem.Art(tvshow.banner)]</value>
diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
index 5459667a9..ac7cf23ae 100644
--- a/1080i/Includes_OSD.xml
+++ b/1080i/Includes_OSD.xml
@@ -2863,8 +2863,8 @@
                         <bottom>70</bottom>
                         <left>20</left>
                         <aspectratio>keep</aspectratio>
-                        <texture>$INFO[Player.Art(thumb)]</texture>
-                        <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb))</visible>
+                        <texture>$VAR[PlayerPosterPVR]</texture>
+                        <visible>VideoPlayer.Content(LiveTV) + [!String.IsEmpty(Player.Art(thumb)) | !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) | !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster))]</visible>
                     </control>
                 </control>
             </control>

From 29a23191a3e20e262f4ec69380c67784f382b1c9 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 21 Mar 2022 21:38:53 +0100
Subject: [PATCH 11/17] Support PVR Artwork

---
 1080i/Includes_Images.xml |  1 -
 1080i/Includes_OSD.xml    | 13 +++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index eb272a668..ec8f3701c 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -209,7 +209,6 @@
     </variable>
 
     <variable name="PlayerPosterPVR">
-        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
         <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
         <value>$INFO[Player.Art(thumb)]</value>
     </variable>
diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
index ac7cf23ae..8f7d83fdb 100644
--- a/1080i/Includes_OSD.xml
+++ b/1080i/Includes_OSD.xml
@@ -2857,14 +2857,23 @@
                         <texture colordiffuse="Box2" border="4" background="true">common/box21.png</texture>
                         <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + !Skin.HasSetting(osd.disable.icon.background.pvr)</visible>
                     </control>
+                    <control type="image">
+                        <left>-50</left>
+                        <top>-240</top>
+                        <width>270</width>
+                        <height>390</height>
+                        <aspectratio>keep</aspectratio>
+                        <texture>$VAR[PlayerPosterPVR]</texture>
+                        <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)</visible>
+                    </control>
                     <control type="image">
                         <width>230</width>
                         <height>230</height>
                         <bottom>70</bottom>
                         <left>20</left>
                         <aspectratio>keep</aspectratio>
-                        <texture>$VAR[PlayerPosterPVR]</texture>
-                        <visible>VideoPlayer.Content(LiveTV) + [!String.IsEmpty(Player.Art(thumb)) | !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) | !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster))]</visible>
+                        <texture>$INFO[Player.Art(thumb)]</texture>
+                        <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + String.IsEmpty(Window(Home).Property(PVR.Artwork.poster))</visible>
                     </control>
                 </control>
             </control>

From 571fd1cddd4646d8300e7c570c2ac77c56e90d53 Mon Sep 17 00:00:00 2001
From: beatmasterRS <danysahne333@yahoo.de>
Date: Wed, 30 Mar 2022 10:05:24 +0200
Subject: [PATCH 12/17] [Code] improvements

---
 1080i/Includes_Images.xml | 5 -----
 1080i/Includes_OSD.xml    | 6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index ec8f3701c..6b52b8bb2 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -208,11 +208,6 @@
         <value>$INFO[Player.Art(thumb)]</value>
     </variable>
 
-    <variable name="PlayerPosterPVR">
-        <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
-        <value>$INFO[Player.Art(thumb)]</value>
-    </variable>
-
     <variable name="BannerImage">
         <value condition="!String.IsEmpty(ListItem.Art(banner))">$INFO[ListItem.Art(banner)]</value>
         <value condition="!String.IsEmpty(ListItem.Art(tvshow.banner))">$INFO[ListItem.Art(tvshow.banner)]</value>
diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
index 8f7d83fdb..49e48d8c3 100644
--- a/1080i/Includes_OSD.xml
+++ b/1080i/Includes_OSD.xml
@@ -2833,7 +2833,7 @@
                         <aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
                     </control>
                     <control type="image">
-                        <visible>!VideoPlayer.Content(LiveTV) + [!String.IsEmpty(Player.Art(tvshow.poster)) | !String.IsEmpty(Player.Art(poster))]</visible>
+                        <visible>[!VideoPlayer.Content(LiveTV) + [!String.IsEmpty(Player.Art(tvshow.poster)) | !String.IsEmpty(Player.Art(poster))]] | [VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)]</visible>
                         <left>-51</left>
                         <top>-241</top>
                         <width>272</width>
@@ -2863,7 +2863,7 @@
                         <width>270</width>
                         <height>390</height>
                         <aspectratio>keep</aspectratio>
-                        <texture>$VAR[PlayerPosterPVR]</texture>
+                        <texture>$INFO[Window(Home).Property(PVR.Artwork.poster)]</texture>
                         <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)</visible>
                     </control>
                     <control type="image">
@@ -2873,7 +2873,7 @@
                         <left>20</left>
                         <aspectratio>keep</aspectratio>
                         <texture>$INFO[Player.Art(thumb)]</texture>
-                        <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + String.IsEmpty(Window(Home).Property(PVR.Artwork.poster))</visible>
+                        <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Player.Art(thumb)) + [[String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)] | !Skin.HasSetting(Skin_enablePvrArtwork)]</visible>
                     </control>
                 </control>
             </control>

From f7e0b81d4ff801c0e2814395412383cff7227f8c Mon Sep 17 00:00:00 2001
From: beatmasterRS <danysahne333@yahoo.de>
Date: Wed, 30 Mar 2022 10:13:05 +0200
Subject: [PATCH 13/17] [Code] improvements

---
 1080i/Includes_Images.xml | 2 +-
 1080i/Includes_PVR.xml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index 6b52b8bb2..c9daa7da0 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -333,7 +333,7 @@
     <variable name="ChannelListEPGIconVar">
         <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
         <value condition="!String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.poster)]</value>
-        <value condition="!String.IsEmpty(Listitem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
+        <value condition="!String.IsEmpty(ListItem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
         <value>$INFO[ListItem.Icon]</value>
     </variable>
 
diff --git a/1080i/Includes_PVR.xml b/1080i/Includes_PVR.xml
index 08416d5a9..5808ce47b 100644
--- a/1080i/Includes_PVR.xml
+++ b/1080i/Includes_PVR.xml
@@ -178,7 +178,7 @@
                     <aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
                 </control>
                 <control type="image">
-                    <visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon) + String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + String.IsEmpty(Window(Home).Property(PVR.Artwork.poster))</visible>
+                    <visible>!Player.HasVideo + String.IsEmpty(Listitem.EpgEventIcon) + [[String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)] | !Skin.HasSetting(Skin_enablePvrArtwork)]</visible>
                     <left>70</left>
                     <top>30</top>
                     <right>70</right>
@@ -188,7 +188,7 @@
                     <fadetime>PosterFanartFadetime</fadetime>
                 </control>
                 <control type="image">
-                    <visible>!Player.HasVideo + !String.IsEmpty(Listitem.EpgEventIcon)</visible>
+                    <visible>!Player.HasVideo + [!String.IsEmpty(Listitem.EpgEventIcon) | !String.IsEmpty(ListItem.Icon) | [Skin.HasSetting(Skin_enablePvrArtwork) + [!String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) | !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster))]]]</visible>
                     <left>10</left>
                     <top>10</top>
                     <right>10</right>

From 3c45084c47348f795750bf61c8f4fac71f2a90d5 Mon Sep 17 00:00:00 2001
From: beatmasterRS <danysahne333@yahoo.de>
Date: Wed, 30 Mar 2022 10:14:32 +0200
Subject: [PATCH 14/17] Update Includes_OSD.xml

---
 1080i/Includes_OSD.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
index 49e48d8c3..1b42a0338 100644
--- a/1080i/Includes_OSD.xml
+++ b/1080i/Includes_OSD.xml
@@ -2862,7 +2862,7 @@
                         <top>-240</top>
                         <width>270</width>
                         <height>390</height>
-                        <aspectratio>keep</aspectratio>
+                        <aspectratio align="center" aligny="center" scalediffuse="false">scale</aspectratio>
                         <texture>$INFO[Window(Home).Property(PVR.Artwork.poster)]</texture>
                         <visible>VideoPlayer.Content(LiveTV) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.poster)) + Skin.HasSetting(Skin_enablePvrArtwork)</visible>
                     </control>

From 0ddd69655e63af762d324fa6533ac8773a95ac8e Mon Sep 17 00:00:00 2001
From: kalle2000 <daniel@pips.dj>
Date: Thu, 31 Mar 2022 19:05:09 +0200
Subject: [PATCH 15/17] Update MyPVRGuide.xml

---
 1080i/MyPVRGuide.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index cdb614858..b8451747a 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -74,6 +74,7 @@
                         <bottom>0</bottom>
                         <aspectratio align="center" aligny="center">keep</aspectratio>
                         <texture>$VAR[ChannelListEPGIconVar]</texture>
+                        <fadetime>PosterFanartFadetime</fadetime>
                     </control>
                 </control>
                 <control type="radiobutton" id="11441">
@@ -421,4 +422,4 @@
         </control>
         <include>PVRSideBlade</include>
     </controls>
-</window>
\ No newline at end of file
+</window>

From adeefaed2050b5a389fb7edfc067cc90e41c8598 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 18 Apr 2022 19:19:24 +0200
Subject: [PATCH 16/17] PVR artwork - Global Fanart for EPG/Channel Manager

---
 1080i/Includes.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 673df4977..504173ea3 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -519,6 +519,8 @@
         <value condition="Window.IsVisible(home) + !Container(301).IsUpdating + !String.IsEmpty(Container(301).ListItem.Property(Background))">$INFO[Container(301).ListItem.Property(Background)]</value>
         <value condition="Window.IsVisible(home) + !Container(301).IsUpdating + Skin.HasSetting(homemenu.netflix)">common/null.png</value>
         <value condition="Window.IsVisible(home) + !Container(301).IsUpdating">pvr/background.jpg</value>
+        <value condition="Window.IsVisible(tvchannels) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) +  Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.Fanart)]</value>
+        <value condition="Window.IsVisible(tvguide) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) +  Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.Fanart)]</value>
         <value condition="!String.IsEmpty(Window(Home).Property(SkinHelper.ExtraFanArtPath)) + Skin.HasSetting(SkinHelper.EnableExtraFanart) + System.AddonIsEnabled(script.skin.helper.service) + Window.IsVisible(MyVideoNav.xml)">$INFO[Window(Home).Property(SkinHelper.ExtraFanArtPath)]</value>
         <value condition="!String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.Art(fanart)]</value>
         <value condition="!String.IsEmpty(Container(9500).ListItem.Art(fanart))">$INFO[Container(9500).ListItem.Art(fanart)]</value>

From 35e291a54ca05a33c6a822ed71447916cbdbe021 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 18 Apr 2022 19:24:38 +0200
Subject: [PATCH 17/17] PVR artwork - Global Fanart for Home Window

---
 1080i/Includes.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 504173ea3..9fbef6c2e 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -510,6 +510,7 @@
         <value condition="!Skin.HasSetting(home.dontshowfanart) + [[Skin.HasSetting(home.vertical) + Skin.HasSetting(home.vertical.widgets)] | [!Skin.HasSetting(home.vertical) + !Skin.HasSetting(home.classicwidgets) + Skin.HasSetting(home.vertical.widgets)]] + Window.IsVisible(home) + String.IsEmpty(Container(301).ListItem.Property(Background)) + String.IsEmpty(Container(301).ListItem.Property(backgroundPlaylist)) + !String.IsEmpty(Container(301152).ListItem.Art(fanart)) + Integer.IsEqual(Container(301151).NumItems,0) + Control.IsVisible(301152) + !Control.HasFocus(301152) + String.IsEmpty(Container(300).ListItem.Property(background)) + [Control.HasFocus(300) | Control.HasFocus(302) | Control.HasFocus(2011)]">$INFO[Container(301152).ListItem.Art(fanart)]</value>
 
         <!-- Fallback, Other -->
+        <value condition="Window.IsVisible(home) + !String.IsEmpty(Window(Home).Property(PVR.Artwork.fanart)) + String.IsEmpty(ListItem.Property(fanart)) + Skin.HasSetting(Skin_enablePvrArtwork)">$INFO[Window(Home).Property(PVR.Artwork.fanart)]</value>
         <value condition="Window.IsVisible(home) + String.IsEqual(Container(300).ListItem.Property(background),playlistBackground)">$INFO[Container(9988).ListItem.Art(fanart)]</value>
         <value condition="Window.IsVisible(home) + !String.IsEmpty(Container(300).ListItem.Property(Background)) + [String.IsEmpty(Skin.String(fanart.fallback)) | Control.HasFocus(300) | Control.HasFocus(302) | Control.HasFocus(2011)]">$INFO[Container(300).ListItem.Property(Background)]</value>
         <value condition="Window.IsVisible(home) + !String.IsEmpty(Skin.String(home.slideshowpath)) + [[String.IsEqual(Container(300).ListItem.Property(widget),weatherdaily) | String.IsEqual(Container(300).ListItem.Property(widget),weatherhourly)] | String.IsEmpty(Container(300).ListItem.Property(widget)) | Container(301).IsUpdating |  Skin.HasSetting(home.dontshowfanart)]">$INFO[Skin.String(home.slideshowpath)]</value>