diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/extension.js b/cinnamon-dynamic-wallpaper@TobiZog/5.4/extension.js
index 028db94..20e5408 100644
--- a/cinnamon-dynamic-wallpaper@TobiZog/5.4/extension.js
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/extension.js
@@ -59,10 +59,8 @@ CinnamonDynamicWallpaperExtension.prototype = {
 	_init: function(uuid) { 
 		this.settings = new Settings.ExtensionSettings(this, uuid);
 
-		this.bindSettings("expand_over_all_displays", this.settingsUpdated)
-
 		// Check for the first startup
-		if (this.settings.getValue("first_start")) {
+		if (!this.settings.getValue("first_start")) {
 
 			// Welcome notification
 			this.showNotification("Welcome to Cinnamon Dynamic Wallpaper", 
@@ -70,6 +68,7 @@ CinnamonDynamicWallpaperExtension.prototype = {
 
 			// Hide the notification on system restart
 			this.settings.setValue("first_start", false)
+			this.settings.setValue("source_folder", DIRECTORY["path"] + "/images/included_image_sets/lakeside/")
 		}
 
 		// Start the main loop, checks in fixed time periods the 
@@ -132,7 +131,7 @@ CinnamonDynamicWallpaperExtension.prototype = {
 
 			notification.connect("action-invoked", () =>
 				Util.spawnCommandLine("/usr/bin/env python3 " +
-					DIRECTORY.path + "/preferences/preferences.py"));
+					DIRECTORY.path + "/preferences.py"));
 		}
 
 		// Put all together
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences.py b/cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences.py
index 07f97ee..caa32e2 100755
--- a/cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences.py
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences.py
@@ -223,8 +223,8 @@ class Preferences:
 				time_periods_min.append(time_range_now.hour * 60 + time_range_now.minute)
 
 		# Create time bar
-		self.time_bar_chart.create_bar_chart_with_polylines(PREFERENCES_URI, 1200, 150, time_periods_min)
-		self.time_bar_chart.create_bar_chart(PREFERENCES_URI, 1200, 150, time_periods_min)
+		self.time_bar_chart.create_bar_chart_with_polylines(PREFERENCES_URI, 1300, 150, time_periods_min)
+		self.time_bar_chart.create_bar_chart(PREFERENCES_URI, 1300, 150, time_periods_min)
 
 		# Load to the views
 		pixbuf = GdkPixbuf.Pixbuf.new_from_file(PREFERENCES_URI + "/time_bar_polylines.svg")