diff --git a/.gitignore b/.gitignore
index 12f8be1..ed7bc8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ custom_images/
 *.txt
 selected/
 __pycache__
-*.svg
\ No newline at end of file
+time_bar.svg
\ No newline at end of file
diff --git a/CHANGELOG b/CHANGELOG
index 01b2236..ba52464 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+# Version 2.0 (upcoming)
+- New App icon
+- Preferences window redesign - All settings are now in one window accessable!
+- Graphic visualizing of the time periods of a day with a bar chart
+- Adding custom time periods by user choice
+- Adding folder as image source
+- Option to display image on lock screens
+- Bugfixes
+- Remove support for Cinnamon 5.2 and older
+
 # Version 1.4
 - Log System
 - Bugfixes
diff --git a/README.md b/README.md
index fa05028..d88cbe1 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,21 @@
 # Cinnamon Dynamic Wallpaper
+<img src="cinnamon-dynamic-wallpaper@TobiZog/5.4/icons/icon.svg" alt="drawing" width="200" style="margin-left:auto; margin-right:auto; width:50%; display:block"/>
 
 ![](res/wallpaper_merged.jpg)
 
 ## About the project
-Based on a location, this extension calculates the periods of a day and switches the background image of your Cinnamon desktop. The extension offers the choice between a set of included wallpapers or to select a HEIC-file.
+This extension switches the background image of your Cinnamon desktop multiple times in a day, based on a location or custom time periods. You can choose between included image-sets, your own HEIC-file or a source folder with single images. Configuration through a user-friendly configuration window.
 
 ### Features
 - 8 included image sets
-- 9 day periods
+- 10 day periods
 - HEIF converter
-- Image configuration assistent with simple one-click setup for image choose
+- Image configuration assistent with simple one-click setup for image choices
 - Online location estimation or offline with manual latitude and longitude input
+- Time periods individual configured by user
 - Offline sun angles estimation
 - Image stretching over multiple displays or repeat image for every display
+- Show image on lock screen
 
 ### Tested Cinnamon versions
 - 5.4 (Mint 21)
@@ -27,10 +30,9 @@ Based on a location, this extension calculates the periods of a day and switches
 
 ### Technology
 - Using `JavaScript` for
-	- Sun angle estimation
 	- Location estimation
 	- Change of the desktop wallpapers
