From e2f11dc6c1cb42991c5b6aebfd117cf22aea3c3a Mon Sep 17 00:00:00 2001
From: lobatolobato <felipelobato.rj@gmail.com>
Date: Wed, 11 Feb 2026 20:20:25 -0300
Subject: [PATCH 01/13] feat: add day-night cycle

---
 package/contents/config/main.xml    |  16 +++++
 package/contents/ui/VideosModel.qml |   4 +-
 package/contents/ui/code/enum.js    |   6 ++
 package/contents/ui/code/utils.js   |   8 ++-
 package/contents/ui/config.qml      |  30 +++++++-
 package/contents/ui/main.qml        | 107 +++++++++++++++++++++++++---
 6 files changed, 157 insertions(+), 14 deletions(-)

diff --git a/package/contents/config/main.xml b/package/contents/config/main.xml
index 2a82c81..d301b24 100644
--- a/package/contents/config/main.xml
+++ b/package/contents/config/main.xml
@@ -112,6 +112,18 @@
     <entry name="LastVideoPosition" type="Int">
       <default>0</default>
     </entry>
+    <entry name="LastVideoDay" type="String">
+      <default></default>
+    </entry>
+    <entry name="LastVideoDayPosition" type="Int">
+      <default>0</default>
+    </entry>
+    <entry name="LastVideoNight" type="String">
+      <default></default>
+    </entry>
+    <entry name="LastVideoNightPosition" type="Int">
+      <default>0</default>
+    </entry>
     <!-- Mute audio
         0: when maximized or full-screen windows
         1: when a visible window is active
@@ -135,6 +147,10 @@
     <entry name="ChangeWallpaperTimerHours" type="Int">
       <default>0</default>
     </entry>
+    <entry name="DayNightCycle" type="Bool">
+      <label>Whether or not to cycle between day and night wallpapers</label>
+      <default>False</default>
+    </entry>
     <entry name="ResumeLastVideo" type="Bool">
       <label>Whether or not to resume last playing video on startup</label>
       <default>True</default>
diff --git a/package/contents/ui/VideosModel.qml b/package/contents/ui/VideosModel.qml
index 41fe007..318acad 100644
--- a/package/contents/ui/VideosModel.qml
+++ b/package/contents/ui/VideosModel.qml
@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 import QtQuick
 import "code/utils.js" as Utils
+import "code/enum.js" as Enum
 
 Item {
     id: root
@@ -27,7 +28,8 @@ Item {
             "customDuration": 0,
             "playbackRate": 0.0,
             "alternativePlaybackRate": 0.0,
-            "loop": false
+            "loop": false,
+            "dayNightCycleAssignment": Enum.DayNightCycleAssignment.Both
         });
         updated();
     }
diff --git a/package/contents/ui/code/enum.js b/package/contents/ui/code/enum.js
index 1ce2c58..09061f6 100644
--- a/package/contents/ui/code/enum.js
+++ b/package/contents/ui/code/enum.js
@@ -16,6 +16,12 @@ const ChangeWallpaperMode = {
   OnATimer: 2,
 };
 