-- `Python` displays the Image Configurator
+- `Python` displays the preference window
 - Image Configurator UI was written with `Glade`
 
 ## Installation
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/icon.png b/cinnamon-dynamic-wallpaper@TobiZog/5.4/icon.png
deleted file mode 120000
index 9db683c..0000000
--- a/cinnamon-dynamic-wallpaper@TobiZog/5.4/icon.png
+++ /dev/null
@@ -1 +0,0 @@
-icons/icon.png
\ No newline at end of file
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/icon.svg b/cinnamon-dynamic-wallpaper@TobiZog/5.4/icon.svg
new file mode 120000
index 0000000..81b6634
--- /dev/null
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/icon.svg
@@ -0,0 +1 @@
+icons/icon.svg
\ No newline at end of file
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/icons/icon.png b/cinnamon-dynamic-wallpaper@TobiZog/5.4/icons/icon.png
deleted file mode 100644
index d9aa7a8..0000000
Binary files a/cinnamon-dynamic-wallpaper@TobiZog/5.4/icons/icon.png and /dev/null differ
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/icons/icon.svg b/cinnamon-dynamic-wallpaper@TobiZog/5.4/icons/icon.svg
new file mode 100644
index 0000000..4c071a2
--- /dev/null
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/icons/icon.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <linearGradient id="a" gradientTransform="matrix(0.232143 0 0 0.328947 -9.109985 263.79837)" gradientUnits="userSpaceOnUse" x1="88.595886" x2="536.595886" y1="-449.394012" y2="-449.394012">
+        <stop offset="0" stop-color="#77767b"/>
+        <stop offset="0.0384615" stop-color="#c0bfbc"/>
+        <stop offset="0.0768555" stop-color="#9a9996"/>
+        <stop offset="0.923077" stop-color="#9a9996"/>
+        <stop offset="0.961538" stop-color="#c0bfbc"/>
+        <stop offset="1" stop-color="#77767b"/>
+    </linearGradient>
+    <linearGradient id="b" gradientTransform="matrix(0.978582 0 0 0.937323 -9.031522 -9.577706)" gradientUnits="userSpaceOnUse" x1="20.937046" x2="127.213333" y1="76.334984" y2="76.334984">
+        <stop offset="0" stop-color="#066996"/>
+        <stop offset="1" stop-color="#001533"/>
+    </linearGradient>
+    <path d="m 19.457031 15.972656 h 88 c 4.417969 0 8 3.582032 8 8 v 84 c 0 4.417969 -3.582031 8 -8 8 h -88 c -4.417969 0 -8 -3.582031 -8 -8 v -84 c 0 -4.417968 3.582031 -8 8 -8 z m 0 0" fill="url(#a)"/>
+    <path d="m 17.328125 11.972656 h 92.257813 c 3.242187 0 5.871093 2.519532 5.871093 5.625 v 88.75 c 0 3.105469 -2.628906 5.625 -5.871093 5.625 h -92.257813 c -3.242187 0 -5.871094 -2.519531 -5.871094 -5.625 v -88.75 c 0 -3.105468 2.628907 -5.625 5.871094 -5.625 z m 0 0" fill="url(#b)"/>
+    <path d="m 63.945312 74.6875 c 0 10.257812 -8.671874 18.574219 -19.367187 18.574219 s -19.367187 -8.316407 -19.367187 -18.574219 s 8.671874 -18.574219 19.367187 -18.574219 s 19.367187 8.316407 19.367187 18.574219 z m 0 0" fill="#f7c22c"/>
+    <path d="m 61.160156 74.136719 c 0 10.03125 -8.128906 18.164062 -18.160156 18.164062 c -10.027344 0 -18.160156 -8.132812 -18.160156 -18.164062 c 0 -10.027344 8.132812 -18.160157 18.160156 -18.160157 c 10.03125 0 18.160156 8.132813 18.160156 18.160157 z m 0 0" fill="#f7d97e"/>
+    <path d="m 85.46875 19.277344 c 7.65625 3.941406 12.472656 11.832031 12.472656 20.445312 c 0 12.695313 -10.292968 22.992188 -22.992187 22.992188 c -0.074219 -0.007813 -0.148438 -0.011719 -0.222657 -0.019532 c 3.253907 1.679688 6.863282 2.558594 10.527344 2.5625 c 12.695313 0 22.992188 -10.296874 22.992188 -22.992187 c -0.003906 -12.613281 -10.167969 -22.871094 -22.777344 -22.988281 z m 0 0" fill="#eaa22f"/>
+    <path d="m 82.804688 18.175781 c 7.660156 3.9375 12.472656 11.828125 12.476562 20.441407 c 0 12.699218 -10.296875 22.992187 -22.992188 22.992187 c -0.078124 -0.003906 -0.152343 -0.011719 -0.226562 -0.015625 c 3.253906 1.679688 6.863281 2.554688 10.527344 2.558594 c 12.699218 0 22.992187 -10.292969 22.992187 -22.992188 c -0.003906 -12.613281 -10.164062 -22.867187 -22.777343 -22.984375 z m 0 0" fill="#ffc61b"/>
+    <g fill="#f7d97e">
+        <path d="m 44.394531 45.09375 c 0.527344 0 0.953125 0.445312 0.953125 1 v 7.558594 c 0 0.554687 -0.425781 1 -0.953125 1 c -0.527343 0 -0.957031 -0.445313 -0.957031 -1 v -7.558594 c 0 -0.554688 0.429688 -1 0.957031 -1 z m 0 0"/>
+        <path d="m 44.222656 94.574219 c 0.527344 0 0.953125 0.449219 0.953125 1 v 7.5625 c 0 0.554687 -0.425781 1 -0.953125 1 s -0.957031 -0.445313 -0.957031 -1 v -7.5625 c 0 -0.550781 0.429687 -1 0.957031 -1 z m 0 0"/>
+        <path d="m 65.402344 74.839844 c 0 -0.527344 0.449218 -0.953125 1 -0.953125 h 7.5625 c 0.550781 0 1 0.425781 1 0.953125 s -0.449219 0.957031 -1 0.957031 h -7.5625 c -0.550782 0 -1 -0.429687 -1 -0.957031 z m 0 0"/>
+        <path d="m 13.84375 74.300781 c 0 -0.527343 0.445312 -0.957031 1 -0.957031 h 7.558594 c 0.554687 0 1 0.429688 1 0.957031 c 0 0.527344 -0.445313 0.953125 -1 0.953125 h -7.558594 c -0.554688 0 -1 -0.425781 -1 -0.953125 z m 0 0"/>
+        <path d="m 22.230469 53.699219 c 0.371093 -0.375 0.988281 -0.359375 1.378906 0.03125 l 5.347656 5.347656 c 0.390625 0.390625 0.40625 1.007813 0.03125 1.382813 c -0.371093 0.371093 -0.992187 0.355468 -1.382812 -0.035157 l -5.34375 -5.34375 c -0.390625 -0.390625 -0.40625 -1.011719 -0.03125 -1.382812 z m 0 0"/>
+        <path d="m 59.175781 88.910156 c 0.371094 -0.375 0.992188 -0.359375 1.382813 0.03125 l 5.347656 5.347656 c 0.390625 0.390626 0.402344 1.007813 0.03125 1.382813 c -0.375 0.371094 -0.992188 0.355469 -1.382812 -0.035156 l -5.347657 -5.34375 c -0.390625 -0.390625 -0.40625 -1.011719 -0.03125 -1.382813 z m 0 0"/>
+        <path d="m 59.378906 60.664062 c -0.371094 -0.371093 -0.359375 -0.992187 0.03125 -1.382812 l 5.347656 -5.34375 c 0.390626 -0.390625 1.007813 -0.40625 1.382813 -0.035156 c 0.371094 0.375 0.359375 0.992187 -0.03125 1.382812 l -5.347656 5.347656 c -0.390625 0.390626 -1.007813 0.40625 -1.382813 0.03125 z m 0 0"/>
+        <path d="m 22.867188 95.21875 c -0.375 -0.375 -0.359376 -0.992188 0.03125 -1.382812 l 5.34375 -5.347657 c 0.390624 -0.390625 1.011718 -0.40625 1.382812 -0.03125 c 0.375 0.371094 0.359375 0.992188 -0.03125 1.382813 l -5.347656 5.347656 c -0.390625 0.390625 -1.007813 0.402344 -1.378906 0.03125 z m 0 0"/>
+    </g>
+</svg>
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences/preferences.glade b/cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences/preferences.glade
index 57b6b10..a62d846 100644
--- a/cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences/preferences.glade
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences/preferences.glade
@@ -29,7 +29,7 @@
     <property name="window-position">center</property>
     <property name="default-width">1024</property>
     <property name="default-height">400</property>
-    <property name="icon">../icon.png</property>
+    <property name="icon">../icon.svg</property>
     <property name="gravity">center</property>
     <signal name="destroy" handler="onDestroy" swapped="no"/>
     <child>
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/icon.png b/cinnamon-dynamic-wallpaper@TobiZog/icon.png
deleted file mode 120000
index 3c8c923..0000000
--- a/cinnamon-dynamic-wallpaper@TobiZog/icon.png
+++ /dev/null
@@ -1 +0,0 @@
-5.4/icons/icon.png
\ No newline at end of file
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/icon.svg b/cinnamon-dynamic-wallpaper@TobiZog/icon.svg
new file mode 120000
index 0000000..9f41539
--- /dev/null
+++ b/cinnamon-dynamic-wallpaper@TobiZog/icon.svg
@@ -0,0 +1 @@
+5.4/icons/icon.svg
\ No newline at end of file