+const DayNightCycleAssignment = {
+  Both: 0,
+  Day: 1,
+  Night: 2,
+};
+
 const PauseMode = {
   MaximizedOrFullScreen: 0,
   ActiveWindowPresent: 1,
diff --git a/package/contents/ui/code/utils.js b/package/contents/ui/code/utils.js
index bfe1db4..8a4623b 100644
--- a/package/contents/ui/code/utils.js
+++ b/package/contents/ui/code/utils.js
@@ -4,6 +4,7 @@ function parseCompat(cfgStr) {
     JSON.parse(cfgStr).forEach((video) => {
       video.playbackRate = video.playbackRate ?? 0.0;
       video.alternativePlaybackRate = video.alternativePlaybackRate ?? 0.0;
+      video.dayNightCycleAssignment = video.dayNightCycleAssignment ?? 0;
       videos.push(video);
     });
   } catch (e) {
@@ -26,12 +27,13 @@ function createVideo(filename) {
     "customDuration": 0,
     "playbackRate": 0.0,
     "alternativePlaybackRate": 0.0,
-    "loop": false
+    "loop": false,
+    "dayNightCycleAssignment": 0,
   };
 }
 
 /**
- * 
+ *
  * @param {String} filename File path
  * @param {Array} videosConfig Videos config
  * @returns {Object} Video properties
@@ -42,7 +44,7 @@ function getVideoByFile(filename, videosConfig) {
 }
 
 /**
- * 
+ *
  * @param {int} index Video index
  * @param {Array} videosConfig Videos config
  * @returns {Object} Video properties
diff --git a/package/contents/ui/config.qml b/package/contents/ui/config.qml
index 41ea1a1..74a2229 100644
--- a/package/contents/ui/config.qml
+++ b/package/contents/ui/config.qml
@@ -65,6 +65,7 @@ ColumnLayout {
     property real cfg_PlaybackRate
     property real cfg_AlternativePlaybackRate
     property alias cfg_Volume: volumeSlider.value
+    property alias cfg_DayNightCycle: dayNightCycleCheckBox.checked
     property alias cfg_RandomMode: randomModeCheckbox.checked
     property alias cfg_ResumeLastVideo: resumeLastVideoCheckbox.checked
     property alias cfg_ChangeWallpaperMode: changeWallpaperModeComboBox.currentValue
@@ -200,7 +201,8 @@ ColumnLayout {
                 customDuration: item.customDuration,
                 playbackRate: item.playbackRate,
                 alternativePlaybackRate: item.alternativePlaybackRate,
-                loop: item.loop
+                loop: item.loop,
+                dayNightCycleAssignment: item.dayNightCycleAssignment
             });
         }
         cfg_VideoUrls = JSON.stringify(videos);
@@ -511,6 +513,12 @@ ColumnLayout {
             }
         }
 
+        CheckBox {
+            id: dayNightCycleCheckBox
+            Kirigami.FormData.label: i18n("Day/Night Cycle:")
+            visible: root.currentTab === 1
+        }
+
         CheckBox {
             id: randomModeCheckbox
             Kirigami.FormData.label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Random order:")
@@ -1119,6 +1127,7 @@ ColumnLayout {
                     required property real playbackRate
                     required property real alternativePlaybackRate
                     required property bool loop
+                    required property int dayNightCycleAssignment
                     implicitWidth: ListView.view.width
                     implicitHeight: delegate.height
                     ItemDelegate {
@@ -1221,6 +1230,25 @@ ColumnLayout {
                                 ToolTip.visible: hovered
                                 ToolTip.text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Alternative playback speed for this video. Minimum accepted is 0.01, set to 0.0 to ignore this setting.")
                             }
+
+                            Button {
+                                readonly property int currAssignment: itemDelegate.dayNightCycleAssignment
+                                readonly property bool notBoth: currAssignment !== Enum.DayNightCycleAssignment.Both
+                                icon.name: ["night-light-disabled-symbolic", "weather-clear-symbolic", "weather-clear-night-symbolic"][currAssignment]
+                                enabled: itemDelegate.enabled
+                                highlighted: notBoth
+                                icon.color: notBoth ? Kirigami.Theme.highlightColor : root.Kirigami.Theme.textColor
+                                onClicked: videosModel.updateItem(itemDelegate.index, "dayNightCycleAssignment", (currAssignment + 1) % 3)
+                                Layout.fillHeight: true
+                                Layout.preferredWidth: height
+                                Kirigami.Theme.colorSet: Kirigami.Theme.View
+                                Kirigami.Theme.textColor: notBoth ? Kirigami.Theme.highlightColor : root.Kirigami.Theme.textColor
+                                Kirigami.Theme.highlightColor: notBoth ? Kirigami.Theme.highlightColor : root.Kirigami.Theme.highlightColor
+                                ToolTip.delay: 1000
+                                ToolTip.visible: hovered
+                                ToolTip.text: i18n("Tells if video will be displayed during the day, night or both.")
+                            }
+
                             Button {
                                 icon.name: "media-repeat-single-symbolic"
                                 checkable: true
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index afc9dfb..0d3e3af 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -42,9 +42,41 @@ WallpaperItem {
     }
     property int currentVideoIndex: 0
     property bool resumeLastVideo: main.configuration.ResumeLastVideo
+    property bool dayNightCycle: main.configuration.DayNightCycle
+    property bool isDay: {
+        const currentTime = new Date().getHours();
+        return currentTime >= 6 && currentTime < 19;
+    }
+
+    function getLastVideo() {
+        let lastVideo = main.configuration.LastVideo;
+        if (dayNightCycle) {
+            lastVideo = main.configuration[isDay ? "LastVideoDay" : "LastVideoNight"];
+        }
+        return lastVideo;
+    }
+    function getLastVideoPosition() {
+        let lastVideoPosition = main.configuration.LastVideoPosition;
+        if (dayNightCycle) {
+            lastVideoPosition = main.configuration[isDay ? "LastVideoDayPosition" : "LastVideoNightPosition"];
+        }
+        return lastVideoPosition;
+    }
+    function getLastVideoIndex() {
+        const lastVideo = getLastVideo();
+        for (let index = 0; index < videosConfig.length; index++) {
+            if (videosConfig[index].filename === lastVideo) {
+                return index;
+            }
+        }
+
+        return 0;
+    }
+
     property var currentSource: {
-        if (resumeLastVideo && main.configuration.LastVideo !== "") {
-            return Utils.getVideoByFile(main.configuration.LastVideo, videosConfig);
+        const lastVideo = getLastVideo();
+        if (resumeLastVideo && lastVideo !== "") {
+            return Utils.getVideoByFile(lastVideo, videosConfig);
         }
         return Utils.getVideoByIndex(currentVideoIndex, videosConfig);
     }
@@ -196,6 +228,15 @@ WallpaperItem {
     }
 
     function getVideos() {
+        if (dayNightCycle) {
+            return Utils.parseCompat(videoUrls).filter(video => {
+                const isDayCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Night;
+                const isNightCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Day;
+
+                return video.enabled && ((main.isDay && isDayCycle) || (!main.isDay && isNightCycle));
+            });
+        }
+
         return Utils.parseCompat(videoUrls).filter(video => video.enabled);
     }
 
@@ -260,15 +301,58 @@ WallpaperItem {
         }
     }
 
-    function nextVideo() {
-        printLog("- Video ended " + currentVideoIndex + ": " + currentSource.filename);
-        currentVideoIndex = (currentVideoIndex + 1) % videosConfig.length;
-        if (randomMode && currentVideoIndex === 0) {
+    Timer {
+        id: dayNightCycleTimer
+        interval: 1000
+        running: true
+        repeat: true
+        triggeredOnStart: true
+        onTriggered: {
+            const dayNightCycleConfigChanged = dayNightCycle !== main.configuration.DayNightCycle;
+            if (!dayNightCycleConfigChanged && !main.configuration.DayNightCycle) {
+                return;
+            }
+            dayNightCycle = main.configuration.DayNightCycle;
+
+            const hours = new Date().getHours();
+            const isDay = hours >= 6 && hours < 19;
+
+            if ((main.isDay != isDay) || dayNightCycleConfigChanged) {
+                main.save();
+                main.isDay = isDay;
+                videosConfig = getVideos();
+
+                if (getLastVideo() === "") {
+                    setCurrentSource(0);
+                    return player.next();
+                }
+
+                currentVideoIndex = getLastVideoIndex();
+
+                if (main.configuration.ResumeLastVideo) {
+                    // TODO: Resume last (day/night) video when changing from day to night or vice versa
+                }
+
+                setCurrentSource(currentVideoIndex);
+
+                player.next();
+            }
+        }
+    }
+
+    function setCurrentSource(index) {
+        if (randomMode && index === 0) {
             const shuffledVideos = Utils.shuffleArray(videosConfig);
-            currentSource = shuffledVideos[currentVideoIndex];
+            currentSource = shuffledVideos[index];
         } else {
-            currentSource = videosConfig[currentVideoIndex];
+            currentSource = videosConfig[index];
         }
+    }
+
+    function nextVideo() {
+        printLog("- Video ended " + currentVideoIndex + ": " + currentSource.filename);
+        currentVideoIndex = (currentVideoIndex + 1) % videosConfig.length;
+        setCurrentSource(currentVideoIndex);
         printLog("- Next " + currentVideoIndex + ": " + currentSource.filename);
     }
 
@@ -281,7 +365,7 @@ WallpaperItem {
             id: player
             anchors.fill: parent
             muted: main.muteAudio
-            lastVideoPosition: main.configuration.LastVideoPosition
+            lastVideoPosition: main.getLastVideoPosition()
             visible: main.videosConfig.length !== 0
             onSetNextSource: {
                 main.nextVideo();
@@ -452,6 +536,7 @@ WallpaperItem {
 
     Component.onCompleted: {
         startTimer.start();
+        dayNightCycleTimer.start();
         Qt.callLater(() => {
             player.currentSource = Qt.binding(() => {
                 return main.currentSource;
@@ -463,6 +548,10 @@ WallpaperItem {
         // Save last video and position to resume from it on next login/lock
         main.configuration.LastVideo = main.currentSource.filename;
         main.configuration.LastVideoPosition = player.lastVideoPosition;
+        if(dayNightCycle) {
+            main.configuration[main.isDay ? "LastVideoDay" : "LastVideoNight"] = main.currentSource.filename;
+            main.configuration[main.isDay ? "LastVideoDayPosition" : "LastVideoNightPosition"] = player.lastVideoPosition;
+        }
         main.configuration.writeConfig();
         printLog("Bye!");
     }

From bdaee76baafccf953b5dcc29e859bfd33146a529 Mon Sep 17 00:00:00 2001
From: lobatolobato <felipelobato.rj@gmail.com>
Date: Thu, 12 Feb 2026 11:44:11 -0300
Subject: [PATCH 02/13] refactor: remove unused day/night video position
 tracking code

---
 package/contents/config/main.xml |  6 ------
 package/contents/ui/main.qml     | 15 +++------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/package/contents/config/main.xml b/package/contents/config/main.xml
index d301b24..e736889 100644
--- a/package/contents/config/main.xml
+++ b/package/contents/config/main.xml
@@ -115,15 +115,9 @@
     <entry name="LastVideoDay" type="String">
       <default></default>
     </entry>
-    <entry name="LastVideoDayPosition" type="Int">
-      <default>0</default>
-    </entry>
     <entry name="LastVideoNight" type="String">
       <default></default>
     </entry>
-    <entry name="LastVideoNightPosition" type="Int">
-      <default>0</default>
-    </entry>
     <!-- Mute audio
         0: when maximized or full-screen windows
         1: when a visible window is active
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index 0d3e3af..00b2075 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -49,18 +49,10 @@ WallpaperItem {
     }
 
     function getLastVideo() {
-        let lastVideo = main.configuration.LastVideo;
         if (dayNightCycle) {
-            lastVideo = main.configuration[isDay ? "LastVideoDay" : "LastVideoNight"];
+            return main.configuration[isDay ? "LastVideoDay" : "LastVideoNight"];
         }
-        return lastVideo;
-    }
-    function getLastVideoPosition() {
-        let lastVideoPosition = main.configuration.LastVideoPosition;
-        if (dayNightCycle) {
-            lastVideoPosition = main.configuration[isDay ? "LastVideoDayPosition" : "LastVideoNightPosition"];
-        }
-        return lastVideoPosition;
+        return main.configuration.LastVideo;
     }
     function getLastVideoIndex() {
         const lastVideo = getLastVideo();
@@ -365,7 +357,7 @@ WallpaperItem {
             id: player
             anchors.fill: parent
             muted: main.muteAudio
-            lastVideoPosition: main.getLastVideoPosition()
+            lastVideoPosition: main.configuration.LastVideoPosition
             visible: main.videosConfig.length !== 0
             onSetNextSource: {
                 main.nextVideo();
@@ -550,7 +542,6 @@ WallpaperItem {
         main.configuration.LastVideoPosition = player.lastVideoPosition;
         if(dayNightCycle) {
             main.configuration[main.isDay ? "LastVideoDay" : "LastVideoNight"] = main.currentSource.filename;
-            main.configuration[main.isDay ? "LastVideoDayPosition" : "LastVideoNightPosition"] = player.lastVideoPosition;
         }
         main.configuration.writeConfig();
         printLog("Bye!");

From be20efccd480631a5a5ee88167a1ac0239dc779f Mon Sep 17 00:00:00 2001
From: lobatolobato <felipelobato.rj@gmail.com>
Date: Thu, 12 Feb 2026 21:33:20 -0300
Subject: [PATCH 03/13] feat: Implement day-night modes and move logic into
 DayNightController.qml

---
 package/contents/config/main.xml              | 14 ++-
 .../contents/ui/DayNightCycleController.qml   | 59 ++++++++++++
 package/contents/ui/code/enum.js              |  8 ++
 package/contents/ui/components/TimePicker.qml | 36 +++++++
 package/contents/ui/config.qml                | 57 ++++++++++--
 package/contents/ui/main.qml                  | 93 +++++++------------
 6 files changed, 197 insertions(+), 70 deletions(-)
 create mode 100644 package/contents/ui/DayNightCycleController.qml
 create mode 100644 package/contents/ui/components/TimePicker.qml

diff --git a/package/contents/config/main.xml b/package/contents/config/main.xml
index e736889..9e85a87 100644
--- a/package/contents/config/main.xml
+++ b/package/contents/config/main.xml
@@ -141,10 +141,22 @@
     <entry name="ChangeWallpaperTimerHours" type="Int">
       <default>0</default>
     </entry>
-    <entry name="DayNightCycle" type="Bool">
+    <entry name="DayNightCycleEnabled" type="Bool">
       <label>Whether or not to cycle between day and night wallpapers</label>
       <default>False</default>
     </entry>
+    <entry name="DayNightCycleMode" type="Int">
+      <label>Mode</label>
+      <default>0</default>
+    </entry>
+    <entry name="DayNightCycleSunriseTime" type="Int">
+      <label>Time of sunrise</label>
+      <default>360</default>
+    </entry>
+    <entry name="DayNightCycleSunsetTime" type="Int">
+      <label>Time of sunset</label>
+      <default>1080</default>
+    </entry>
     <entry name="ResumeLastVideo" type="Bool">
       <label>Whether or not to resume last playing video on startup</label>
       <default>True</default>
diff --git a/package/contents/ui/DayNightCycleController.qml b/package/contents/ui/DayNightCycleController.qml
new file mode 100644
index 0000000..3ff50d4
--- /dev/null
+++ b/package/contents/ui/DayNightCycleController.qml
@@ -0,0 +1,59 @@
+import QtQuick
+import "code/enum.js" as Enum
+
+Item {
+    id: root
+    required property bool enabled
+    required property int mode
+    required property int sunriseTime
+    required property int sunsetTime
+
+    required property bool isLoading
+
+    function detectDayTime(mode: int, sunriseTime: int, sunsetTime: int): bool {
+      switch (root.mode) {
+        case Enum.DayNightCycleMode.Time:
+          const now = new Date();
+          const currentTime = now.getHours() * 60 + now.getMinutes();
+
+          return currentTime >= root.sunriseTime && currentTime < root.sunsetTime;
+        case Enum.DayNightCycleMode.PlasmaStyle: return Qt.styleHints.colorScheme === Qt.ColorScheme.Light;
+        case Enum.DayNightCycleMode.AlwaysNight: return false;
+        case Enum.DayNightCycleMode.AlwaysDay:   return true;
+      }
+    }
+
+    property bool isDay: true
+
+    signal beforeChanged;
+    signal changed;
+
+    Timer {
+        id: timer
+        interval: 1000
+        running: true
+        repeat: true
+        triggeredOnStart: true
+        property bool prevEnabled: root.enabled
+        onTriggered: {
+            const enableChanged = timer.prevEnabled !== root.enabled;
+            if ((!enableChanged && !root.enabled) || root.isLoading) {
+                return;
+            }
+            timer.prevEnabled = root.enabled;
+
+            const isDay = root.detectDayTime(root.mode, root.sunriseTime, root.sunsetTime);
+
+            if ((root.isDay != isDay) || enableChanged) {
+                root.beforeChanged();
+                root.isDay = isDay;
+                root.changed();
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        root.isDay = root.detectDayTime(root.mode, root.sunriseTime, root.sunsetTime);
+        timer.start();
+    }
+}
diff --git a/package/contents/ui/code/enum.js b/package/contents/ui/code/enum.js
index 09061f6..5703ea9 100644
--- a/package/contents/ui/code/enum.js
+++ b/package/contents/ui/code/enum.js
@@ -22,6 +22,14 @@ const DayNightCycleAssignment = {
   Night: 2,
 };
 
+const DayNightCycleMode = {
+  Disabled: 0,
+  Time: 1,
+  PlasmaStyle: 2,
+  AlwaysDay: 3,
+  AlwaysNight: 4,
+};
+
 const PauseMode = {
   MaximizedOrFullScreen: 0,
   ActiveWindowPresent: 1,
diff --git a/package/contents/ui/components/TimePicker.qml b/package/contents/ui/components/TimePicker.qml
new file mode 100644
index 0000000..abb24df
--- /dev/null
+++ b/package/contents/ui/components/TimePicker.qml
@@ -0,0 +1,36 @@
+import QtQuick.Controls
+import QtQuick.Layouts
+
+RowLayout {
+    id: root
+    required property string label
+    property int value
+
+    Label {
+        text: root.label
+    }
+    SpinBox {
+        id: hours
+        from: 0
+        to: 23
+        value: Math.floor(root.value / 60)
+        editable: true
+        textFromValue: (value) => value.toString().padStart(2, '0')
+        valueFromText: (text) => parseInt(text, 10)
+        onValueModified: {
+            root.value = hours.value * 60 + minutes.value
+        }
+    }
+    SpinBox {
+        id: minutes
+        from: 0
+        to: 59
+        value: root.value % 60
+        editable: true
+        textFromValue: (value) => value.toString().padStart(2, '0')
+        valueFromText: (text) => parseInt(text, 10)
+        onValueModified: {
+            root.value = hours.value * 60 + minutes.value
+        }
+    }
+}
diff --git a/package/contents/ui/config.qml b/package/contents/ui/config.qml
index 74a2229..4bbf5f7 100644
--- a/package/contents/ui/config.qml
+++ b/package/contents/ui/config.qml
@@ -65,7 +65,10 @@ ColumnLayout {
     property real cfg_PlaybackRate
     property real cfg_AlternativePlaybackRate
     property alias cfg_Volume: volumeSlider.value
-    property alias cfg_DayNightCycle: dayNightCycleCheckBox.checked
+    property bool cfg_DayNightCycleEnabled: dayNightCycleMode.currentValue !== Enum.DayNightCycleMode.Disabled
+    property alias cfg_DayNightCycleMode: dayNightCycleMode.currentValue
+    property alias cfg_DayNightCycleSunriseTime: dayNightCycleSunriseTime.value
+    property alias cfg_DayNightCycleSunsetTime: dayNightCycleSunsetTime.value
     property alias cfg_RandomMode: randomModeCheckbox.checked
     property alias cfg_ResumeLastVideo: resumeLastVideoCheckbox.checked
     property alias cfg_ChangeWallpaperMode: changeWallpaperModeComboBox.currentValue
@@ -356,6 +359,52 @@ ColumnLayout {
                 valueRole: "value"
             }
         }
+
+        RowLayout {
+            Kirigami.FormData.label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Day-Night Cycle:")
+            visible: root.currentTab === 0
+
+            ComboBox {
+                id: dayNightCycleMode
+                model: [
+                    {
+                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Disabled"),
+                        value: Enum.DayNightCycleMode.Disabled
+                    },
+                    {
+                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Based on time"),
+                        value: Enum.DayNightCycleMode.Time
+                    },
+                    {
+                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Based on Plasma Style"),
+                        value: Enum.DayNightCycleMode.PlasmaStyle
+                    },
+                    {
+                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Always Day"),
+                        value: Enum.DayNightCycleMode.AlwaysDay
+                    },
+                    {
+                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Always Night"),
+                        value: Enum.DayNightCycleMode.AlwaysNight
+                    }
+                ]
+                textRole: "text"
+                valueRole: "value"
+            }
+        }
+        ColumnLayout {
+            visible: root.currentTab === 0
+            enabled: dayNightCycleMode.currentValue === Enum.DayNightCycleMode.Time
+            Components.TimePicker {
+                id: dayNightCycleSunriseTime
+                label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Sunrise:")
+            }
+            Components.TimePicker {
+                id: dayNightCycleSunsetTime
+                label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Sunset: ")
+            }
+        }
+
         // RowLayout {
         ButtonGroup {
             id: backgroundGroup
@@ -513,12 +562,6 @@ ColumnLayout {
             }
         }
 
-        CheckBox {
-            id: dayNightCycleCheckBox
-            Kirigami.FormData.label: i18n("Day/Night Cycle:")
-            visible: root.currentTab === 1
-        }
-
         CheckBox {
             id: randomModeCheckbox
             Kirigami.FormData.label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Random order:")
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index 00b2075..1f1bfb9 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -42,29 +42,7 @@ WallpaperItem {
     }
     property int currentVideoIndex: 0
     property bool resumeLastVideo: main.configuration.ResumeLastVideo
-    property bool dayNightCycle: main.configuration.DayNightCycle
-    property bool isDay: {
-        const currentTime = new Date().getHours();
-        return currentTime >= 6 && currentTime < 19;
-    }
-
-    function getLastVideo() {
-        if (dayNightCycle) {
-            return main.configuration[isDay ? "LastVideoDay" : "LastVideoNight"];
-        }
-        return main.configuration.LastVideo;
-    }
-    function getLastVideoIndex() {
-        const lastVideo = getLastVideo();
-        for (let index = 0; index < videosConfig.length; index++) {
-            if (videosConfig[index].filename === lastVideo) {
-                return index;
-            }
-        }
-
-        return 0;
-    }
-
+    property alias isDay: dayNightCycleController.isDay
     property var currentSource: {
         const lastVideo = getLastVideo();
         if (resumeLastVideo && lastVideo !== "") {
@@ -220,7 +198,7 @@ WallpaperItem {
     }
 
     function getVideos() {
-        if (dayNightCycle) {
+        if (main.configuration.DayNightCycleEnabled) {
             return Utils.parseCompat(videoUrls).filter(video => {
                 const isDayCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Night;
                 const isNightCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Day;
@@ -231,6 +209,21 @@ WallpaperItem {
 
         return Utils.parseCompat(videoUrls).filter(video => video.enabled);
     }
+    function getLastVideo() {
+      if (main.configuration.DayNightCycleEnabled) {
+        return main.configuration[main.isDay ? "LastVideoDay" : "LastVideoNight"];
+      }
+      return main.configuration.LastVideo;
+    }
+    function getLastVideoIndex() {
+      const lastVideo = getLastVideo();
+      for (let index = 0; index < videosConfig.length; index++) {
+        if (videosConfig[index].filename === lastVideo) {
+          return index;
+        }
+      }
+      return 0;
+    }
 
     onPlayingChanged: {
         playing && !isLoading ? main.play() : main.pause();
@@ -293,42 +286,19 @@ WallpaperItem {
         }
     }
 
-    Timer {
-        id: dayNightCycleTimer
-        interval: 1000
-        running: true
-        repeat: true
-        triggeredOnStart: true
-        onTriggered: {
-            const dayNightCycleConfigChanged = dayNightCycle !== main.configuration.DayNightCycle;
-            if (!dayNightCycleConfigChanged && !main.configuration.DayNightCycle) {
-                return;
-            }
-            dayNightCycle = main.configuration.DayNightCycle;
-
-            const hours = new Date().getHours();
-            const isDay = hours >= 6 && hours < 19;
-
-            if ((main.isDay != isDay) || dayNightCycleConfigChanged) {
-                main.save();
-                main.isDay = isDay;
-                videosConfig = getVideos();
-
-                if (getLastVideo() === "") {
-                    setCurrentSource(0);
-                    return player.next();
-                }
-
-                currentVideoIndex = getLastVideoIndex();
-
-                if (main.configuration.ResumeLastVideo) {
-                    // TODO: Resume last (day/night) video when changing from day to night or vice versa
-                }
-
-                setCurrentSource(currentVideoIndex);
-
-                player.next();
-            }
+    DayNightCycleController {
+        id: dayNightCycleController
+        enabled: main.configuration.DayNightCycleEnabled
+        mode: main.configuration.DayNightCycleMode
+        sunriseTime: main.configuration.DayNightCycleSunriseTime
+        sunsetTime: main.configuration.DayNightCycleSunsetTime
+        isLoading: main.isLoading
+        onBeforeChanged: { main.save(); }
+        onChanged: {
+            videosConfig = getVideos();
+            currentVideoIndex = resumeLastVideo ? getLastVideoIndex() : 0;
+            setCurrentSource(currentVideoIndex);
+            player.next();
         }
     }
 
@@ -528,7 +498,6 @@ WallpaperItem {
 
     Component.onCompleted: {
         startTimer.start();
-        dayNightCycleTimer.start();
         Qt.callLater(() => {
             player.currentSource = Qt.binding(() => {
                 return main.currentSource;
@@ -540,7 +509,7 @@ WallpaperItem {
         // Save last video and position to resume from it on next login/lock
         main.configuration.LastVideo = main.currentSource.filename;
         main.configuration.LastVideoPosition = player.lastVideoPosition;
-        if(dayNightCycle) {
+        if (main.configuration.DayNightCycleEnabled) {
             main.configuration[main.isDay ? "LastVideoDay" : "LastVideoNight"] = main.currentSource.filename;
         }
         main.configuration.writeConfig();

From 1f57ef20c95ded4ec647699d97bb76754faf86c5 Mon Sep 17 00:00:00 2001
From: Luis Bocanegra <luisbocanegra@users.noreply.github.com>
Date: Fri, 13 Feb 2026 00:08:00 -0600
Subject: [PATCH 04/13] refactor: check dayNightCycleEnabled at runtime

---
 package/contents/config/main.xml |  4 ----
 package/contents/ui/config.qml   |  1 -
 package/contents/ui/main.qml     | 36 +++++++++++++++++++-------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/package/contents/config/main.xml b/package/contents/config/main.xml
index 9e85a87..35bb9f4 100644
--- a/package/contents/config/main.xml
+++ b/package/contents/config/main.xml
@@ -141,10 +141,6 @@
     <entry name="ChangeWallpaperTimerHours" type="Int">
       <default>0</default>
     </entry>
-    <entry name="DayNightCycleEnabled" type="Bool">
-      <label>Whether or not to cycle between day and night wallpapers</label>
-      <default>False</default>
-    </entry>
     <entry name="DayNightCycleMode" type="Int">
       <label>Mode</label>
       <default>0</default>
diff --git a/package/contents/ui/config.qml b/package/contents/ui/config.qml
index 4bbf5f7..77387b7 100644
--- a/package/contents/ui/config.qml
+++ b/package/contents/ui/config.qml
@@ -65,7 +65,6 @@ ColumnLayout {
     property real cfg_PlaybackRate
     property real cfg_AlternativePlaybackRate
     property alias cfg_Volume: volumeSlider.value
-    property bool cfg_DayNightCycleEnabled: dayNightCycleMode.currentValue !== Enum.DayNightCycleMode.Disabled
     property alias cfg_DayNightCycleMode: dayNightCycleMode.currentValue
     property alias cfg_DayNightCycleSunriseTime: dayNightCycleSunriseTime.value
     property alias cfg_DayNightCycleSunsetTime: dayNightCycleSunsetTime.value
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index 1f1bfb9..447f0c2 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -142,6 +142,7 @@ WallpaperItem {
     property int changeWallpaperTimerSeconds: main.configuration.ChangeWallpaperTimerSeconds
     property int changeWallpaperTimerMinutes: main.configuration.ChangeWallpaperTimerMinutes
     property int changeWallpaperTimerHours: main.configuration.ChangeWallpaperTimerHours
+    property bool dayNightCycleEnabled: main.configuration.DayNightCycleMode !== Enum.DayNightCycleMode.Disabled
     property bool muteAudio: {
         if (muteOverride === Enum.MuteOverride.Mute) {
             return true;
@@ -198,7 +199,7 @@ WallpaperItem {
     }
 
     function getVideos() {
-        if (main.configuration.DayNightCycleEnabled) {
+        if (dayNightCycleEnabled) {
             return Utils.parseCompat(videoUrls).filter(video => {
                 const isDayCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Night;
                 const isNightCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Day;
@@ -210,19 +211,19 @@ WallpaperItem {
         return Utils.parseCompat(videoUrls).filter(video => video.enabled);
     }
     function getLastVideo() {
-      if (main.configuration.DayNightCycleEnabled) {
-        return main.configuration[main.isDay ? "LastVideoDay" : "LastVideoNight"];
-      }
-      return main.configuration.LastVideo;
+        if (dayNightCycleEnabled) {
+            return main.configuration[main.isDay ? "LastVideoDay" : "LastVideoNight"];
+        }
+        return main.configuration.LastVideo;
     }
     function getLastVideoIndex() {
-      const lastVideo = getLastVideo();
-      for (let index = 0; index < videosConfig.length; index++) {
-        if (videosConfig[index].filename === lastVideo) {
-          return index;
+        const lastVideo = getLastVideo();
+        for (let index = 0; index < videosConfig.length; index++) {
+            if (videosConfig[index].filename === lastVideo) {
+                return index;
+            }
         }
-      }
-      return 0;
+        return 0;
     }
 
     onPlayingChanged: {
@@ -288,12 +289,14 @@ WallpaperItem {
 
     DayNightCycleController {
         id: dayNightCycleController
-        enabled: main.configuration.DayNightCycleEnabled
+        enabled: main.dayNightCycleEnabled
         mode: main.configuration.DayNightCycleMode
         sunriseTime: main.configuration.DayNightCycleSunriseTime
         sunsetTime: main.configuration.DayNightCycleSunsetTime
         isLoading: main.isLoading
-        onBeforeChanged: { main.save(); }
+        onBeforeChanged: {
+            main.save();
+        }
         onChanged: {
             videosConfig = getVideos();
             currentVideoIndex = resumeLastVideo ? getLastVideoIndex() : 0;
@@ -415,8 +418,11 @@ WallpaperItem {
                     text += `inLockScreen: ${main.lockScreenMode}\n`;
                     text += `screenLocked: ${main.screenLocked}\n`;
                     text += `showBlur: ${main.showBlur}\n`;
-                    text += `id: ${Plasmoid.id}\n`;
                     text += `Audio Device: ${player.player1.currentAudioDevice}`;
+                    text += `isDay: ${main.isDay}\n`;
+                    text += `dayNightCycleController.enabled: ${dayNightCycleController.enabled}\n`;
+                    text += `dayNightCycleController.mode: ${dayNightCycleController.mode}\n`;
+                    text += `id: ${Plasmoid.id}`;
                     return text;
                 }
             }
@@ -509,7 +515,7 @@ WallpaperItem {
         // Save last video and position to resume from it on next login/lock
         main.configuration.LastVideo = main.currentSource.filename;
         main.configuration.LastVideoPosition = player.lastVideoPosition;
-        if (main.configuration.DayNightCycleEnabled) {
+        if (dayNightCycleEnabled) {
             main.configuration[main.isDay ? "LastVideoDay" : "LastVideoNight"] = main.currentSource.filename;
         }
         main.configuration.writeConfig();

From 524e68785334b2636ff95879f35f32b06ef81196 Mon Sep 17 00:00:00 2001
From: Luis Bocanegra <luisbocanegra@users.noreply.github.com>
Date: Fri, 13 Feb 2026 20:51:05 -0600
Subject: [PATCH 05/13] style: qmlformat

---
 .../contents/ui/DayNightCycleController.qml   | 25 +++++++++++--------
 package/contents/ui/components/TimePicker.qml | 12 ++++-----
 package/contents/ui/main.qml                  |  4 +--
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/package/contents/ui/DayNightCycleController.qml b/package/contents/ui/DayNightCycleController.qml
index 3ff50d4..759ed32 100644
--- a/package/contents/ui/DayNightCycleController.qml
+++ b/package/contents/ui/DayNightCycleController.qml
@@ -11,22 +11,25 @@ Item {
     required property bool isLoading
 
     function detectDayTime(mode: int, sunriseTime: int, sunsetTime: int): bool {
-      switch (root.mode) {
+        switch (root.mode) {
         case Enum.DayNightCycleMode.Time:
-          const now = new Date();
-          const currentTime = now.getHours() * 60 + now.getMinutes();
-
-          return currentTime >= root.sunriseTime && currentTime < root.sunsetTime;
-        case Enum.DayNightCycleMode.PlasmaStyle: return Qt.styleHints.colorScheme === Qt.ColorScheme.Light;
-        case Enum.DayNightCycleMode.AlwaysNight: return false;
-        case Enum.DayNightCycleMode.AlwaysDay:   return true;
-      }
+            const now = new Date();
+            const currentTime = now.getHours() * 60 + now.getMinutes();
+
+            return currentTime >= root.sunriseTime && currentTime < root.sunsetTime;
+        case Enum.DayNightCycleMode.PlasmaStyle:
+            return Qt.styleHints.colorScheme === Qt.ColorScheme.Light;
+        case Enum.DayNightCycleMode.AlwaysNight:
+            return false;
+        case Enum.DayNightCycleMode.AlwaysDay:
+            return true;
+        }
     }
 
     property bool isDay: true
 
-    signal beforeChanged;
-    signal changed;
+    signal beforeChanged
+    signal changed
 
     Timer {
         id: timer
diff --git a/package/contents/ui/components/TimePicker.qml b/package/contents/ui/components/TimePicker.qml
index abb24df..e20256e 100644
--- a/package/contents/ui/components/TimePicker.qml
+++ b/package/contents/ui/components/TimePicker.qml
@@ -15,10 +15,10 @@ RowLayout {
         to: 23
         value: Math.floor(root.value / 60)
         editable: true
-        textFromValue: (value) => value.toString().padStart(2, '0')
-        valueFromText: (text) => parseInt(text, 10)
+        textFromValue: value => value.toString().padStart(2, '0')
+        valueFromText: text => parseInt(text, 10)
         onValueModified: {
-            root.value = hours.value * 60 + minutes.value
+            root.value = hours.value * 60 + minutes.value;
         }
     }
     SpinBox {
@@ -27,10 +27,10 @@ RowLayout {
         to: 59
         value: root.value % 60
         editable: true
-        textFromValue: (value) => value.toString().padStart(2, '0')
-        valueFromText: (text) => parseInt(text, 10)
+        textFromValue: value => value.toString().padStart(2, '0')
+        valueFromText: text => parseInt(text, 10)
         onValueModified: {
-            root.value = hours.value * 60 + minutes.value
+            root.value = hours.value * 60 + minutes.value;
         }
     }
 }
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index 447f0c2..d51e103 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -420,8 +420,8 @@ WallpaperItem {
                     text += `showBlur: ${main.showBlur}\n`;
                     text += `Audio Device: ${player.player1.currentAudioDevice}`;
                     text += `isDay: ${main.isDay}\n`;
-                    text += `dayNightCycleController.enabled: ${dayNightCycleController.enabled}\n`;
-                    text += `dayNightCycleController.mode: ${dayNightCycleController.mode}\n`;
+                    text += `dayNightCycleEnabled: ${main.dayNightCycleEnabled}\n`;
+                    text += `dayNightCycleMode: ${main.configuration.DayNightCycleMode}\n`;
                     text += `id: ${Plasmoid.id}`;
                     return text;
                 }

From 8e3600c58cf1822d1979d73a31f750cc04d17051 Mon Sep 17 00:00:00 2001
From: lobatolobato <felipelobato.rj@gmail.com>
Date: Sun, 1 Mar 2026 19:35:46 -0300
Subject: [PATCH 06/13] fix: keep wallpaper paused when changing cycles

---
 package/contents/ui/main.qml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index d51e103..98d909f 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -301,7 +301,12 @@ WallpaperItem {
             videosConfig = getVideos();
             currentVideoIndex = resumeLastVideo ? getLastVideoIndex() : 0;
             setCurrentSource(currentVideoIndex);
+
             player.next();
+
+            if (!main.playing) {
+                main.pause();
+            }
         }
     }
 

From bf5eb8ad50c810b7005a10bcd531d24454834b2f Mon Sep 17 00:00:00 2001
From: Luis Bocanegra <luisbocanegra@users.noreply.github.com>
Date: Fri, 6 Mar 2026 15:58:24 -0600
Subject: [PATCH 07/13] feat: KNightTime (aka Day-Night Cycle) support

---
 .clang-format                                 | 105 +++++++++++++++++
 .clangd                                       |   3 +
 .editorconfig                                 |  19 +++
 .gitignore                                    |   2 +
 CMakeLists.txt                                |   9 +-
 .../contents/ui/DayNightCycleController.qml   |  63 +++++-----
 package/contents/ui/NighttimeHelper.qml       |   9 ++
 package/contents/ui/config.qml                |  21 +++-
 package/contents/ui/main.qml                  |  48 ++++----
 plugin/CMakeLists.txt                         |  17 +++
 plugin/nighttime.cpp                          | 111 ++++++++++++++++++
 plugin/nighttime.h                            |  72 ++++++++++++
 plugin/nighttimeplugin.cpp                    |  19 +++
 plugin/qmldir                                 |   2 +
 14 files changed, 443 insertions(+), 57 deletions(-)
 create mode 100644 .clang-format
 create mode 100644 .clangd
 create mode 100644 .editorconfig
 create mode 100644 package/contents/ui/NighttimeHelper.qml
 create mode 100644 plugin/CMakeLists.txt
 create mode 100644 plugin/nighttime.cpp
 create mode 100644 plugin/nighttime.h
 create mode 100644 plugin/nighttimeplugin.cpp
 create mode 100644 plugin/qmldir

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..978b6de
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,105 @@
+---
+# SPDX-FileCopyrightText: 2019 Christoph Cullmann <cullmann@kde.org>
+# SPDX-FileCopyrightText: 2019 Gernot Gebhard <gebhard@absint.com>
+#
+# SPDX-License-Identifier: MIT
+
+# This file got automatically created by ECM, do not edit
+# See https://clang.llvm.org/docs/ClangFormatStyleOptions.html for the config options
+# and https://community.kde.org/Policies/Frameworks_Coding_Style#Clang-format_automatic_code_formatting
+# for clang-format tips & tricks
+---
+Language: JavaScript
+DisableFormat: true
+---
+Language: Json
+DisableFormat: false
+IndentWidth: 4
+---
+# Style for C++
+Language: Cpp
+
+# base is WebKit coding style: https://webkit.org/code-style-guidelines/
+# below are only things set that diverge from this style!
+BasedOnStyle: WebKit
+
+# enforce C++11 (e.g. for std::vector<std::vector<lala>>
+Standard: Cpp11
+
+# 4 spaces indent
+TabWidth: 4
+
+# 2 * 80 wide lines
+ColumnLimit: 160
+
+# sort includes inside line separated groups
+SortIncludes: true
+
+# break before braces on function, namespace and class definitions.
+BreakBeforeBraces: Linux
+
+# CrlInstruction *a;
+PointerAlignment: Right
+
+# horizontally aligns arguments after an open bracket.
+AlignAfterOpenBracket: Align
+
+# don't move all parameters to new line
+AllowAllParametersOfDeclarationOnNextLine: false
+
+# no single line functions
+AllowShortFunctionsOnASingleLine: None
+
+# no single line enums
+AllowShortEnumsOnASingleLine: false
+
+# always break before you encounter multi line strings
+AlwaysBreakBeforeMultilineStrings: true
+
+# don't move arguments to own lines if they are not all on the same
+BinPackArguments: false
+
+# don't move parameters to own lines if they are not all on the same
+BinPackParameters: false
+
+# In case we have an if statement with multiple lines the operator should be at the beginning of the line
+# but we do not want to break assignments
+BreakBeforeBinaryOperators: NonAssignment
+
+# format C++11 braced lists like function calls
+Cpp11BracedListStyle: true
+
+# do not put a space before C++11 braced lists
+SpaceBeforeCpp11BracedList: false
+
+# remove empty lines
+KeepEmptyLinesAtTheStartOfBlocks: false
+
+# no namespace indentation to keep indent level low
+NamespaceIndentation: None
+
+# we use template< without space.
+SpaceAfterTemplateKeyword: false
+
+# Always break after template declaration
+AlwaysBreakTemplateDeclarations: true
+
+# macros for which the opening brace stays attached.
+ForEachMacros:
+    [
+        foreach,
+        Q_FOREACH,
+        BOOST_FOREACH,
+        forever,
+        Q_FOREVER,
+        QBENCHMARK,
+        QBENCHMARK_ONCE,
+        wl_resource_for_each,
+        wl_resource_for_each_safe,
+    ]
+
+# keep lambda formatting multi-line if not empty
+AllowShortLambdasOnASingleLine: Empty
+
+# We do not want clang-format to put all arguments on a new line
+AllowAllArgumentsOnNextLine: false
diff --git a/.clangd b/.clangd
new file mode 100644
index 0000000..dddeaef
--- /dev/null
+++ b/.clangd
@@ -0,0 +1,3 @@
+CompileFlags:
+  Remove:
+    - -mno-direct-extern-access
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..f274f1b
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.xml*]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index 5dbff67..46d2466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ build/
 playground
 *.mo
 *.tar.gz
+.cache/
+compile_commands.json
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 376f56a..568bce7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 project("plasma-smart-video-wallpaper-reborn")
+option(BUILD_PLUGIN "Build the plugin" ON)
 option(INSTALL_WALLPAPER "Install wallpaper" ON)
 option(PACKAGE_WALLPAPER "Package wallpaper" OFF)
 
@@ -7,7 +8,9 @@ set(PROJECT_DEP_VERSION "6.0.0")
 set(QT_MIN_VERSION "6.6.0")
 set(KF6_MIN_VERSION "6.0.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.85")
-
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
 find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
@@ -54,3 +57,7 @@ if(PACKAGE_WALLPAPER)
 
     add_dependencies(wallpaper translations)
 endif()
+
+if(BUILD_PLUGIN)
+    add_subdirectory(plugin)
+endif()
diff --git a/package/contents/ui/DayNightCycleController.qml b/package/contents/ui/DayNightCycleController.qml
index 759ed32..3ea9923 100644
--- a/package/contents/ui/DayNightCycleController.qml
+++ b/package/contents/ui/DayNightCycleController.qml
@@ -8,55 +8,58 @@ Item {
     required property int sunriseTime
     required property int sunsetTime
 
-    required property bool isLoading
+    property var dayNightPlugin: null
+    property Item dayNightPluginDay: null
+    property int currentTime
 
-    function detectDayTime(mode: int, sunriseTime: int, sunsetTime: int): bool {
-        switch (root.mode) {
+    property bool isDay: {
+        let day = false;
+        switch (mode) {
         case Enum.DayNightCycleMode.Time:
-            const now = new Date();
-            const currentTime = now.getHours() * 60 + now.getMinutes();
-
-            return currentTime >= root.sunriseTime && currentTime < root.sunsetTime;
+            if (dayNightPlugin) {
+                day = dayNightPlugin.isDay;
+                break;
+            }
+            day = currentTime >= root.sunriseTime && currentTime < root.sunsetTime;
+            break;
         case Enum.DayNightCycleMode.PlasmaStyle:
-            return Qt.styleHints.colorScheme === Qt.ColorScheme.Light;
+            day = Qt.styleHints.colorScheme === Qt.ColorScheme.Light;
+            break;
         case Enum.DayNightCycleMode.AlwaysNight:
-            return false;
+            day = false;
+            break;
         case Enum.DayNightCycleMode.AlwaysDay:
-            return true;
+            day = true;
+            break;
+        default:
+            day = false;
+            break;
         }
+        return day;
     }
 
-    property bool isDay: true
-
-    signal beforeChanged
-    signal changed
+    onIsDayChanged: console.log("isDayChanged", isDay)
 
     Timer {
         id: timer
         interval: 1000
-        running: true
+        running: root.mode === Enum.DayNightCycleMode.Time && root.dayNightPlugin === null
         repeat: true
         triggeredOnStart: true
         property bool prevEnabled: root.enabled
         onTriggered: {
-            const enableChanged = timer.prevEnabled !== root.enabled;
-            if ((!enableChanged && !root.enabled) || root.isLoading) {
-                return;
-            }
-            timer.prevEnabled = root.enabled;
-
-            const isDay = root.detectDayTime(root.mode, root.sunriseTime, root.sunsetTime);
-
-            if ((root.isDay != isDay) || enableChanged) {
-                root.beforeChanged();
-                root.isDay = isDay;
-                root.changed();
-            }
+            const now = new Date();
+            root.currentTime = now.getHours() * 60 + now.getMinutes();
         }
     }
 
     Component.onCompleted: {
-        root.isDay = root.detectDayTime(root.mode, root.sunriseTime, root.sunsetTime);
-        timer.start();
+        let component = null;
+        component = Qt.createComponent("NighttimeHelper.qml");
+        if (component.status === Component.Ready) {
+            dayNightPlugin = component.createObject(root);
+        } else {
+            console.warn(component.errorString());
+        }
     }
 }
diff --git a/package/contents/ui/NighttimeHelper.qml b/package/contents/ui/NighttimeHelper.qml
new file mode 100644
index 0000000..33fc5b8
--- /dev/null
+++ b/package/contents/ui/NighttimeHelper.qml
@@ -0,0 +1,9 @@
+import QtQuick
+import com.github.luisbocanegra.svwr.nighttime 1.0
+
+Item {
+    property alias isDay: dayNight.isDay
+    DayNight {
+        id: dayNight
+    }
+}
diff --git a/package/contents/ui/config.qml b/package/contents/ui/config.qml
index 77387b7..566900d 100644
--- a/package/contents/ui/config.qml
+++ b/package/contents/ui/config.qml
@@ -23,6 +23,8 @@ import QtQuick.Controls
 import QtQuick.Dialogs
 import QtQuick.Layouts
 import QtMultimedia
+import org.kde.config as KConfig
+import org.kde.kcmutils as KCM
 import org.kde.kirigami as Kirigami
 import org.kde.kquickcontrols 2.0 as KQuickControls
 import "code/enum.js" as Enum
@@ -82,6 +84,7 @@ ColumnLayout {
     property alias cfg_MuteMode: muteModeCombo.currentValue
     property int editingIndex: -1
     property var validDropExtensions: [".mp4", ".mpg", ".ogg", ".mov", ".webm", ".flv", ".mkv", ".avi", ".wmv", ".gif"]
+    property var dayNightPlugin: null
 
     readonly property int seconds: (wallpaperTimerHours.value * 60 * 60) + (wallpaperTimerMinutes.value * 60) + wallpaperTimerSeconds.value
 
@@ -227,6 +230,11 @@ ColumnLayout {
     Component.onCompleted: {
         videosModel.initModel(cfg_VideoUrls);
         getAudioDevicesModel();
+        try {
+            dayNightPlugin = Qt.createQmlObject("import com.github.luisbocanegra.svwr.nighttime 1.0; DayNight {}", root);
+        } catch (e) {
+            console.warn("QML Plugin com.github.luisbocanegra.svwr.nighttime not found, will use fixed times");
+        }
     }
 
     Kirigami.FormLayout {
@@ -360,7 +368,7 @@ ColumnLayout {
         }
 
         RowLayout {
-            Kirigami.FormData.label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Day-Night Cycle:")
+            Kirigami.FormData.label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Day/Night Switch:")
             visible: root.currentTab === 0
 
             ComboBox {
@@ -371,7 +379,7 @@ ColumnLayout {
                         value: Enum.DayNightCycleMode.Disabled
                     },
                     {
-                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Based on time"),
+                        text: root.dayNightPlugin !== null ? i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Day-Night Cycle") : i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Based on time"),
                         value: Enum.DayNightCycleMode.Time
                     },
                     {
@@ -390,9 +398,16 @@ ColumnLayout {
                 textRole: "text"
                 valueRole: "value"
             }
+            Button {
+                visible: root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.Time && root.dayNightPlugin !== null
+                enabled: KConfig.KAuthorized.authorizeControlModule("kcm_nighttime")
+                text: i18nc("@action:button Configure day-night cycle times", "Configure…")
+                icon.name: "configure"
+                onClicked: KCM.KCMLauncher.open("kcm_nighttime")
+            }
         }
         ColumnLayout {
-            visible: root.currentTab === 0
+            visible: root.currentTab === 0 && root.dayNightPlugin === null && root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.Time
             enabled: dayNightCycleMode.currentValue === Enum.DayNightCycleMode.Time
             Components.TimePicker {
                 id: dayNightCycleSunriseTime
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index 98d909f..6907f21 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -43,13 +43,7 @@ WallpaperItem {
     property int currentVideoIndex: 0
     property bool resumeLastVideo: main.configuration.ResumeLastVideo
     property alias isDay: dayNightCycleController.isDay
-    property var currentSource: {
-        const lastVideo = getLastVideo();
-        if (resumeLastVideo && lastVideo !== "") {
-            return Utils.getVideoByFile(lastVideo, videosConfig);
-        }
-        return Utils.getVideoByIndex(currentVideoIndex, videosConfig);
-    }
+    property var currentSource: Utils.createVideo("")
     property int pauseBatteryLevel: main.configuration.PauseBatteryLevel
     property bool shouldPlay: {
         if (lockScreenMode) {
@@ -287,25 +281,32 @@ WallpaperItem {
         }
     }
 
+    onCurrentSourceChanged: syncConfig()
+
     DayNightCycleController {
         id: dayNightCycleController
         enabled: main.dayNightCycleEnabled
         mode: main.configuration.DayNightCycleMode
         sunriseTime: main.configuration.DayNightCycleSunriseTime
         sunsetTime: main.configuration.DayNightCycleSunsetTime
-        isLoading: main.isLoading
-        onBeforeChanged: {
-            main.save();
-        }
-        onChanged: {
+        onIsDayChanged: {
+            if (main.isLoading) {
+                return;
+            }
+            const wasPlaying = player.player.playing;
             videosConfig = getVideos();
-            currentVideoIndex = resumeLastVideo ? getLastVideoIndex() : 0;
-            setCurrentSource(currentVideoIndex);
-
-            player.next();
-
-            if (!main.playing) {
-                main.pause();
+            if (videosConfig.length == 0) {
+                main.stop();
+                main.currentSource.filename = "";
+            } else {
+                currentVideoIndex = resumeLastVideo ? getLastVideoIndex() : 0;
+                setCurrentSource(currentVideoIndex);
+                player.next(true, true);
+                if (!wasPlaying) {
+                    // FIXME pause is delayed to avoid black screen
+                    // maybe there is a way to display the first frame
+                    Utils.delay(150, main.pause, main);
+                }
             }
         }
     }
@@ -510,27 +511,28 @@ WallpaperItem {
     Component.onCompleted: {
         startTimer.start();
         Qt.callLater(() => {
+            currentVideoIndex = resumeLastVideo ? getLastVideoIndex() : 0;
+            setCurrentSource(currentVideoIndex);
             player.currentSource = Qt.binding(() => {
                 return main.currentSource;
             });
         });
     }
 
-    function save() {
+    function syncConfig() {
         // Save last video and position to resume from it on next login/lock
         main.configuration.LastVideo = main.currentSource.filename;
         main.configuration.LastVideoPosition = player.lastVideoPosition;
         if (dayNightCycleEnabled) {
             main.configuration[main.isDay ? "LastVideoDay" : "LastVideoNight"] = main.currentSource.filename;
         }
-        main.configuration.writeConfig();
-        printLog("Bye!");
     }
 
     Connections {
         target: Qt.application
         function onAboutToQuit() {
-            main.save();
+            syncConfig();
+            main.configuration.writeConfig();
         }
     }
     Item {
diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
new file mode 100644
index 0000000..6cbad6c
--- /dev/null
+++ b/plugin/CMakeLists.txt
@@ -0,0 +1,17 @@
+set(PLUGIN_NAME "nighttimeplugin")
+set(LIB_NAME "nighttime")
+
+add_library(${PLUGIN_NAME} SHARED ${PLUGIN_NAME}.cpp ${LIB_NAME}.cpp)
+find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Qml Gui)
+find_package(KNightTime ${PROJECT_DEP_VERSION} CONFIG REQUIRED)
+find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS KCMUtils)
+
+target_link_libraries(${PLUGIN_NAME}
+    Qt6::Qml
+    Qt6::Gui
+    KF6::KCMUtils
+    KNightTime
+)
+
+install(TARGETS ${PLUGIN_NAME} DESTINATION ${KDE_INSTALL_QMLDIR}/com/github/luisbocanegra/svwr/${LIB_NAME})
+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/com/github/luisbocanegra/svwr/${LIB_NAME})
diff --git a/plugin/nighttime.cpp b/plugin/nighttime.cpp
new file mode 100644
index 0000000..ecb9b6d
--- /dev/null
+++ b/plugin/nighttime.cpp
@@ -0,0 +1,111 @@
+/*
+    SPDX-FileCopyrightText: 2025 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+    SPDX-FileCopyrightText: 2026 Luis Bocanegra <luisbocanegra17b@gmail.com>
+
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#include "nighttime.h"
+
+DayNightPhase::DayNightPhase()
+    : m_kind(Night)
+{
+}
+
+DayNightPhase::DayNightPhase(Kind kind)
+    : m_kind(kind)
+{
+}
+
+static int positiveMod(int m, int n)
+{
+    return (n + (m % n)) % n;
+}
+
+DayNightPhase DayNightPhase::previous() const
+{
+    return {Kind(positiveMod(int(m_kind) - 1, 4))};
+}
+
+DayNightPhase DayNightPhase::next() const
+{
+    return {Kind(positiveMod(int(m_kind) + 1, 4))};
+}
+
+DayNightPhase DayNightPhase::from(KDarkLightTransition::Type type)
+{
+    switch (type) {
+    case KDarkLightTransition::Morning:
+        return Kind::Sunrise;
+    case KDarkLightTransition::Evening:
+        return Kind::Sunset;
+    }
+
+    Q_UNREACHABLE();
+}
+
+DayNightPhase DayNightPhase::from(const QDateTime &dateTime, const KDarkLightTransition &previousTransition, const KDarkLightTransition &nextTransition)
+{
+    const DayNightPhase previousPhase = from(previousTransition.type());
+    switch (previousTransition.test(dateTime)) {
+    case KDarkLightTransition::Upcoming:
+        return previousPhase.previous();
+    case KDarkLightTransition::InProgress:
+        return previousPhase;
+    case KDarkLightTransition::Passed:
+        break;
+    }
+
+    const DayNightPhase nextPhase = from(nextTransition.type());
+    switch (nextTransition.test(dateTime)) {
+    case KDarkLightTransition::Upcoming:
+        return nextPhase.previous();
+    case KDarkLightTransition::InProgress:
+        return nextPhase;
+    case KDarkLightTransition::Passed:
+        return nextPhase.next();
+    }
+
+    Q_UNREACHABLE();
+}
+
+DayNight::DayNight(QObject *parent)
+    : QObject(parent)
+    , m_systemClockMonitor(new KSystemClockSkewNotifier(this))
+    , m_rescheduleTimer(new QTimer(this))
+{
+    provider = new KDarkLightScheduleProvider();
+    QObject::connect(provider, &KDarkLightScheduleProvider::scheduleChanged, this, &DayNight::schedule);
+    m_systemClockMonitor->setActive(true);
+    connect(m_systemClockMonitor, &KSystemClockSkewNotifier::skewed, this, &DayNight::schedule);
+    m_rescheduleTimer->setSingleShot(true);
+    connect(m_rescheduleTimer, &QTimer::timeout, this, &DayNight::schedule);
+    schedule();
+}
+
+DayNight::~DayNight() = default;
+
+bool DayNight::isDay() const
+{
+    return m_isDay;
+}
+
+void DayNight::schedule()
+{
+    qDebug() << "Updating day/night status...";
+    const QDateTime now = QDateTime::currentDateTime();
+    const KDarkLightSchedule schedule = provider->schedule();
+    const KDarkLightTransition previousTransition = *schedule.previousTransition(now);
+    const KDarkLightTransition nextTransition = *schedule.nextTransition(now);
+    qDebug() << "Previous transition:" << previousTransition.type() << previousTransition.endDateTime();
+    qDebug() << "Next transition:" << nextTransition.type() << nextTransition.startDateTime();
+    const DayNightPhase phase = DayNightPhase::from(now, previousTransition, nextTransition);
+    qDebug() << "Current phase:" << int(phase);
+    const bool isDay = phase == DayNightPhase::Day || phase == DayNightPhase::Sunrise;
+    qDebug() << "Is it day?" << isDay;
+    if (m_isDay != isDay) {
+        m_isDay = isDay;
+        emit isDayChanged(isDay);
+    }
+    m_rescheduleTimer->start(now.msecsTo(nextTransition.startDateTime()));
+}
diff --git a/plugin/nighttime.h b/plugin/nighttime.h
new file mode 100644
index 0000000..3e96b08
--- /dev/null
+++ b/plugin/nighttime.h
@@ -0,0 +1,72 @@
+/*
+    SPDX-FileCopyrightText: 2025 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+    SPDX-FileCopyrightText: 2026 Luis Bocanegra <luisbocanegra17b@gmail.com>
+
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#ifndef NIGHTTIME_H
+#define NIGHTTIME_H
+
+#pragma once
+#include <KDarkLightScheduleProvider>
+#include <KSystemClockSkewNotifier>
+#include <QObject>
+#include <QTimer>
+
+class DayNightPhase
+{
+public:
+    enum Kind {
+        Night,
+        Sunrise,
+        Day,
+        Sunset,
+    };
+
+    DayNightPhase();
+    DayNightPhase(Kind kind);
+
+    operator Kind() const;
+
+    DayNightPhase previous() const;
+    DayNightPhase next() const;
+
+    static DayNightPhase from(KDarkLightTransition::Type type);
+    static DayNightPhase from(const QDateTime &dateTime, const KDarkLightTransition &previousTransition, const KDarkLightTransition &nextTransition);
+
+private:
+    Kind m_kind;
+};
+
+inline DayNightPhase::operator DayNightPhase::Kind() const
+{
+    return m_kind;
+}
+
+class DayNight : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool isDay READ isDay NOTIFY isDayChanged)
+
+public:
+    explicit DayNight(QObject *parent = nullptr);
+
+    bool isDay() const;
+
+    ~DayNight() override;
+
+signals:
+
+    void isDayChanged(bool isDay);
+
+private:
+    void schedule();
+
+    KDarkLightScheduleProvider *provider = nullptr;
+    KSystemClockSkewNotifier *m_systemClockMonitor;
+    QTimer *m_rescheduleTimer;
+    bool m_isDay = false;
+};
+
+#endif
diff --git a/plugin/nighttimeplugin.cpp b/plugin/nighttimeplugin.cpp
new file mode 100644
index 0000000..04f72df
--- /dev/null
+++ b/plugin/nighttimeplugin.cpp
@@ -0,0 +1,19 @@
+#include "nighttime.h"
+
+#include <QGuiApplication>
+#include <QQmlEngine>
+#include <QQmlExtensionPlugin>
+
+class DayNightPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri) override
+    {
+        qmlRegisterType<DayNight>(uri, 1, 0, "DayNight");
+    }
+};
+
+#include "nighttimeplugin.moc"
diff --git a/plugin/qmldir b/plugin/qmldir
new file mode 100644
index 0000000..2ba7874
--- /dev/null
+++ b/plugin/qmldir
@@ -0,0 +1,2 @@
+module com.github.luisbocanegra.svwr.nighttime
+plugin nighttimeplugin

From a283d6108eea852222a805012c53aca30b7b70d4 Mon Sep 17 00:00:00 2001
From: lobatolobato <felipelobato.rj@gmail.com>
Date: Thu, 26 Mar 2026 12:55:58 -0300
Subject: [PATCH 08/13] feat: detect plasma style based on background color
 'lightness'

---
 package/contents/ui/DayNightCycleController.qml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/contents/ui/DayNightCycleController.qml b/package/contents/ui/DayNightCycleController.qml
index 3ea9923..2d74ac8 100644
--- a/package/contents/ui/DayNightCycleController.qml
+++ b/package/contents/ui/DayNightCycleController.qml
@@ -1,4 +1,6 @@
 import QtQuick
+import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import "code/enum.js" as Enum
 
 Item {
@@ -23,7 +25,8 @@ Item {
             day = currentTime >= root.sunriseTime && currentTime < root.sunsetTime;
             break;
         case Enum.DayNightCycleMode.PlasmaStyle:
-            day = Qt.styleHints.colorScheme === Qt.ColorScheme.Light;
+            const targetColor = (palette && palette.window) ? palette.window : Kirigami.Theme.backgroundColor;
+            day = Qt.rgba(targetColor.r, targetColor.g, targetColor.b, targetColor.a).hslLightness > 0.75;
             break;
         case Enum.DayNightCycleMode.AlwaysNight:
             day = false;

From 8dc7daf499ffc726516081b3fa3262178790e44d Mon Sep 17 00:00:00 2001
From: Felipe Lobato <felipelobato.rj@gmail.com>
Date: Fri, 27 Mar 2026 01:09:21 -0300
Subject: [PATCH 09/13] refactor: remove unused import

Co-authored-by: Luis Bocanegra <luisbocanegra@users.noreply.github.com>
---
 package/contents/ui/DayNightCycleController.qml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/contents/ui/DayNightCycleController.qml b/package/contents/ui/DayNightCycleController.qml
index 2d74ac8..8549090 100644
--- a/package/contents/ui/DayNightCycleController.qml
+++ b/package/contents/ui/DayNightCycleController.qml
@@ -1,5 +1,4 @@
 import QtQuick
-import org.kde.plasma.core as PlasmaCore
 import org.kde.kirigami as Kirigami
 import "code/enum.js" as Enum
 

From d0a5518d34602d606387ac2f2435632ae7c77151 Mon Sep 17 00:00:00 2001
From: Luis Bocanegra <luisbocanegra@users.noreply.github.com>
Date: Sat, 18 Apr 2026 08:08:41 -0600
Subject: [PATCH 10/13] refactor: follow orginal wallpapers/image
 implementation

* switch now happens after the sunrise/sunset transition
---
 package/contents/config/main.xml              |  4 +
 .../contents/ui/DayNightCycleController.qml   | 10 +-
 package/contents/ui/NighttimeHelper.qml       |  2 +
 plugin/nighttime.cpp                          | 91 +++++++++++++++----
 plugin/nighttime.h                            | 29 +++++-
 5 files changed, 113 insertions(+), 23 deletions(-)

diff --git a/package/contents/config/main.xml b/package/contents/config/main.xml
index 35bb9f4..1d70040 100644
--- a/package/contents/config/main.xml
+++ b/package/contents/config/main.xml
@@ -176,5 +176,9 @@
     <entry name="AlternativePlaybackRate" type="Double">
       <default>0.5</default>
     </entry>
+    <entry name="DarkLightScheduleState" type="String">
+      <label>Saved dark light schedule state</label>
+      <default></default>
+    </entry>
   </group>
 </kcfg>
diff --git a/package/contents/ui/DayNightCycleController.qml b/package/contents/ui/DayNightCycleController.qml
index 8549090..7ed8c0f 100644
--- a/package/contents/ui/DayNightCycleController.qml
+++ b/package/contents/ui/DayNightCycleController.qml
@@ -10,7 +10,6 @@ Item {
     required property int sunsetTime
 
     property var dayNightPlugin: null
-    property Item dayNightPluginDay: null
     property int currentTime
 
     property bool isDay: {
@@ -40,8 +39,6 @@ Item {
         return day;
     }
 
-    onIsDayChanged: console.log("isDayChanged", isDay)
-
     Timer {
         id: timer
         interval: 1000
@@ -60,6 +57,13 @@ Item {
         component = Qt.createComponent("NighttimeHelper.qml");
         if (component.status === Component.Ready) {
             dayNightPlugin = component.createObject(root);
+            dayNightPlugin.initialState = configuration.DarkLightScheduleState;
+            dayNightPlugin.stateChanged.connect(() => {
+                if (configuration.DarkLightScheduleState != dayNightPlugin.state) {
+                    configuration.DarkLightScheduleState = dayNightPlugin.state;
+                    configuration.writeConfig();
+                }
+            });
         } else {
             console.warn(component.errorString());
         }
diff --git a/package/contents/ui/NighttimeHelper.qml b/package/contents/ui/NighttimeHelper.qml
index 33fc5b8..1c70d2e 100644
--- a/package/contents/ui/NighttimeHelper.qml
+++ b/package/contents/ui/NighttimeHelper.qml
@@ -3,6 +3,8 @@ import com.github.luisbocanegra.svwr.nighttime 1.0
 
 Item {
     property alias isDay: dayNight.isDay
+    property alias initialState: dayNight.initialState
+    property alias state: dayNight.state
     DayNight {
         id: dayNight
     }
diff --git a/plugin/nighttime.cpp b/plugin/nighttime.cpp
index ecb9b6d..7b84f8a 100644
--- a/plugin/nighttime.cpp
+++ b/plugin/nighttime.cpp
@@ -73,39 +73,96 @@ DayNight::DayNight(QObject *parent)
     : QObject(parent)
     , m_systemClockMonitor(new KSystemClockSkewNotifier(this))
     , m_rescheduleTimer(new QTimer(this))
+    , m_transitionUpdateTimer(new QTimer(this))
 {
-    provider = new KDarkLightScheduleProvider();
-    QObject::connect(provider, &KDarkLightScheduleProvider::scheduleChanged, this, &DayNight::schedule);
+    m_transitionUpdateTimer->setSingleShot(true);
+    connect(m_transitionUpdateTimer, &QTimer::timeout, this, &DayNight::update);
+
     m_systemClockMonitor->setActive(true);
     connect(m_systemClockMonitor, &KSystemClockSkewNotifier::skewed, this, &DayNight::schedule);
+
     m_rescheduleTimer->setSingleShot(true);
     connect(m_rescheduleTimer, &QTimer::timeout, this, &DayNight::schedule);
-    schedule();
 }
 
-DayNight::~DayNight() = default;
+void DayNight::classBegin()
+{
+}
 
-bool DayNight::isDay() const
+void DayNight::componentComplete()
 {
-    return m_isDay;
+    m_darkLightScheduleProvider = new KDarkLightScheduleProvider(m_initialState, this);
+    connect(m_darkLightScheduleProvider, &KDarkLightScheduleProvider::scheduleChanged, this, [this]() {
+        setState(m_darkLightScheduleProvider->state());
+        schedule();
+    });
 }
 
 void DayNight::schedule()
 {
-    qDebug() << "Updating day/night status...";
     const QDateTime now = QDateTime::currentDateTime();
-    const KDarkLightSchedule schedule = provider->schedule();
-    const KDarkLightTransition previousTransition = *schedule.previousTransition(now);
-    const KDarkLightTransition nextTransition = *schedule.nextTransition(now);
-    qDebug() << "Previous transition:" << previousTransition.type() << previousTransition.endDateTime();
-    qDebug() << "Next transition:" << nextTransition.type() << nextTransition.startDateTime();
-    const DayNightPhase phase = DayNightPhase::from(now, previousTransition, nextTransition);
-    qDebug() << "Current phase:" << int(phase);
-    const bool isDay = phase == DayNightPhase::Day || phase == DayNightPhase::Sunrise;
-    qDebug() << "Is it day?" << isDay;
+    const KDarkLightSchedule schedule = m_darkLightScheduleProvider->schedule();
+
+    m_previousTransition = *schedule.previousTransition(now);
+    m_nextTransition = *schedule.nextTransition(now);
+
+    m_rescheduleTimer->start(now.msecsTo(m_nextTransition.startDateTime()));
+    update();
+}
+
+void DayNight::update()
+{
+    const QDateTime now = QDateTime::currentDateTime();
+
+    DayNightPhase phase = DayNightPhase::from(now, m_previousTransition, m_nextTransition);
+
+    const bool isDay = phase == DayNightPhase::Day || phase == DayNightPhase::Sunset;
+
     if (m_isDay != isDay) {
         m_isDay = isDay;
         emit isDayChanged(isDay);
     }
-    m_rescheduleTimer->start(now.msecsTo(nextTransition.startDateTime()));
+
+    const int blendInterval = 60000;
+    switch (phase) {
+    case DayNightPhase::Night:
+    case DayNightPhase::Day:
+        m_transitionUpdateTimer->stop();
+        break;
+    case DayNightPhase::Sunrise:
+    case DayNightPhase::Sunset:
+        m_transitionUpdateTimer->start(blendInterval);
+        break;
+    }
+}
+
+void DayNight::setInitialState(const QString &state)
+{
+    if (m_initialState != state) {
+        m_initialState = state;
+        Q_EMIT initialStateChanged();
+    }
+}
+
+void DayNight::setState(const QString &state)
+{
+    if (m_state != state) {
+        m_state = state;
+        Q_EMIT stateChanged();
+    }
+}
+
+bool DayNight::isDay() const
+{
+    return m_isDay;
+}
+
+QString DayNight::initialState() const
+{
+    return m_initialState;
+}
+
+QString DayNight::state() const
+{
+    return m_state;
 }
diff --git a/plugin/nighttime.h b/plugin/nighttime.h
index 3e96b08..ef4255a 100644
--- a/plugin/nighttime.h
+++ b/plugin/nighttime.h
@@ -12,7 +12,9 @@
 #include <KDarkLightScheduleProvider>
 #include <KSystemClockSkewNotifier>
 #include <QObject>
+#include <QQmlParserStatus>
 #include <QTimer>
+#include <qqmlintegration.h>
 
 class DayNightPhase
 {
@@ -44,28 +46,49 @@ inline DayNightPhase::operator DayNightPhase::Kind() const
     return m_kind;
 }
 
-class DayNight : public QObject
+class DayNight : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
+    QML_ELEMENT
+
     Q_PROPERTY(bool isDay READ isDay NOTIFY isDayChanged)
+    Q_PROPERTY(QString initialState READ initialState WRITE setInitialState NOTIFY initialStateChanged)
+    Q_PROPERTY(QString state READ state NOTIFY stateChanged)
 
 public:
     explicit DayNight(QObject *parent = nullptr);
 
+    void classBegin() override;
+    void componentComplete() override;
+
     bool isDay() const;
 
-    ~DayNight() override;
+    QString initialState() const;
+    void setInitialState(const QString &state);
+
+    QString state() const;
+    void setState(const QString &state);
 
 signals:
 
     void isDayChanged(bool isDay);
+    void initialStateChanged();
+    void stateChanged();
 
 private:
     void schedule();
+    void update();
 
-    KDarkLightScheduleProvider *provider = nullptr;
+    KDarkLightScheduleProvider *m_darkLightScheduleProvider = nullptr;
     KSystemClockSkewNotifier *m_systemClockMonitor;
+    KDarkLightTransition m_previousTransition;
+    KDarkLightTransition m_nextTransition;
     QTimer *m_rescheduleTimer;
+    QTimer *m_transitionUpdateTimer;
+    QString m_initialState;
+    QString m_state;
+
     bool m_isDay = false;
 };
 

From dd62949794c8991970fe61fd5f8852a1a471454f Mon Sep 17 00:00:00 2001
From: Luis Bocanegra <luisbocanegra@users.noreply.github.com>
Date: Sat, 25 Apr 2026 01:50:03 -0600
Subject: [PATCH 11/13] fix: videos not updating when day/night and order
 changes

Also when the order changes now it keeps playing the current video, if the current video is moved, the next one will be the one in the updated list
---
 package/contents/ui/VideoPlayer.qml |   3 +
 package/contents/ui/code/utils.js   |  82 ++++++---
 package/contents/ui/main.qml        | 275 ++++++++++++++++------------
 3 files changed, 219 insertions(+), 141 deletions(-)

diff --git a/package/contents/ui/VideoPlayer.qml b/package/contents/ui/VideoPlayer.qml
index 3e88c25..5e1726a 100644
--- a/package/contents/ui/VideoPlayer.qml
+++ b/package/contents/ui/VideoPlayer.qml
@@ -1,9 +1,12 @@
 import QtQuick
 import QtMultimedia
 import Qt5Compat.GraphicalEffects
+import "code/utils.js" as Utils
+import "code/enum.js" as Enum
 
 Item {
     id: root
+    property var playerSource: Utils.createVideo("")
     property real volume: 1.0
     property int actualDuration: player.duration / playbackRate
     property int fillBlurRadius: 32
diff --git a/package/contents/ui/code/utils.js b/package/contents/ui/code/utils.js
index 8a4623b..a97ea6b 100644
--- a/package/contents/ui/code/utils.js
+++ b/package/contents/ui/code/utils.js
@@ -19,38 +19,73 @@ function parseCompat(cfgStr) {
   return videos;
 }
 
+const Video = {
+  filename: "",
+  enabled: true,
+  duration: 0,
+  customDuration: 0,
+  playbackRate: 0.0,
+  alternativePlaybackRate: 0.0,
+  loop: false,
+  dayNightCycleAssignment: 0,
+};
+
+/**
+ * Create a new Video object with the given filename
+ * @param {string} filename Video filename
+ * @returns {Video} Video object with the given filename and default properties
+ */
 function createVideo(filename) {
-  return {
-    "filename": filename ?? "",
-    "enabled": true,
-    "duration": 0,
-    "customDuration": 0,
-    "playbackRate": 0.0,
-    "alternativePlaybackRate": 0.0,
-    "loop": false,
-    "dayNightCycleAssignment": 0,
-  };
+  let video = Object.create(Video);
+  video.filename = filename;
+  return video;
+}
+/**
+ * Get videos based on day/night cycle and enabled status
+ * @param {boolean} dayNightCycleEnabled Whether day/night cycle is enabled
+ * @param {boolean} isDay Whether it is day cycle
+ * @param {string} videoUrls Video URLs configuration string
+ * @returns {Array.<Video>} List of videos matching the criteria
+ */
+function getVideos(dayNightCycleEnabled, isDay, videoUrls) {
+  console.log("getVideos()");
+  if (dayNightCycleEnabled) {
+    return parseCompat(videoUrls).filter(video => {
+      const isDayCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Night;
+      const isNightCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Day;
+      return video.enabled && ((isDay && isDayCycle) || (!isDay && isNightCycle));
+    });
+  }
+
+  return parseCompat(videoUrls).filter(video => video.enabled);
 }
 
 /**
- *
- * @param {String} filename File path
- * @param {Array} videosConfig Videos config
- * @returns {Object} Video properties
+ * Find video index by filename
+ * @param {string} filename Video filename to search for
+ * @returns {int} Matching index, or -1 when not found
  */
-function getVideoByFile(filename, videosConfig) {
-  const video = videosConfig.find((video) => video.filename === filename);
-  return video ?? createVideo("");
+function getVideoIndex(filename, videosConfig) {
+  return videosConfig.findIndex(video => video.filename === filename);
 }
 
 /**
- *
- * @param {int} index Video index
- * @param {Array} videosConfig Videos config
- * @returns {Object} Video properties
+ * Get index of the last played video or -1 if not last video exists
+ * if day/night cycle is enabled returns the last video for that cycle
+ * @param {boolean} dayNightCycleEnabled Whether Day/night cycle is enabled
+ * @param {boolean} isDay Whether is day cycle
+ * @param {KConfigPropertyMap} configuration Wallpaper (WallpaperItem) configuration
+ * @param {Array.<Video>} videosConfig List of videos with their properties
+ * @returns {int} Video index or -1 if not found
  */
-function getVideoByIndex(index, videosConfig) {
-  return videosConfig.length > 0 ? videosConfig[index] : createVideo("");
+function getLastVideoIndex(dayNightCycleEnabled, isDay, configuration, videosConfig) {
+  let lastVideo = "";
+  if (dayNightCycleEnabled) {
+    lastVideo = configuration[isDay ? "LastVideoDay" : "LastVideoNight"];
+  } else {
+    lastVideo = main.configuration.LastVideo;
+  }
+  return lastVideo === "" ? -1 : getVideoIndex(lastVideo, videosConfig);
 }
 
 function dumpProps(obj) {
@@ -71,7 +106,6 @@ function shuffleArray(array) {
     array[i] = array[j];
     array[j] = temp;
   }
-  return array;
 }
 
 // https://stackoverflow.com/questions/28507619/how-to-create-delay-function-in-qml
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index 6907f21..14477d2 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -20,14 +20,15 @@
 
 import QtQuick
 import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
+import QtMultimedia
 import org.kde.plasma.core as PlasmaCore
+import org.kde.plasma.components as PlasmaComponents
+import org.kde.plasma.extras as PlasmaExtras
+import org.kde.kirigami as Kirigami
 import org.kde.ksvg as KSvg
 import org.kde.plasma.plasma5support as P5Support
 import org.kde.plasma.plasmoid
-import Qt5Compat.GraphicalEffects
-import org.kde.plasma.extras as PlasmaExtras
-import org.kde.kirigami as Kirigami
-import org.kde.plasma.components as PlasmaComponents
 import "code/utils.js" as Utils
 import "code/enum.js" as Enum
 
@@ -37,10 +38,18 @@ WallpaperItem {
     property bool isLoading: true
     property string videoUrls: main.configuration.VideoUrls
     property var videosConfig: {
-        const videos = getVideos();
-        return randomMode ? Utils.shuffleArray(videos) : videos;
+        let videos = Utils.getVideos(dayNightCycleEnabled, isDay, videoUrls);
+        if (randomMode && videos.length > 1) {
+            Utils.shuffleArray(videos);
+        }
+        return videos;
     }
+
+    property int videosCount: videosConfig.length || 0
+    property bool hasVideos: videosCount > 0
+    property bool videoUpdatePending: false
     property int currentVideoIndex: 0
+    property string lastSelectedVideo: ""
     property bool resumeLastVideo: main.configuration.ResumeLastVideo
     property alias isDay: dayNightCycleController.isDay
     property var currentSource: Utils.createVideo("")
@@ -73,10 +82,10 @@ WallpaperItem {
         return play;
     }
     property bool playing: {
-        return ((shouldPlay && !batteryPausesVideo && !screenLocked && !screenIsOff && !effectPauseVideo) || effectPlayVideo) && videosConfig.length !== 0;
+        return ((shouldPlay && !batteryPausesVideo && !screenLocked && !screenIsOff && !effectPauseVideo) || effectPlayVideo) && hasVideos && !isLoading;
     }
     property bool shouldBlur: {
-        if (videosConfig.length == 0) {
+        if (!hasVideos) {
             return false;
         }
         let blur = false;
@@ -192,51 +201,92 @@ WallpaperItem {
         return r;
     }
 
-    function getVideos() {
-        if (dayNightCycleEnabled) {
-            return Utils.parseCompat(videoUrls).filter(video => {
-                const isDayCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Night;
-                const isNightCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Day;
+    function setCurrentIndex() {
+        if (!hasVideos) {
+            currentVideoIndex = 0;
+            return;
+        }
+
+        let preferredIndex = -1;
 
-                return video.enabled && ((main.isDay && isDayCycle) || (!main.isDay && isNightCycle));
-            });
+        if (resumeLastVideo) {
+            preferredIndex = Utils.getLastVideoIndex(dayNightCycleEnabled, isDay, main.configuration, videosConfig);
         }
 
-        return Utils.parseCompat(videoUrls).filter(video => video.enabled);
-    }
-    function getLastVideo() {
-        if (dayNightCycleEnabled) {
-            return main.configuration[main.isDay ? "LastVideoDay" : "LastVideoNight"];
+        if (preferredIndex === -1) {
+            preferredIndex = Utils.getVideoIndex(lastSelectedVideo, videosConfig);
         }
-        return main.configuration.LastVideo;
+
+        currentVideoIndex = preferredIndex !== -1 ? preferredIndex : 0;
     }
-    function getLastVideoIndex() {
-        const lastVideo = getLastVideo();
-        for (let index = 0; index < videosConfig.length; index++) {
-            if (videosConfig[index].filename === lastVideo) {
-                return index;
-            }
+
+    function nextVideo() {
+        if (!hasVideos) {
+            return;
         }
-        return 0;
+        currentVideoIndex = (currentVideoIndex + 1) % videosCount;
+        setCurrentSource();
     }
 
-    onPlayingChanged: {
-        playing && !isLoading ? main.play() : main.pause();
+    function setCurrentSource() {
+        if (!hasVideos) {
+            stop();
+            player.player1.playerSource = Utils.createVideo("");
+            player.player2.playerSource = Utils.createVideo("");
+            return;
+        }
+        currentSource = videosConfig[currentVideoIndex] ?? Utils.createVideo("");
+        if (player.player.playerSource.filename !== currentSource.filename) {
+            player.stop();
+            player.player.playerSource = currentSource;
+            player.player.position = 0;
+            player.otherPlayer.playerSource = Utils.createVideo("");
+        }
+
+        if (playing) {
+            updateState();
+        } else {
+            play();
+            pauseWhenReady();
+        }
     }
-    onVideoUrlsChanged: {
-        if (isLoading)
+
+    function updateVideo() {
+        if (videoUpdatePending || isLoading) {
             return;
-        videosConfig = getVideos();
-        const wasPlaying = player.player.playing;
-        // console.error(videoUrls);
-        if (videosConfig.length == 0) {
-            main.stop();
-            main.currentSource.filename = "";
-        } else if (videosConfig.length == 1) {
-            player.next(true, true);
-            if (!wasPlaying) {
-                main.pause();
+        }
+        videoUpdatePending = true;
+        Qt.callLater(() => {
+            videoUpdatePending = false;
+            setCurrentIndex();
+            setCurrentSource();
+        });
+    }
+
+    Timer {
+        id: updateVideoDebounce
+        interval: 50
+        onTriggered: main.updateVideo()
+    }
+
+    function pauseWhenReady() {
+        pauseWhenReadyTimer.attempt = 0;
+        pauseWhenReadyTimer.restart();
+    }
+
+    Timer {
+        id: pauseWhenReadyTimer
+        interval: 50
+        repeat: true
+        property int attempt: 0
+        onTriggered: {
+            const ready = player.player.mediaStatus === MediaPlayer.LoadedMedia || player.player.mediaStatus === MediaPlayer.BufferedMedia || player.player.position > 0;
+            if (ready || attempt >= 20) {
+                stop();
+                Utils.delay(200, main.pause, main);
+                return;
             }
+            attempt++;
         }
     }
 
@@ -281,7 +331,22 @@ WallpaperItem {
         }
     }
 
-    onCurrentSourceChanged: syncConfig()
+    onPlayingChanged: {
+        if (isLoading) {
+            return;
+        }
+        playing ? play() : pause();
+    }
+
+    onVideosConfigChanged: {
+        updateVideoDebounce.restart();
+    }
+    onCurrentSourceChanged: {
+        if (currentSource.filename !== "") {
+            lastSelectedVideo = currentSource.filename;
+            main.saveLastSource(main.currentSource.filename, main.isDay);
+        }
+    }
 
     DayNightCycleController {
         id: dayNightCycleController
@@ -290,59 +355,27 @@ WallpaperItem {
         sunriseTime: main.configuration.DayNightCycleSunriseTime
         sunsetTime: main.configuration.DayNightCycleSunsetTime
         onIsDayChanged: {
-            if (main.isLoading) {
-                return;
-            }
-            const wasPlaying = player.player.playing;
-            videosConfig = getVideos();
-            if (videosConfig.length == 0) {
-                main.stop();
-                main.currentSource.filename = "";
-            } else {
-                currentVideoIndex = resumeLastVideo ? getLastVideoIndex() : 0;
-                setCurrentSource(currentVideoIndex);
-                player.next(true, true);
-                if (!wasPlaying) {
-                    // FIXME pause is delayed to avoid black screen
-                    // maybe there is a way to display the first frame
-                    Utils.delay(150, main.pause, main);
-                }
-            }
+            updateVideoDebounce.restart();
         }
     }
 
-    function setCurrentSource(index) {
-        if (randomMode && index === 0) {
-            const shuffledVideos = Utils.shuffleArray(videosConfig);
-            currentSource = shuffledVideos[index];
-        } else {
-            currentSource = videosConfig[index];
-        }
-    }
-
-    function nextVideo() {
-        printLog("- Video ended " + currentVideoIndex + ": " + currentSource.filename);
-        currentVideoIndex = (currentVideoIndex + 1) % videosConfig.length;
-        setCurrentSource(currentVideoIndex);
-        printLog("- Next " + currentVideoIndex + ": " + currentSource.filename);
-    }
-
     Rectangle {
         id: background
         anchors.fill: parent
-        color: videosConfig.length == 0 ? Kirigami.Theme.backgroundColor : main.configuration.BackgroundColor
+        color: !main.hasVideos ? Kirigami.Theme.backgroundColor : main.configuration.BackgroundColor
 
         FadePlayer {
             id: player
             anchors.fill: parent
+            currentSource: main.currentSource
             muted: main.muteAudio
             lastVideoPosition: main.configuration.LastVideoPosition
-            visible: main.videosConfig.length !== 0
+            visible: main.hasVideos
             onSetNextSource: {
                 main.nextVideo();
             }
             crossfadeEnabled: main.crossfadeEnabled
-            multipleVideos: main.videosConfig.length > 1
+            multipleVideos: main.videosCount > 1
             targetCrossfadeDuration: main.configuration.CrossfadeDuration
             debugEnabled: main.debugEnabled
             changeWallpaperMode: main.changeWallpaperMode
@@ -374,7 +407,7 @@ WallpaperItem {
     }
 
     PlasmaExtras.PlaceholderMessage {
-        visible: main.videosConfig.length == 0
+        visible: !main.hasVideos
         anchors.centerIn: parent
         width: parent.width - Kirigami.Units.gridUnit * 2
         iconName: "video-symbolic"
@@ -405,6 +438,13 @@ WallpaperItem {
                 Layout.margins: Kirigami.Units.largeSpacing
                 text: {
                     let text = `filename: ${main.currentSource.filename}\n`;
+                    text += `videos:\n${main.videosConfig.map(v => {
+                        const filenameParts = v.filename.split("/");
+                        return filenameParts[filenameParts.length - 1];
+                    }).join("\n")}\n\n`;
+                    text += `last: ${main.configuration.LastVideo}\n`;
+                    text += `lastDay: ${main.configuration.LastVideoDay}\n`;
+                    text += `lastNight: ${main.configuration.LastVideoNight}\n`;
                     text += `loops: ${main.currentSource.loop ?? false}\n`;
                     text += `currentVideoIndex: ${main.currentVideoIndex}\n`;
                     text += `changeWallpaperMode: ${main.changeWallpaperMode}\n`;
@@ -451,17 +491,17 @@ WallpaperItem {
 
     function updateState() {
         if (playing) {
-            main.pause();
-            main.play();
+            pause();
+            play();
         } else {
-            main.play();
-            main.pause();
+            play();
+            pause();
         }
     }
 
     Timer {
         id: pauseTimer
-        interval: showBlur ? blurAnimationDuration : 10
+        interval: main.showBlur ? main.blurAnimationDuration : 10
         onTriggered: {
             player.pause();
         }
@@ -476,15 +516,11 @@ WallpaperItem {
         }
     }
 
-    Timer {
-        id: startTimer
-        interval: 100
-        onTriggered: {
+    Component.onCompleted: {
+        Utils.delay(100, () => {
             isLoading = false;
-            if (debugEnabled)
-                Utils.dumpProps(main.configuration);
-            updateState();
-        }
+            updateVideoDebounce.restart();
+        }, main);
     }
 
     function printLog(msg) {
@@ -495,43 +531,48 @@ WallpaperItem {
 
     Timer {
         id: debugTimer
-        running: debugEnabled
+        running: main.debugEnabled
         repeat: true
         interval: 2000
         onTriggered: {
-            printLog("------------------------");
-            printLog("Videos: '" + JSON.stringify(videosConfig) + "'");
-            printLog("Pause Battery: " + pauseBatteryLevel + "% " + pauseBattery);
-            printLog("Pause Screen Off: " + screenOffPausesVideo + " Off: " + screenIsOff);
-            printLog("Windows: " + main.shouldPlay + " Blur: " + main.showBlur);
-            printLog("Video playing: " + playing + " Blur: " + showBlur);
+            main.printLog("------------------------");
+            main.printLog("Videos: '" + JSON.stringify(main.videosConfig) + "'");
+            main.printLog("Pause Battery: " + main.pauseBatteryLevel + "% " + main.pauseBattery);
+            main.printLog("Pause Screen Off: " + main.screenOffPausesVideo + " Off: " + main.screenIsOff);
+            main.printLog("Windows: " + main.shouldPlay + " Blur: " + main.showBlur);
+            main.printLog("Video playing: " + main.playing + " Blur: " + main.showBlur);
         }
     }
 
-    Component.onCompleted: {
-        startTimer.start();
-        Qt.callLater(() => {
-            currentVideoIndex = resumeLastVideo ? getLastVideoIndex() : 0;
-            setCurrentSource(currentVideoIndex);
-            player.currentSource = Qt.binding(() => {
-                return main.currentSource;
-            });
-        });
-    }
+    function saveLastSource(filename, cycleIsDay) {
+        if (filename === "") {
+            return;
+        }
 
-    function syncConfig() {
-        // Save last video and position to resume from it on next login/lock
-        main.configuration.LastVideo = main.currentSource.filename;
-        main.configuration.LastVideoPosition = player.lastVideoPosition;
+        main.configuration.LastVideo = filename;
         if (dayNightCycleEnabled) {
-            main.configuration[main.isDay ? "LastVideoDay" : "LastVideoNight"] = main.currentSource.filename;
+            if (cycleIsDay) {
+                main.configuration.LastVideoDay = filename;
+            } else {
+                main.configuration.LastVideoNight = filename;
+            }
+        }
+    }
+
+    function saveLastPosition() {
+        const currentFilename = currentSource.filename || lastSelectedVideo;
+        if (currentFilename === "") {
+            return;
         }
+
+        main.configuration.LastVideoPosition = player.lastVideoPosition;
     }
 
     Connections {
         target: Qt.application
         function onAboutToQuit() {
-            syncConfig();
+            main.saveLastSource(main.currentSource.filename || main.lastSelectedVideo, main.isDay);
+            main.saveLastPosition();
             main.configuration.writeConfig();
         }
     }

From b22a85bc7b6d4ec330ce43fb61e76006e4b659ce Mon Sep 17 00:00:00 2001
From: Luis Bocanegra <luisbocanegra@users.noreply.github.com>
Date: Fri, 1 May 2026 16:19:47 -0600
Subject: [PATCH 12/13] allow to play different videos during sunrise and
 sunset

---
 README.md                                     |   1 +
 package/contents/config/main.xml              |  10 +
 package/contents/icons/dayNight/day.svg       |  44 +++++
 package/contents/icons/dayNight/disabled.svg  |  47 +++++
 package/contents/icons/dayNight/night.svg     |  44 +++++
 package/contents/icons/dayNight/sunrise.svg   |  44 +++++
 package/contents/icons/dayNight/sunset.svg    |  44 +++++
 .../contents/ui/DayNightCycleController.qml   |  59 +++---
 ...timeHelper.qml => DayNightCyclePlugin.qml} |   4 +-
 package/contents/ui/DayNightCycleTimer.qml    |  44 +++++
 package/contents/ui/FadePlayer.qml            |   2 +-
 package/contents/ui/VideosModel.qml           |   2 +-
 package/contents/ui/code/enum.js              |  19 +-
 package/contents/ui/code/utils.js             | 113 ++++++++---
 package/contents/ui/components/TimePicker.qml |   4 -
 package/contents/ui/config.qml                | 183 ++++++++++++++----
 package/contents/ui/main.qml                  |  49 +++--
 plugin/nighttime.cpp                          |  19 +-
 plugin/nighttime.h                            |   9 +-
 19 files changed, 602 insertions(+), 139 deletions(-)
 create mode 100644 package/contents/icons/dayNight/day.svg
 create mode 100644 package/contents/icons/dayNight/disabled.svg
 create mode 100644 package/contents/icons/dayNight/night.svg
 create mode 100644 package/contents/icons/dayNight/sunrise.svg
 create mode 100644 package/contents/icons/dayNight/sunset.svg
 rename package/contents/ui/{NighttimeHelper.qml => DayNightCyclePlugin.qml} (63%)
 create mode 100644 package/contents/ui/DayNightCycleTimer.qml

diff --git a/README.md b/README.md
index 7845d09..167169e 100644
--- a/README.md
+++ b/README.md
@@ -226,3 +226,4 @@ See [Translations](https://github.com/luisbocanegra/plasma-smart-video-wallpaper
 - This project a rewrite based on [adhec/Smart Video Wallpaper](https://github.com/adhec/plasma_tweaks/tree/master/SmartVideoWallpaper) and [PeterTucker/smartER-video-wallpaper](https://github.com/PeterTucker/smartER-video-wallpaper) projects.
 - [ccatterina's script](https://github.com/ccatterina) to manage translations
 - Brand icons from [Simple Icons](https://simpleicons.org)
+- Day-night icons from [Google LLC. / Pictogrammers](https://pictogrammers.com/library/mdi/)
diff --git a/package/contents/config/main.xml b/package/contents/config/main.xml
index 1d70040..a652410 100644
--- a/package/contents/config/main.xml
+++ b/package/contents/config/main.xml
@@ -118,6 +118,12 @@
     <entry name="LastVideoNight" type="String">
       <default></default>
     </entry>
+    <entry name="LastVideoSunrise" type="String">
+      <default></default>
+    </entry>
+    <entry name="LastVideoSunset" type="String">
+      <default></default>
+    </entry>
     <!-- Mute audio
         0: when maximized or full-screen windows
         1: when a visible window is active
@@ -153,6 +159,10 @@
       <label>Time of sunset</label>
       <default>1080</default>
     </entry>
+    <entry name="DayNightCycleTransitionDuration" type="Int">
+      <label>Duration of sunrise and sunset (minutes)</label>
+      <default>5</default>
+    </entry>
     <entry name="ResumeLastVideo" type="Bool">
       <label>Whether or not to resume last playing video on startup</label>
       <default>True</default>
diff --git a/package/contents/icons/dayNight/day.svg b/package/contents/icons/dayNight/day.svg
new file mode 100644
index 0000000..41c100c
--- /dev/null
+++ b/package/contents/icons/dayNight/day.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="22"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="weather-sunny.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="4.4204545"
+     inkscape:cx="30.766067"
+     inkscape:cy="49.203085"
+     inkscape:window-width="1078"
+     inkscape:window-height="984"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1" />
+  <defs
+     id="defs1">
+    <style
+       id="current-color-scheme"
+       type="text/css">
+   .ColorScheme-Text { color:#dfdfdf; } .ColorScheme-Highlight { color:#4285f4; } .ColorScheme-NeutralText { color:#ff9800; } .ColorScheme-PositiveText { color:#4caf50; } .ColorScheme-NegativeText { color:#f44336; }
+  </style>
+  </defs>
+  <path
+     style="fill:currentColor"
+     class="ColorScheme-Text"
+     d="m 11.004,7 a 4,4 0 0 1 4,4 4,4 0 0 1 -4,4 4,4 0 0 1 -4,-4 4,4 0 0 1 4,-4 m 0,1.6 a 2.4,2.4 0 0 0 -2.4,2.4 2.4,2.4 0 0 0 2.4,2.4 2.4,2.4 0 0 0 2.4,-2.4 2.4,2.4 0 0 0 -2.4,-2.4 m 0,-5.6 1.912,2.736 C 12.324,5.52 11.676,5.4 11.004,5.4 10.332,5.4 9.684,5.52 9.092,5.736 L 11.004,3 M 4.076,7 7.404,6.72 C 6.924,7.128 6.492,7.624 6.156,8.2 5.804,8.792 5.604,9.4 5.492,10.032 L 4.076,7 M 4.092,15 5.5,11.984 c 0.112,0.616 0.328,1.24 0.664,1.816 0.336,0.592 0.768,1.088 1.24,1.496 L 4.092,15 M 17.924,7 16.508,10.032 C 16.396,9.4 16.18,8.784 15.844,8.2 15.508,7.624 15.084,7.12 14.604,6.712 L 17.924,7 m -0.008,8 -3.312,0.288 C 15.076,14.88 15.5,14.376 15.836,13.8 16.172,13.216 16.388,12.6 16.5,11.968 L 17.916,15 m -6.912,4 -1.928,-2.752 c 0.592,0.216 1.24,0.352 1.928,0.352 0.656,0 1.304,-0.136 1.896,-0.352 z"
+     id="path1" />
+</svg>
diff --git a/package/contents/icons/dayNight/disabled.svg b/package/contents/icons/dayNight/disabled.svg
new file mode 100644
index 0000000..7d6e5f0
--- /dev/null
+++ b/package/contents/icons/dayNight/disabled.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="22"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="disabled.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="8.840909"
+     inkscape:cx="15.213368"
+     inkscape:cy="27.542417"
+     inkscape:window-width="1078"
+     inkscape:window-height="490"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g9" />
+  <defs
+     id="defs1">
+    <style
+       id="current-color-scheme"
+       type="text/css">
+   .ColorScheme-Text { color:#dfdfdf; } .ColorScheme-Highlight { color:#4285f4; } .ColorScheme-NeutralText { color:#ff9800; } .ColorScheme-PositiveText { color:#4caf50; } .ColorScheme-NegativeText { color:#f44336; }
+  </style>
+  </defs>
+  <g
+     id="g9">
+    <path
+       id="path11"
+       style="fill:currentColor"
+       d="M 7.432484,3.407496 C 6.056223,4.291687 5.125901,5.852475 5.125901,7.636233 c 0,1.783757 0.930322,3.344545 2.329649,4.228736 -2.360404,0 -4.251802,-1.891399 -4.251802,-4.228736 A 4.2287362,4.2287362 0 0 1 7.432484,3.407496 M 16.328207,4.560788 17.427679,5.660259 5.456511,17.631427 4.35704,16.531956 16.328207,4.560788 M 11.576646,6.429121 10.438731,5.71408 9.331571,6.482941 9.654493,5.175877 8.585776,4.360884 9.931283,4.268624 10.377222,3 l 0.515137,1.253244 1.33013,0.02306 -1.037963,0.868814 0.39212,1.283998 M 9.039404,9.204704 8.147525,8.643436 7.286401,9.243147 7.547813,8.228251 6.709755,7.590096 l 1.045651,-0.0692 0.345987,-0.99183 0.39212,0.976453 1.045651,0.02307 -0.807305,0.668909 0.307545,1.007208 m 7.234983,3.04469 a 4.2287362,4.2287362 0 0 1 -4.228736,4.228737 c -0.938011,0 -1.806824,-0.307545 -2.506487,-0.822682 l 5.912542,-5.912542 c 0.515137,0.699664 0.822681,1.568477 0.822681,2.506487 m -3.382989,5.05911 2.129745,-0.884191 L 14.836617,19 12.891398,17.308506 m 3.329169,-2.075926 0.88419,-2.129745 1.691495,1.952907 -2.575685,0.176838 m 0.88419,-3.813551 -0.876502,-2.137434 2.567997,0.184527 -1.691495,1.952907 m -8.034599,5.005286 2.129746,0.884191 -1.945219,1.683805 z"
+       class="ColorScheme-Text" />
+  </g>
+</svg>
diff --git a/package/contents/icons/dayNight/night.svg b/package/contents/icons/dayNight/night.svg
new file mode 100644
index 0000000..ecd79af
--- /dev/null
+++ b/package/contents/icons/dayNight/night.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="22"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="weather-night.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="4.4204545"
+     inkscape:cx="30.766067"
+     inkscape:cy="49.203085"
+     inkscape:window-width="1078"
+     inkscape:window-height="984"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1" />
+  <defs
+     id="defs1">
+    <style
+       id="current-color-scheme"
+       type="text/css">
+   .ColorScheme-Text { color:#dfdfdf; } .ColorScheme-Highlight { color:#4285f4; } .ColorScheme-NeutralText { color:#ff9800; } .ColorScheme-PositiveText { color:#4caf50; } .ColorScheme-NegativeText { color:#f44336; }
+  </style>
+  </defs>
+  <path
+     style="fill:currentColor"
+     class="ColorScheme-Text"
+     d="M 15.659927,5.352327 13.733913,6.829192 14.426669,9.158679 12.424528,7.78078 10.422387,9.158679 11.115143,6.829192 9.1891284,5.352327 l 2.4284526,-0.06851 0.806947,-2.283815 0.806946,2.283811 2.428453,0.06851 m 2.664446,5.260379 -1.248483,0.951588 0.449149,1.507315 -1.294159,-0.890686 -1.29416,0.890686 0.449149,-1.507315 -1.248483,-0.951588 1.568217,-0.03806 0.525277,-1.484477 0.525276,1.484477 1.568217,0.03806 m -1.735696,3.768288 c 0.631854,-0.0609 1.309385,0.837397 0.905911,1.40835 -0.243606,0.342572 -0.502438,0.662305 -0.822172,0.966814 -2.976567,2.991792 -7.7954086,2.991792 -10.7643636,0 -2.976567,-2.968955 -2.976567,-7.795409 0,-10.764363 0.304509,-0.304509 0.624242,-0.578566 0.966814,-0.822172 0.570953,-0.403474 1.469252,0.274057 1.40835,0.905911 -0.205543,2.177234 0.525276,4.438207 2.2000716,6.105389 1.667182,1.674794 3.920543,2.405614 6.105389,2.200071 m -1.248484,1.537766 C 13.185798,15.796957 11.054241,14.906271 9.4022834,13.277152 7.7503274,11.60997 6.8672534,9.4708 6.7454504,7.324018 c -2.13917,2.390389 -2.05543,6.059712 0.235994,8.358748 2.299036,2.291424 5.9683596,2.375164 8.3587486,0.235994 z"
+     id="path1" />
+</svg>
diff --git a/package/contents/icons/dayNight/sunrise.svg b/package/contents/icons/dayNight/sunrise.svg
new file mode 100644
index 0000000..f1b7d1c
--- /dev/null
+++ b/package/contents/icons/dayNight/sunrise.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="22"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="weather-sunset-up.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="4.4204545"
+     inkscape:cx="30.766067"
+     inkscape:cy="49.203085"
+     inkscape:window-width="1078"
+     inkscape:window-height="984"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1" />
+  <defs
+     id="defs1">
+    <style
+       id="current-color-scheme"
+       type="text/css">
+   .ColorScheme-Text { color:#dfdfdf; } .ColorScheme-Highlight { color:#4285f4; } .ColorScheme-NeutralText { color:#ff9800; } .ColorScheme-PositiveText { color:#4caf50; } .ColorScheme-NegativeText { color:#f44336; }
+  </style>
+  </defs>
+  <path
+     style="fill:currentColor"
+     class="ColorScheme-Text"
+     d="m 3.4656635,11.371485 h 3.348594 a 4.1857423,4.1857423 0 0 1 4.1857435,-4.185743 4.1857423,4.1857423 0 0 1 4.185742,4.185743 h 3.348594 a 0.83714846,0.83714846 0 0 1 0.837147,0.837148 0.83714846,0.83714846 0 0 1 -0.837147,0.837149 H 3.4656635 a 0.83714846,0.83714846 0 0 1 -0.837148,-0.837149 0.83714846,0.83714846 0 0 1 0.837148,-0.837148 m 10.0457825,0 A 2.5114454,2.5114454 0 0 0 11.000001,8.860039 2.5114454,2.5114454 0 0 0 8.4885545,11.371485 H 13.511446 M 11.000001,3 13.000785,5.863048 c -0.619489,-0.22603 -1.29758,-0.351603 -2.000784,-0.351603 -0.703205,0 -1.3812955,0.125573 -2.0007855,0.351603 L 11.000001,3 M 3.7502945,7.185742 7.2328325,6.89274 c -0.50229,0.426946 -0.95435,0.945978 -1.305952,1.548725 -0.368345,0.61949 -0.577632,1.255723 -0.694833,1.91707 L 3.7502945,7.185742 m 14.4910405,0 -1.481753,3.172793 C 16.642381,9.697188 16.416351,9.052583 16.064749,8.441465 15.713146,7.838718 15.269458,7.311315 14.767169,6.884369 l 3.474166,0.301373 m -6.646959,7.785481 2.603532,2.603532 c 0.326488,0.326488 0.326488,0.853891 0,1.180379 -0.326488,0.326488 -0.853892,0.326488 -1.18038,0 l -2.017527,-2.017528 -2.0175285,2.017528 c -0.326488,0.326488 -0.853892,0.326488 -1.180379,0 -0.326488,-0.326488 -0.326488,-0.853891 0,-1.180379 L 10.405625,14.971223 C 10.581426,14.803793 10.782342,14.720078 11,14.720078 c 0.217658,0 0.418574,0.08371 0.594376,0.251145 z"
+     id="path1" />
+</svg>
diff --git a/package/contents/icons/dayNight/sunset.svg b/package/contents/icons/dayNight/sunset.svg
new file mode 100644
index 0000000..0cbb890
--- /dev/null
+++ b/package/contents/icons/dayNight/sunset.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="22"
+   height="22"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="weather-sunset-down.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="4.4204545"
+     inkscape:cx="30.766067"
+     inkscape:cy="49.203085"
+     inkscape:window-width="1078"
+     inkscape:window-height="984"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1" />
+  <defs
+     id="defs1">
+    <style
+       id="current-color-scheme"
+       type="text/css">
+   .ColorScheme-Text { color:#dfdfdf; } .ColorScheme-Highlight { color:#4285f4; } .ColorScheme-NeutralText { color:#ff9800; } .ColorScheme-PositiveText { color:#4caf50; } .ColorScheme-NegativeText { color:#f44336; }
+  </style>
+  </defs>
+  <path
+     style="fill:currentColor"
+     class="ColorScheme-Text"
+     d="m 3.4210525,11.421053 h 3.368421 A 4.2105263,4.2105263 0 0 1 11,7.210526 a 4.2105263,4.2105263 0 0 1 4.210527,4.210527 h 3.36842 a 0.84210526,0.84210526 0 0 1 0.842105,0.842105 0.84210526,0.84210526 0 0 1 -0.842105,0.842105 H 3.4210525 a 0.84210526,0.84210526 0 0 1 -0.842105,-0.842105 0.84210526,0.84210526 0 0 1 0.842105,-0.842105 m 10.1052625,0 A 2.5263158,2.5263158 0 0 0 11,8.894737 2.5263158,2.5263158 0 0 0 8.4736845,11.421053 H 13.526315 M 11,3 13.012631,5.88 C 12.389474,5.652632 11.707369,5.526316 11,5.526316 10.292631,5.526316 9.6105265,5.652632 8.9873685,5.88 L 11,3 M 3.7073685,7.210526 7.2105265,6.915789 c -0.505263,0.429474 -0.96,0.951579 -1.313684,1.557895 -0.370527,0.623158 -0.581053,1.263158 -0.698948,1.928421 L 3.7073685,7.210526 m 14.5768415,0 -1.490526,3.191579 C 16.675789,9.736842 16.448421,9.088421 16.094736,8.473684 c -0.353684,-0.606316 -0.8,-1.136842 -1.305262,-1.566316 l 3.494736,0.303158 m -6.686315,11.545263 2.618948,-2.618947 c 0.328421,-0.328421 0.328421,-0.867368 0,-1.195789 -0.328421,-0.328421 -0.858948,-0.328421 -1.187369,0 l -2.029473,2.029473 -2.0294745,-2.029473 c -0.328421,-0.328421 -0.858947,-0.328421 -1.187368,0 -0.328422,0.328421 -0.328422,0.867368 0,1.195789 l 2.6189475,2.618947 C 10.578947,18.915789 10.781053,19 11,19 c 0.218947,0 0.421052,-0.08421 0.597895,-0.244211 z"
+     id="path1" />
+</svg>
diff --git a/package/contents/ui/DayNightCycleController.qml b/package/contents/ui/DayNightCycleController.qml
index 7ed8c0f..82f07aa 100644
--- a/package/contents/ui/DayNightCycleController.qml
+++ b/package/contents/ui/DayNightCycleController.qml
@@ -4,64 +4,55 @@ import "code/enum.js" as Enum
 
 Item {
     id: root
-    required property bool enabled
     required property int mode
     required property int sunriseTime
     required property int sunsetTime
-
+    required property int transitionDuration
+    property string darkLightScheduleState
     property var dayNightPlugin: null
-    property int currentTime
 
-    property bool isDay: {
-        let day = false;
+    readonly property color targetColor: (palette && palette.window) ? palette.window : Kirigami.Theme.backgroundColor
+    readonly property int dayNightByColor: Qt.rgba(targetColor.r, targetColor.g, targetColor.b, targetColor.a).hslLightness > 0.75 ? Enum.DayNightPhase.Day : Enum.DayNightPhase.Night
+
+    readonly property int currentPhase: {
+        let phase = Enum.DayNightPhase.Unknown;
         switch (mode) {
         case Enum.DayNightCycleMode.Time:
-            if (dayNightPlugin) {
-                day = dayNightPlugin.isDay;
-                break;
-            }
-            day = currentTime >= root.sunriseTime && currentTime < root.sunsetTime;
+            phase = dayNightCycleTimer.phase;
+            break;
+        case Enum.DayNightCycleMode.DayNightCycle:
+            phase = dayNightPlugin ? dayNightPlugin.phase : Enum.DayNightPhase.Unknown;
             break;
         case Enum.DayNightCycleMode.PlasmaStyle:
-            const targetColor = (palette && palette.window) ? palette.window : Kirigami.Theme.backgroundColor;
-            day = Qt.rgba(targetColor.r, targetColor.g, targetColor.b, targetColor.a).hslLightness > 0.75;
+            phase = root.dayNightByColor;
             break;
         case Enum.DayNightCycleMode.AlwaysNight:
-            day = false;
+            phase = Enum.DayNightPhase.Night;
             break;
         case Enum.DayNightCycleMode.AlwaysDay:
-            day = true;
-            break;
-        default:
-            day = false;
+            phase = Enum.DayNightPhase.Day;
             break;
         }
-        return day;
+        return phase;
     }
 
-    Timer {
-        id: timer
-        interval: 1000
-        running: root.mode === Enum.DayNightCycleMode.Time && root.dayNightPlugin === null
-        repeat: true
-        triggeredOnStart: true
-        property bool prevEnabled: root.enabled
-        onTriggered: {
-            const now = new Date();
-            root.currentTime = now.getHours() * 60 + now.getMinutes();
-        }
+    DayNightCycleTimer {
+        id: dayNightCycleTimer
+        running: root.mode === Enum.DayNightCycleMode.Time
+        sunriseTime: root.sunriseTime
+        sunsetTime: root.sunsetTime
+        transitionDuration: root.transitionDuration
     }
 
     Component.onCompleted: {
         let component = null;
-        component = Qt.createComponent("NighttimeHelper.qml");
+        component = Qt.createComponent("DayNightCyclePlugin.qml");
         if (component.status === Component.Ready) {
             dayNightPlugin = component.createObject(root);
-            dayNightPlugin.initialState = configuration.DarkLightScheduleState;
+            dayNightPlugin.initialState = root.darkLightScheduleState;
             dayNightPlugin.stateChanged.connect(() => {
-                if (configuration.DarkLightScheduleState != dayNightPlugin.state) {
-                    configuration.DarkLightScheduleState = dayNightPlugin.state;
-                    configuration.writeConfig();
+                if (root.darkLightScheduleState != dayNightPlugin.state) {
+                    root.darkLightScheduleState = dayNightPlugin.state;
                 }
             });
         } else {
diff --git a/package/contents/ui/NighttimeHelper.qml b/package/contents/ui/DayNightCyclePlugin.qml
similarity index 63%
rename from package/contents/ui/NighttimeHelper.qml
rename to package/contents/ui/DayNightCyclePlugin.qml
index 1c70d2e..7c21148 100644
--- a/package/contents/ui/NighttimeHelper.qml
+++ b/package/contents/ui/DayNightCyclePlugin.qml
@@ -2,9 +2,9 @@ import QtQuick
 import com.github.luisbocanegra.svwr.nighttime 1.0
 
 Item {
-    property alias isDay: dayNight.isDay
+    readonly property alias phase: dayNight.phase
+    readonly property alias state: dayNight.state
     property alias initialState: dayNight.initialState
-    property alias state: dayNight.state
     DayNight {
         id: dayNight
     }
diff --git a/package/contents/ui/DayNightCycleTimer.qml b/package/contents/ui/DayNightCycleTimer.qml
new file mode 100644
index 0000000..18debf2
--- /dev/null
+++ b/package/contents/ui/DayNightCycleTimer.qml
@@ -0,0 +1,44 @@
+import QtQuick
+import "code/enum.js" as Enum
+
+Timer {
+    id: root
+    required property int sunriseTime
+    required property int sunsetTime
+    required property int transitionDuration
+
+    property int currentTime
+
+    readonly property int phase: {
+        const sunriseStart = sunriseTime;
+        const sunriseEnd = (sunriseTime + transitionDuration) % (24 * 60);
+        const sunsetStart = sunsetTime;
+        const sunsetEnd = (sunsetTime + transitionDuration) % (24 * 60);
+
+        if (isInInterval(currentTime, sunriseStart, sunriseEnd)) {
+            return Enum.DayNightPhase.Sunrise;
+        } else if (isInInterval(currentTime, sunsetStart, sunsetEnd)) {
+            return Enum.DayNightPhase.Sunset;
+        } else if (isInInterval(currentTime, sunriseEnd, sunsetStart)) {
+            return Enum.DayNightPhase.Day;
+        } else {
+            return Enum.DayNightPhase.Night;
+        }
+    }
+
+    function isInInterval(time, start, end) {
+        if (start < end) {
+            return time >= start && time < end;
+        } else {
+            return time >= start || time < end;
+        }
+    }
+
+    interval: 1000
+    repeat: true
+    triggeredOnStart: true
+    onTriggered: {
+        const now = new Date();
+        currentTime = now.getHours() * 60 + now.getMinutes();
+    }
+}
diff --git a/package/contents/ui/FadePlayer.qml b/package/contents/ui/FadePlayer.qml
index 1e43426..345c3e2 100644
--- a/package/contents/ui/FadePlayer.qml
+++ b/package/contents/ui/FadePlayer.qml
@@ -156,7 +156,7 @@ Item {
             if (mediaStatus == MediaPlayer.LoadedMedia && seekable) {
                 if (root.restoreLastPosition && root.resumeLastVideo) {
                     if (root.lastVideoPosition < duration) {
-                        console.error("RESTORE LAST POSITION:", root.lastVideoPosition);
+                        console.log("RESTORE LAST POSITION:", root.lastVideoPosition);
                         videoPlayer1.position = root.lastVideoPosition;
                     }
                 }
diff --git a/package/contents/ui/VideosModel.qml b/package/contents/ui/VideosModel.qml
index 318acad..5b31d98 100644
--- a/package/contents/ui/VideosModel.qml
+++ b/package/contents/ui/VideosModel.qml
@@ -29,7 +29,7 @@ Item {
             "playbackRate": 0.0,
             "alternativePlaybackRate": 0.0,
             "loop": false,
-            "dayNightCycleAssignment": Enum.DayNightCycleAssignment.Both
+            "dayNightPhase": Enum.DayNightPhase.Unknown
         });
         updated();
     }
diff --git a/package/contents/ui/code/enum.js b/package/contents/ui/code/enum.js
index 5703ea9..793a6ad 100644
--- a/package/contents/ui/code/enum.js
+++ b/package/contents/ui/code/enum.js
@@ -16,18 +16,21 @@ const ChangeWallpaperMode = {
   OnATimer: 2,
 };
 
-const DayNightCycleAssignment = {
-  Both: 0,
-  Day: 1,
-  Night: 2,
+const DayNightPhase = {
+  Night: 0,
+  Sunrise: 1,
+  Day: 2,
+  Sunset: 3,
+  Unknown: 4, // or unset
 };
 
 const DayNightCycleMode = {
   Disabled: 0,
-  Time: 1,
-  PlasmaStyle: 2,
-  AlwaysDay: 3,
-  AlwaysNight: 4,
+  DayNightCycle: 1,
+  Time: 2,
+  PlasmaStyle: 3,
+  AlwaysDay: 4,
+  AlwaysNight: 5,
 };
 
 const PauseMode = {
diff --git a/package/contents/ui/code/utils.js b/package/contents/ui/code/utils.js
index a97ea6b..a4135c2 100644
--- a/package/contents/ui/code/utils.js
+++ b/package/contents/ui/code/utils.js
@@ -4,7 +4,7 @@ function parseCompat(cfgStr) {
     JSON.parse(cfgStr).forEach((video) => {
       video.playbackRate = video.playbackRate ?? 0.0;
       video.alternativePlaybackRate = video.alternativePlaybackRate ?? 0.0;
-      video.dayNightCycleAssignment = video.dayNightCycleAssignment ?? 0;
+      video.dayNightPhase = video.dayNightPhase ?? Enum.DayNightPhase.Unknown;
       videos.push(video);
     });
   } catch (e) {
@@ -40,29 +40,72 @@ function createVideo(filename) {
   video.filename = filename;
   return video;
 }
+
+/**
+ * Get fallback day-night phase for sunrise and sunset
+ * @param {DayNightPhase} dayNightPhase Current day-night phase
+ * @returns {DayNightPhase} Fallback phase for sunrise and sunset, or unknown if no fallback exists
+ */
+function getFallbackPhase(dayNightPhase) {
+  switch (dayNightPhase) {
+    case Enum.DayNightPhase.Sunrise:
+      return Enum.DayNightPhase.Day;
+    case Enum.DayNightPhase.Sunset:
+      return Enum.DayNightPhase.Night;
+    default:
+      return Enum.DayNightPhase.Unknown;
+  }
+}
+
 /**
- * Get videos based on day/night cycle and enabled status
- * @param {boolean} dayNightCycleEnabled Whether day/night cycle is enabled
- * @param {boolean} isDay Whether it is day cycle
+ * Get videos matching the given day-night phase
+ * @param {Array.<Video>} videos 
+ * @param {DayNightPhase} dayNightPhase 
+ * @returns {Array.<Video>} List of videos matching the given day-night phase
+ */
+function getMatchingVideos(videos, dayNightPhase) {
+  return videos.filter(video => {
+    return video.dayNightPhase === dayNightPhase;
+  });
+}
+
+/**
+ * Get videos matching the current day-night phase, including videos without a specific phase assigned
+ * 
+ * If day-night cycle is disabled, returns all videos
+ * 
+ * If no videos match the current phase, tries to get fallback videos for sunrise and sunset
+ * @param {boolean} dayNightCycleEnabled Whether day-night cycle is enabled
+ * @param {DayNightPhase} dayNightPhase Current day-night phase
  * @param {string} videoUrls Video URLs configuration string
  * @returns {Array.<Video>} List of videos matching the criteria
  */
-function getVideos(dayNightCycleEnabled, isDay, videoUrls) {
-  console.log("getVideos()");
-  if (dayNightCycleEnabled) {
-    return parseCompat(videoUrls).filter(video => {
-      const isDayCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Night;
-      const isNightCycle = video.dayNightCycleAssignment !== Enum.DayNightCycleAssignment.Day;
-      return video.enabled && ((isDay && isDayCycle) || (!isDay && isNightCycle));
-    });
+function getVideos(dayNightCycleEnabled, dayNightPhase, videoUrls) {
+  const videos = parseCompat(videoUrls).filter(video => video.enabled);
+
+  if (!dayNightCycleEnabled) {
+    return videos;
+  }
+
+  const defaultVideos = videos.filter(video => video.dayNightPhase === Enum.DayNightPhase.Unknown);
+  let matchingVideos = getMatchingVideos(videos, dayNightPhase);
+  if (matchingVideos.length > 0) {
+    return matchingVideos.concat(defaultVideos);
+  }
+
+  // try to get fallback videos for sunrise and sunset
+  let fallbackPhase = getFallbackPhase(dayNightPhase);
+  if (fallbackPhase !== Enum.DayNightPhase.Unknown) {
+    matchingVideos = getMatchingVideos(videos, fallbackPhase);
   }
 
-  return parseCompat(videoUrls).filter(video => video.enabled);
+  return matchingVideos.concat(defaultVideos);
 }
 
 /**
- * Find video index by filename
+ * Get video index by filename
  * @param {string} filename Video filename to search for
+ * @param {Array.<Video>} videosConfig List of videos with their properties
  * @returns {int} Matching index, or -1 when not found
  */
 function getVideoIndex(filename, videosConfig) {
@@ -71,29 +114,51 @@ function getVideoIndex(filename, videosConfig) {
 
 /**
  * Get index of the last played video or -1 if not last video exists
- * if day/night cycle is enabled returns the last video for that cycle
- * @param {boolean} dayNightCycleEnabled Whether Day/night cycle is enabled
- * @param {boolean} isDay Whether is day cycle
+ * if day-night cycle is enabled returns the last video for that cycle
+ * @param {boolean} dayNightCycleEnabled Whether day-night cycle is enabled
+ * @param {DayNightPhase} dayNightPhase Current day-night phase
  * @param {KConfigPropertyMap} configuration Wallpaper (WallpaperItem) configuration
  * @param {Array.<Video>} videosConfig List of videos with their properties
  * @returns {int} Video index or -1 if not found
  */
-function getLastVideoIndex(dayNightCycleEnabled, isDay, configuration, videosConfig) {
-  let lastVideo = "";
+function getLastVideoIndex(dayNightCycleEnabled, dayNightPhase, configuration, videosConfig) {
   if (dayNightCycleEnabled) {
-    lastVideo = configuration[isDay ? "LastVideoDay" : "LastVideoNight"];
+    let lastVideos = [];
+    switch (dayNightPhase) {
+      case Enum.DayNightPhase.Day:
+        lastVideos = [configuration.LastDayVideo, configuration.LastVideo];
+        break;
+      case Enum.DayNightPhase.Night:
+        lastVideos = [configuration.LastNightVideo, configuration.LastVideo];
+        break;
+      case Enum.DayNightPhase.Sunrise:
+        lastVideos = [configuration.LastSunriseVideo, configuration.LastDayVideo, configuration.LastVideo];
+        break;
+      case Enum.DayNightPhase.Sunset:
+        lastVideos = [configuration.LastSunsetVideo, configuration.LastNightVideo, configuration.LastVideo];
+        break;
+      default:
+        lastVideos = [configuration.LastVideo];
+    }
+
+    for (let lastVideo of lastVideos) {
+      const index = getVideoIndex(lastVideo, videosConfig);
+      if (lastVideo !== "" && index !== -1) {
+        return index;
+      }
+    }
   } else {
-    lastVideo = main.configuration.LastVideo;
+    const lastVideo = configuration.LastVideo;
+    return lastVideo === "" ? -1 : getVideoIndex(lastVideo, videosConfig);
   }
-  return lastVideo === "" ? -1 : getVideoIndex(lastVideo, videosConfig);
+
+  return -1;
 }
 
 function dumpProps(obj) {
   console.log("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
   for (var k of Object.keys(obj)) {
     const val = obj[k];
-    if (typeof val === 'function') continue;
-    if (k === 'metaData') continue;
     console.log(k + "=" + val + "\n");
   }
 }
diff --git a/package/contents/ui/components/TimePicker.qml b/package/contents/ui/components/TimePicker.qml
index e20256e..5225314 100644
--- a/package/contents/ui/components/TimePicker.qml
+++ b/package/contents/ui/components/TimePicker.qml
@@ -3,12 +3,8 @@ import QtQuick.Layouts
 
 RowLayout {
     id: root
-    required property string label
     property int value
 
-    Label {
-        text: root.label
-    }
     SpinBox {
         id: hours
         from: 0
diff --git a/package/contents/ui/config.qml b/package/contents/ui/config.qml
index 566900d..a573558 100644
--- a/package/contents/ui/config.qml
+++ b/package/contents/ui/config.qml
@@ -70,6 +70,7 @@ ColumnLayout {
     property alias cfg_DayNightCycleMode: dayNightCycleMode.currentValue
     property alias cfg_DayNightCycleSunriseTime: dayNightCycleSunriseTime.value
     property alias cfg_DayNightCycleSunsetTime: dayNightCycleSunsetTime.value
+    property alias cfg_DayNightCycleTransitionDuration: dayNightCycleTransitionDuration.value
     property alias cfg_RandomMode: randomModeCheckbox.checked
     property alias cfg_ResumeLastVideo: resumeLastVideoCheckbox.checked
     property alias cfg_ChangeWallpaperMode: changeWallpaperModeComboBox.currentValue
@@ -85,6 +86,8 @@ ColumnLayout {
     property int editingIndex: -1
     property var validDropExtensions: [".mp4", ".mpg", ".ogg", ".mov", ".webm", ".flv", ".mkv", ".avi", ".wmv", ".gif"]
     property var dayNightPlugin: null
+    property bool showCustomTimeControls: false
+    property string cfg_DarkLightScheduleState
 
     readonly property int seconds: (wallpaperTimerHours.value * 60 * 60) + (wallpaperTimerMinutes.value * 60) + wallpaperTimerSeconds.value
 
@@ -207,7 +210,7 @@ ColumnLayout {
                 playbackRate: item.playbackRate,
                 alternativePlaybackRate: item.alternativePlaybackRate,
                 loop: item.loop,
-                dayNightCycleAssignment: item.dayNightCycleAssignment
+                dayNightPhase: item.dayNightPhase
             });
         }
         cfg_VideoUrls = JSON.stringify(videos);
@@ -227,6 +230,20 @@ ColumnLayout {
         }
     }
 
+    DayNightCycleController {
+        id: dayNightCycleController
+        mode: cfg_DayNightCycleMode
+        sunriseTime: cfg_DayNightCycleSunriseTime
+        sunsetTime: cfg_DayNightCycleSunsetTime
+        transitionDuration: cfg_DayNightCycleTransitionDuration
+        darkLightScheduleState: cfg_DarkLightScheduleState
+        onDarkLightScheduleStateChanged: {
+            if (dayNightCycleController.darkLightScheduleState != root.cfg_DarkLightScheduleState) {
+                root.cfg_DarkLightScheduleState = dayNightCycleController.darkLightScheduleState;
+            }
+        }
+    }
+
     Component.onCompleted: {
         videosModel.initModel(cfg_VideoUrls);
         getAudioDevicesModel();
@@ -368,54 +385,130 @@ ColumnLayout {
         }
 
         RowLayout {
-            Kirigami.FormData.label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Day/Night Switch:")
+            Kirigami.FormData.label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Day-night switch:")
             visible: root.currentTab === 0
 
             ComboBox {
                 id: dayNightCycleMode
+                Layout.preferredWidth: 250
                 model: [
                     {
                         text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Disabled"),
-                        value: Enum.DayNightCycleMode.Disabled
+                        value: Enum.DayNightCycleMode.Disabled,
+                        description: "All videos will be played"
                     },
                     {
-                        text: root.dayNightPlugin !== null ? i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Day-Night Cycle") : i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Based on time"),
-                        value: Enum.DayNightCycleMode.Time
+                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Plasma style"),
+                        value: Enum.DayNightCycleMode.PlasmaStyle,
+                        description: "Current Plasma style's color scheme (light/dark)"
                     },
                     {
-                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Based on Plasma Style"),
-                        value: Enum.DayNightCycleMode.PlasmaStyle
+                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Custom times"),
+                        value: Enum.DayNightCycleMode.Time,
+                        description: "Set custom sunrise/sunset times"
                     },
                     {
-                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Always Day"),
-                        value: Enum.DayNightCycleMode.AlwaysDay
+                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Day-night cycle"),
+                        value: Enum.DayNightCycleMode.DayNightCycle,
+                        description: "Use KDE's Day-Night Cycle service"
                     },
                     {
-                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Always Night"),
-                        value: Enum.DayNightCycleMode.AlwaysNight
+                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Always day"),
+                        value: Enum.DayNightCycleMode.AlwaysDay,
+                        description: "Only play videos set to the day phase"
+                    },
+                    {
+                        text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Always night"),
+                        value: Enum.DayNightCycleMode.AlwaysNight,
+                        description: "Only play videos set to the night phase"
                     }
                 ]
                 textRole: "text"
                 valueRole: "value"
+                delegate: ItemDelegate {
+                    id: delegate
+                    required property var model
+                    width: parent?.width ?? 0
+                    text: model.text
+                    highlighted: model.value === root.cfg_DayNightCycleMode
+                    contentItem: Kirigami.TitleSubtitle {
+                        title: delegate.text
+                        subtitle: model.description
+                        font: delegate.font
+                        selected: delegate.highlighted || delegate.down
+                        wrapMode: Text.WordWrap
+                    }
+                }
+            }
+            Item {
+                implicitHeight: parent.height
+                Layout.preferredWidth: Kirigami.Units.gridUnit
+                Kirigami.Icon {
+                    source: Qt.resolvedUrl("../icons/dayNight/" + ["night", "sunrise", "day", "sunset", "disabled"][dayNightCycleController.currentPhase] + ".svg")
+                    fallback: "unknown"
+                    anchors.centerIn: parent
+                    implicitHeight: Kirigami.Units.iconSizes.smallMedium
+                    implicitWidth: Kirigami.Units.iconSizes.smallMedium
+                }
             }
             Button {
-                visible: root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.Time && root.dayNightPlugin !== null
-                enabled: KConfig.KAuthorized.authorizeControlModule("kcm_nighttime")
-                text: i18nc("@action:button Configure day-night cycle times", "Configure…")
+                visible: root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.DayNightCycle
+                enabled: KConfig.KAuthorized.authorizeControlModule("kcm_nighttime") && root.dayNightPlugin !== null
+                text: i18ndc("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "@action:button Configure day-night cycle times", "Configure…")
                 icon.name: "configure"
                 onClicked: KCM.KCMLauncher.open("kcm_nighttime")
+                Layout.preferredHeight: parent.height
+            }
+            Button {
+                visible: root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.Time
+                text: i18ndc("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "@action:button Configure custom day-night times", "Configure")
+                icon.name: "configure"
+                checkable: true
+                checked: root.showCustomTimeControls
+                onClicked: root.showCustomTimeControls = !root.showCustomTimeControls
+                Layout.preferredHeight: parent.height
             }
         }
-        ColumnLayout {
-            visible: root.currentTab === 0 && root.dayNightPlugin === null && root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.Time
-            enabled: dayNightCycleMode.currentValue === Enum.DayNightCycleMode.Time
-            Components.TimePicker {
-                id: dayNightCycleSunriseTime
-                label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Sunrise:")
+        Label {
+            id: dayNightCyclePluginWarning
+            visible: root.currentTab === 0 && root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.DayNightCycle && root.dayNightPlugin === null
+            color: Kirigami.Theme.negativeTextColor
+            text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "⚠ The C++ plugin is not available, this feature will not work. Switch to the Smart Video Wallpaper Reborn package for your distribution if available, or build the plugin from source. See <a href='%1'>install instructions</a>.", "https://github.com/luisbocanegra/plasma-smart-video-wallpaper-reborn#installing")
+            wrapMode: Label.WordWrap
+            font: Kirigami.Theme.smallFont
+            onLinkActivated: Qt.openUrlExternally(link)
+            Layout.fillWidth: true
+            Layout.preferredWidth: 450
+        }
+        Components.TimePicker {
+            id: dayNightCycleSunriseTime
+            Kirigami.FormData.label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Sunrise:")
+            visible: root.currentTab === 0 && root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.Time && root.showCustomTimeControls
+        }
+        Components.TimePicker {
+            id: dayNightCycleSunsetTime
+            Kirigami.FormData.label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Sunset:")
+            visible: root.currentTab === 0 && root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.Time && root.showCustomTimeControls
+        }
+
+        SpinBox {
+            id: dayNightCycleTransitionDuration
+            Kirigami.FormData.label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Transition duration:")
+            visible: root.currentTab === 0 && root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.Time && root.showCustomTimeControls
+            from: 1
+            to: 60
+            stepSize: 1
+            editable: true
+            readonly property regexp reExtractNum: /\D*?(-?\d*\.?\d*)\D*$/
+
+            validator: RegularExpressionValidator {
+                regularExpression: dayNightCycleTransitionDuration.reExtractNum
             }
-            Components.TimePicker {
-                id: dayNightCycleSunsetTime
-                label: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Sunset: ")
+            textFromValue: function (value, locale) {
+                return i18np("%1 minute", "%1 minutes", value);
+            }
+            valueFromText: function (text, locale) {
+                return parseInt(text);
             }
         }
 
@@ -1184,7 +1277,18 @@ ColumnLayout {
                     required property real playbackRate
                     required property real alternativePlaybackRate
                     required property bool loop
-                    required property int dayNightCycleAssignment
+                    required property int dayNightPhase
+                    readonly property string icon: Qt.resolvedUrl("../icons/dayNight/" + ["night", "sunrise", "day", "sunset", "disabled"][dayNightPhase] + ".svg")
+                    // qmlformat off
+                    readonly property string displayText: [
+                        i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Night"),
+                        i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Sunrise"),
+                        i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Day"),
+                        i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Sunset"),
+                        i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Disabled")
+                    ][dayNightPhase]
+                    // qmlformat on
+                    readonly property bool isPhase: itemDelegate.dayNightPhase !== Enum.DayNightPhase.Unknown
                     implicitWidth: ListView.view.width
                     implicitHeight: delegate.height
                     ItemDelegate {
@@ -1289,21 +1393,30 @@ ColumnLayout {
                             }
 
                             Button {
-                                readonly property int currAssignment: itemDelegate.dayNightCycleAssignment
-                                readonly property bool notBoth: currAssignment !== Enum.DayNightCycleAssignment.Both
-                                icon.name: ["night-light-disabled-symbolic", "weather-clear-symbolic", "weather-clear-night-symbolic"][currAssignment]
                                 enabled: itemDelegate.enabled
-                                highlighted: notBoth
-                                icon.color: notBoth ? Kirigami.Theme.highlightColor : root.Kirigami.Theme.textColor
-                                onClicked: videosModel.updateItem(itemDelegate.index, "dayNightCycleAssignment", (currAssignment + 1) % 3)
+                                contentItem: Item {
+                                    implicitHeight: Kirigami.Units.gridUnit * 2
+                                    Kirigami.Icon {
+                                        source: itemDelegate.icon
+                                        fallback: "unknown"
+                                        anchors.centerIn: parent
+                                        implicitHeight: Kirigami.Units.iconSizes.smallMedium
+                                        implicitWidth: Kirigami.Units.iconSizes.smallMedium
+                                        color: itemDelegate.isPhase ? root.Kirigami.Theme.highlightColor : root.Kirigami.Theme.textColor
+                                        isMask: true
+                                    }
+                                }
+                                checkable: true
+                                checked: itemDelegate.isPhase
+                                highlighted: itemDelegate.isPhase
+                                onClicked: videosModel.updateItem(itemDelegate.index, "dayNightPhase", (itemDelegate.dayNightPhase + 1) % 5)
                                 Layout.fillHeight: true
-                                Layout.preferredWidth: height
-                                Kirigami.Theme.colorSet: Kirigami.Theme.View
-                                Kirigami.Theme.textColor: notBoth ? Kirigami.Theme.highlightColor : root.Kirigami.Theme.textColor
-                                Kirigami.Theme.highlightColor: notBoth ? Kirigami.Theme.highlightColor : root.Kirigami.Theme.highlightColor
+                                Kirigami.Theme.colorSet: root.Kirigami.Theme.View
+                                Kirigami.Theme.textColor: itemDelegate.isPhase ? root.Kirigami.Theme.highlightColor : root.Kirigami.Theme.textColor
+                                Kirigami.Theme.highlightColor: itemDelegate.isPhase ? root.Kirigami.Theme.highlightColor : root.Kirigami.Theme.highlightColor
                                 ToolTip.delay: 1000
                                 ToolTip.visible: hovered
-                                ToolTip.text: i18n("Tells if video will be displayed during the day, night or both.")
+                                ToolTip.text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "Phase of the day at which this video will play. If set to <strong>Disabled</strong> the video will play regardless of the current phase. <br>Current: <strong>%1</strong>", itemDelegate.displayText)
                             }
 
                             Button {
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index 14477d2..675eb9f 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -38,7 +38,7 @@ WallpaperItem {
     property bool isLoading: true
     property string videoUrls: main.configuration.VideoUrls
     property var videosConfig: {
-        let videos = Utils.getVideos(dayNightCycleEnabled, isDay, videoUrls);
+        let videos = Utils.getVideos(dayNightCycleEnabled, dayNightPhase, videoUrls);
         if (randomMode && videos.length > 1) {
             Utils.shuffleArray(videos);
         }
@@ -51,7 +51,7 @@ WallpaperItem {
     property int currentVideoIndex: 0
     property string lastSelectedVideo: ""
     property bool resumeLastVideo: main.configuration.ResumeLastVideo
-    property alias isDay: dayNightCycleController.isDay
+    property alias dayNightPhase: dayNightCycleController.currentPhase
     property var currentSource: Utils.createVideo("")
     property int pauseBatteryLevel: main.configuration.PauseBatteryLevel
     property bool shouldPlay: {
@@ -210,7 +210,7 @@ WallpaperItem {
         let preferredIndex = -1;
 
         if (resumeLastVideo) {
-            preferredIndex = Utils.getLastVideoIndex(dayNightCycleEnabled, isDay, main.configuration, videosConfig);
+            preferredIndex = Utils.getLastVideoIndex(dayNightCycleEnabled, dayNightPhase, main.configuration, videosConfig);
         }
 
         if (preferredIndex === -1) {
@@ -344,19 +344,26 @@ WallpaperItem {
     onCurrentSourceChanged: {
         if (currentSource.filename !== "") {
             lastSelectedVideo = currentSource.filename;
-            main.saveLastSource(main.currentSource.filename, main.isDay);
+            main.saveLastSource(main.currentSource.filename, main.dayNightPhase);
         }
     }
 
     DayNightCycleController {
         id: dayNightCycleController
-        enabled: main.dayNightCycleEnabled
         mode: main.configuration.DayNightCycleMode
         sunriseTime: main.configuration.DayNightCycleSunriseTime
         sunsetTime: main.configuration.DayNightCycleSunsetTime
-        onIsDayChanged: {
+        transitionDuration: main.configuration.DayNightCycleTransitionDuration
+        onCurrentPhaseChanged: {
             updateVideoDebounce.restart();
         }
+        darkLightScheduleState: main.configuration.DarkLightScheduleState
+        onDarkLightScheduleStateChanged: {
+            if (main.configuration.DarkLightScheduleState != dayNightCycleController.darkLightScheduleState) {
+                main.configuration.DarkLightScheduleState = dayNightCycleController.darkLightScheduleState;
+                main.configuration.writeConfig();
+            }
+        }
     }
 
     Rectangle {
@@ -452,7 +459,7 @@ WallpaperItem {
                     text += `crossfadeDuration: ${player.crossfadeDuration} ${player.crossfadeMinDurationLast} ${player.crossfadeMinDurationCurrent}\n`;
                     text += `multipleVideos: ${player.multipleVideos}\n`;
                     text += `player: ${player.player.objectName}\n`;
-                    text += `mediaStatus: ${player.player.mediaStatus}\n`;
+                    text += `mediaStatus: ${["NoMedia", "LoadingMedia", "LoadedMedia", "StalledMedia", "BufferingMedia", "BufferedMedia", "EndOfMedia", "InvalidMedia"][player.player.mediaStatus]}\n`;
                     text += `player1 playing: ${player.player1.playing}\n`;
                     text += `player2 playing: ${player.player2.playing}\n`;
                     text += `position: ${player.player.position}\n`;
@@ -464,10 +471,9 @@ WallpaperItem {
                     text += `inLockScreen: ${main.lockScreenMode}\n`;
                     text += `screenLocked: ${main.screenLocked}\n`;
                     text += `showBlur: ${main.showBlur}\n`;
-                    text += `Audio Device: ${player.player1.currentAudioDevice}`;
-                    text += `isDay: ${main.isDay}\n`;
-                    text += `dayNightCycleEnabled: ${main.dayNightCycleEnabled}\n`;
-                    text += `dayNightCycleMode: ${main.configuration.DayNightCycleMode}\n`;
+                    text += `Audio Device: ${player.player1.currentAudioDevice}\n`;
+                    text += `dayNightPhase: ${["night", "sunrise", "day", "sunset", "unknown"][main.dayNightPhase]}\n`;
+                    text += `dayNightCycleMode: ${["disabled", "dayNightCycle", "time", "plasmaStyle", "alwaysDay", "alwaysNight"][main.configuration.DayNightCycleMode]}\n`;
                     text += `id: ${Plasmoid.id}`;
                     return text;
                 }
@@ -544,17 +550,26 @@ WallpaperItem {
         }
     }
 
-    function saveLastSource(filename, cycleIsDay) {
+    function saveLastSource(filename, dayNightPhase) {
         if (filename === "") {
             return;
         }
 
         main.configuration.LastVideo = filename;
         if (dayNightCycleEnabled) {
-            if (cycleIsDay) {
-                main.configuration.LastVideoDay = filename;
-            } else {
-                main.configuration.LastVideoNight = filename;
+            switch (dayNightPhase) {
+            case Enum.DayNightPhase.Day:
+                main.configuration.LastDayVideo = filename;
+                break;
+            case Enum.DayNightPhase.Night:
+                main.configuration.LastNightVideo = filename;
+                break;
+            case Enum.DayNightPhase.Sunrise:
+                main.configuration.LastSunriseVideo = filename;
+                break;
+            case Enum.DayNightPhase.Sunset:
+                main.configuration.LastSunsetVideo = filename;
+                break;
             }
         }
     }
@@ -571,7 +586,7 @@ WallpaperItem {
     Connections {
         target: Qt.application
         function onAboutToQuit() {
-            main.saveLastSource(main.currentSource.filename || main.lastSelectedVideo, main.isDay);
+            main.saveLastSource(main.currentSource.filename || main.lastSelectedVideo, main.dayNightPhase);
             main.saveLastPosition();
             main.configuration.writeConfig();
         }
diff --git a/plugin/nighttime.cpp b/plugin/nighttime.cpp
index 7b84f8a..717ad4a 100644
--- a/plugin/nighttime.cpp
+++ b/plugin/nighttime.cpp
@@ -96,6 +96,8 @@ void DayNight::componentComplete()
         setState(m_darkLightScheduleProvider->state());
         schedule();
     });
+
+    schedule();
 }
 
 void DayNight::schedule()
@@ -114,19 +116,18 @@ void DayNight::update()
 {
     const QDateTime now = QDateTime::currentDateTime();
 
-    DayNightPhase phase = DayNightPhase::from(now, m_previousTransition, m_nextTransition);
-
-    const bool isDay = phase == DayNightPhase::Day || phase == DayNightPhase::Sunset;
+    const DayNightPhase currentPhase = DayNightPhase::from(now, m_previousTransition, m_nextTransition);
 
-    if (m_isDay != isDay) {
-        m_isDay = isDay;
-        emit isDayChanged(isDay);
+    if (m_phase != currentPhase) {
+        m_phase = currentPhase;
+        emit phaseChanged();
     }
 
     const int blendInterval = 60000;
-    switch (phase) {
+    switch (currentPhase) {
     case DayNightPhase::Night:
     case DayNightPhase::Day:
+    case DayNightPhase::Unknown:
         m_transitionUpdateTimer->stop();
         break;
     case DayNightPhase::Sunrise:
@@ -152,9 +153,9 @@ void DayNight::setState(const QString &state)
     }
 }
 
-bool DayNight::isDay() const
+int DayNight::phase() const
 {
-    return m_isDay;
+    return m_phase;
 }
 
 QString DayNight::initialState() const
diff --git a/plugin/nighttime.h b/plugin/nighttime.h
index ef4255a..ebc2b52 100644
--- a/plugin/nighttime.h
+++ b/plugin/nighttime.h
@@ -24,6 +24,7 @@ class DayNightPhase
         Sunrise,
         Day,
         Sunset,
+        Unknown,
     };
 
     DayNightPhase();
@@ -52,7 +53,7 @@ class DayNight : public QObject, public QQmlParserStatus
     Q_INTERFACES(QQmlParserStatus)
     QML_ELEMENT
 
-    Q_PROPERTY(bool isDay READ isDay NOTIFY isDayChanged)
+    Q_PROPERTY(int phase READ phase NOTIFY phaseChanged)
     Q_PROPERTY(QString initialState READ initialState WRITE setInitialState NOTIFY initialStateChanged)
     Q_PROPERTY(QString state READ state NOTIFY stateChanged)
 
@@ -62,7 +63,7 @@ class DayNight : public QObject, public QQmlParserStatus
     void classBegin() override;
     void componentComplete() override;
 
-    bool isDay() const;
+    int phase() const;
 
     QString initialState() const;
     void setInitialState(const QString &state);
@@ -72,7 +73,7 @@ class DayNight : public QObject, public QQmlParserStatus
 
 signals:
 
-    void isDayChanged(bool isDay);
+    void phaseChanged();
     void initialStateChanged();
     void stateChanged();
 
@@ -89,7 +90,7 @@ class DayNight : public QObject, public QQmlParserStatus
     QString m_initialState;
     QString m_state;
 
-    bool m_isDay = false;
+    int m_phase = DayNightPhase::Unknown;
 };
 
 #endif

From d031239ad766719e25690fbee04da8c3c300578a Mon Sep 17 00:00:00 2001
From: Luis Bocanegra <luisbocanegra@users.noreply.github.com>
Date: Fri, 1 May 2026 19:33:47 -0600
Subject: [PATCH 13/13] refactor qml plugin

* Port to ecm_add_qml_module
* Use declarative type registration
* Update URI
* Remove redundant creation DayNight object in settings page
---
 .../contents/ui/DayNightCycleController.qml   |  6 ++--
 package/contents/ui/DayNightCyclePlugin.qml   |  4 +--
 package/contents/ui/config.qml                | 10 ++-----
 plugin/CMakeLists.txt                         | 30 +++++++++++++------
 plugin/{nighttime.cpp => daynight.cpp}        |  2 +-
 plugin/{nighttime.h => daynight.h}            |  4 +--
 plugin/nighttimeplugin.cpp                    | 19 ------------
 plugin/qmldir                                 |  2 --
 plugin/smartvideowallpaperplugin.cpp          | 11 +++++++
 9 files changed, 42 insertions(+), 46 deletions(-)
 rename plugin/{nighttime.cpp => daynight.cpp} (99%)
 rename plugin/{nighttime.h => daynight.h} (98%)
 delete mode 100644 plugin/nighttimeplugin.cpp
 delete mode 100644 plugin/qmldir
 create mode 100644 plugin/smartvideowallpaperplugin.cpp

diff --git a/package/contents/ui/DayNightCycleController.qml b/package/contents/ui/DayNightCycleController.qml
index 82f07aa..f59b21b 100644
--- a/package/contents/ui/DayNightCycleController.qml
+++ b/package/contents/ui/DayNightCycleController.qml
@@ -50,9 +50,9 @@ Item {
         if (component.status === Component.Ready) {
             dayNightPlugin = component.createObject(root);
             dayNightPlugin.initialState = root.darkLightScheduleState;
-            dayNightPlugin.stateChanged.connect(() => {
-                if (root.darkLightScheduleState != dayNightPlugin.state) {
-                    root.darkLightScheduleState = dayNightPlugin.state;
+            dayNightPlugin.scheduleStateChanged.connect(() => {
+                if (root.darkLightScheduleState != dayNightPlugin.scheduleState) {
+                    root.darkLightScheduleState = dayNightPlugin.scheduleState;
                 }
             });
         } else {
diff --git a/package/contents/ui/DayNightCyclePlugin.qml b/package/contents/ui/DayNightCyclePlugin.qml
index 7c21148..a745877 100644
--- a/package/contents/ui/DayNightCyclePlugin.qml
+++ b/package/contents/ui/DayNightCyclePlugin.qml
@@ -1,9 +1,9 @@
 import QtQuick
-import com.github.luisbocanegra.svwr.nighttime 1.0
+import com.github.luisbocanegra.svwr 1.0
 
 Item {
     readonly property alias phase: dayNight.phase
-    readonly property alias state: dayNight.state
+    readonly property alias scheduleState: dayNight.state
     property alias initialState: dayNight.initialState
     DayNight {
         id: dayNight
diff --git a/package/contents/ui/config.qml b/package/contents/ui/config.qml
index a573558..3576a7d 100644
--- a/package/contents/ui/config.qml
+++ b/package/contents/ui/config.qml
@@ -85,7 +85,6 @@ ColumnLayout {
     property alias cfg_MuteMode: muteModeCombo.currentValue
     property int editingIndex: -1
     property var validDropExtensions: [".mp4", ".mpg", ".ogg", ".mov", ".webm", ".flv", ".mkv", ".avi", ".wmv", ".gif"]
-    property var dayNightPlugin: null
     property bool showCustomTimeControls: false
     property string cfg_DarkLightScheduleState
 
@@ -247,11 +246,6 @@ ColumnLayout {
     Component.onCompleted: {
         videosModel.initModel(cfg_VideoUrls);
         getAudioDevicesModel();
-        try {
-            dayNightPlugin = Qt.createQmlObject("import com.github.luisbocanegra.svwr.nighttime 1.0; DayNight {}", root);
-        } catch (e) {
-            console.warn("QML Plugin com.github.luisbocanegra.svwr.nighttime not found, will use fixed times");
-        }
     }
 
     Kirigami.FormLayout {
@@ -453,7 +447,7 @@ ColumnLayout {
             }
             Button {
                 visible: root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.DayNightCycle
-                enabled: KConfig.KAuthorized.authorizeControlModule("kcm_nighttime") && root.dayNightPlugin !== null
+                enabled: KConfig.KAuthorized.authorizeControlModule("kcm_nighttime") && dayNightCycleController.dayNightPlugin !== null
                 text: i18ndc("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "@action:button Configure day-night cycle times", "Configure…")
                 icon.name: "configure"
                 onClicked: KCM.KCMLauncher.open("kcm_nighttime")
@@ -471,7 +465,7 @@ ColumnLayout {
         }
         Label {
             id: dayNightCyclePluginWarning
-            visible: root.currentTab === 0 && root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.DayNightCycle && root.dayNightPlugin === null
+            visible: root.currentTab === 0 && root.cfg_DayNightCycleMode == Enum.DayNightCycleMode.DayNightCycle && dayNightCycleController.dayNightPlugin === null
             color: Kirigami.Theme.negativeTextColor
             text: i18nd("plasma_wallpaper_luisbocanegra.smart.video.wallpaper.reborn", "⚠ The C++ plugin is not available, this feature will not work. Switch to the Smart Video Wallpaper Reborn package for your distribution if available, or build the plugin from source. See <a href='%1'>install instructions</a>.", "https://github.com/luisbocanegra/plasma-smart-video-wallpaper-reborn#installing")
             wrapMode: Label.WordWrap
diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
index 6cbad6c..fe0094c 100644
--- a/plugin/CMakeLists.txt
+++ b/plugin/CMakeLists.txt
@@ -1,17 +1,29 @@
-set(PLUGIN_NAME "nighttimeplugin")
-set(LIB_NAME "nighttime")
-
-add_library(${PLUGIN_NAME} SHARED ${PLUGIN_NAME}.cpp ${LIB_NAME}.cpp)
-find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Qml Gui)
+include(ECMQmlModule)
+find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Qml)
 find_package(KNightTime ${PROJECT_DEP_VERSION} CONFIG REQUIRED)
 find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS KCMUtils)
 
-target_link_libraries(${PLUGIN_NAME}
+set(daynight_SRCS
+    daynight.cpp daynight.h
+)
+
+add_library(plasma_wallpaper_svw_static STATIC ${daynight_SRCS})
+set_property(TARGET plasma_wallpaper_svw_static PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+target_link_libraries(plasma_wallpaper_svw_static
     Qt6::Qml
-    Qt6::Gui
     KF6::KCMUtils
     KNightTime
 )
 
-install(TARGETS ${PLUGIN_NAME} DESTINATION ${KDE_INSTALL_QMLDIR}/com/github/luisbocanegra/svwr/${LIB_NAME})
-install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/com/github/luisbocanegra/svwr/${LIB_NAME})
+ecm_add_qml_module(plasma_wallpaper_svw URI "com.github.luisbocanegra.svwr" VERSION 1.0 CLASS_NAME DayNight)
+
+qt_generate_foreign_qml_types(plasma_wallpaper_svw_static plasma_wallpaper_svw)
+
+target_sources(plasma_wallpaper_svw PRIVATE smartvideowallpaperplugin.cpp)
+
+target_link_libraries(plasma_wallpaper_svw PRIVATE
+    plasma_wallpaper_svw_static
+)
+
+ecm_finalize_qml_module(plasma_wallpaper_svw)
diff --git a/plugin/nighttime.cpp b/plugin/daynight.cpp
similarity index 99%
rename from plugin/nighttime.cpp
rename to plugin/daynight.cpp
index 717ad4a..f2c1ca5 100644
--- a/plugin/nighttime.cpp
+++ b/plugin/daynight.cpp
@@ -5,7 +5,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "nighttime.h"
+#include "daynight.h"
 
 DayNightPhase::DayNightPhase()
     : m_kind(Night)
diff --git a/plugin/nighttime.h b/plugin/daynight.h
similarity index 98%
rename from plugin/nighttime.h
rename to plugin/daynight.h
index ebc2b52..2bdd377 100644
--- a/plugin/nighttime.h
+++ b/plugin/daynight.h
@@ -5,8 +5,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#ifndef NIGHTTIME_H
-#define NIGHTTIME_H
+#ifndef DAYNIGHT_H
+#define DAYNIGHT_H
 
 #pragma once
 #include <KDarkLightScheduleProvider>
diff --git a/plugin/nighttimeplugin.cpp b/plugin/nighttimeplugin.cpp
deleted file mode 100644
index 04f72df..0000000
--- a/plugin/nighttimeplugin.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "nighttime.h"
-
-#include <QGuiApplication>
-#include <QQmlEngine>
-#include <QQmlExtensionPlugin>
-
-class DayNightPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    void registerTypes(const char *uri) override
-    {
-        qmlRegisterType<DayNight>(uri, 1, 0, "DayNight");
-    }
-};
-
-#include "nighttimeplugin.moc"
diff --git a/plugin/qmldir b/plugin/qmldir
deleted file mode 100644
index 2ba7874..0000000
--- a/plugin/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-module com.github.luisbocanegra.svwr.nighttime
-plugin nighttimeplugin
diff --git a/plugin/smartvideowallpaperplugin.cpp b/plugin/smartvideowallpaperplugin.cpp
new file mode 100644
index 0000000..2dcc068
--- /dev/null
+++ b/plugin/smartvideowallpaperplugin.cpp
@@ -0,0 +1,11 @@
+#include <QQmlEngine>
+#include <QQmlExtensionPlugin>
+#include <qqmlextensionplugin.h>
+
+class DayNightPlugin : public QQmlEngineExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
+};
+
+#include "smartvideowallpaperplugin.moc"