diff --git a/assets/screenshot.png b/assets/screenshot.png
index 4ad9f45..ccc3056 100644
Binary files a/assets/screenshot.png and b/assets/screenshot.png differ
diff --git a/randomwallpaper@iflow.space/prefs.js b/randomwallpaper@iflow.space/prefs.js
index d839d13..930f00c 100644
--- a/randomwallpaper@iflow.space/prefs.js
+++ b/randomwallpaper@iflow.space/prefs.js
@@ -89,12 +89,12 @@ const RandomWallpaperSettings = new Lang.Class({
 			}
 
 			switch (sourceCombo.active) {
-				case 0: // desktopper
-					this.currentSourceSettingsWidget = this.desktopperSettings;
-					break;
-				case 1: // unsplash
+				case 0: // unsplash
 					this.currentSourceSettingsWidget = this.unsplashSettings;
 					break;
+				case 1: // desktopper
+					this.currentSourceSettingsWidget = this.desktopperSettings;
+					break;
 				case 2: // wallheaven
 					this.currentSourceSettingsWidget = this.wallheavenSettings;
 					break;
diff --git a/randomwallpaper@iflow.space/schemas/gschemas.compiled b/randomwallpaper@iflow.space/schemas/gschemas.compiled
index 8623855..b82e1fd 100644
Binary files a/randomwallpaper@iflow.space/schemas/gschemas.compiled and b/randomwallpaper@iflow.space/schemas/gschemas.compiled differ
diff --git a/randomwallpaper@iflow.space/schemas/org.gnome.shell.extensions.space.iflow.randomwallpaper.gschema.xml b/randomwallpaper@iflow.space/schemas/org.gnome.shell.extensions.space.iflow.randomwallpaper.gschema.xml
index 86d4705..e3367a2 100644
--- a/randomwallpaper@iflow.space/schemas/org.gnome.shell.extensions.space.iflow.randomwallpaper.gschema.xml
+++ b/randomwallpaper@iflow.space/schemas/org.gnome.shell.extensions.space.iflow.randomwallpaper.gschema.xml
@@ -2,8 +2,8 @@
 <schemalist gettext-domain='gnome-shell-extensions'>
 
     <enum id='org.gnome.shell.extensions.space.iflow.randomwallpaper.sources'>
-        <value value='0' nick='desktoppr'/>
-        <value value='1' nick='unsplash'/>
+        <value value='0' nick='unsplash'/>
+        <value value='1' nick='desktoppr'/>
         <value value='2' nick='wallheaven'/>
         <value value='3' nick='genericJSON'/>
     </enum>
@@ -12,7 +12,7 @@
             id='org.gnome.shell.extensions.space.iflow.randomwallpaper'>
 
         <key type='i' name='history-length'>
-            <default>10</default>
+            <default>5</default>
             <summary>History size</summary>
             <description>Number of wallpapers stored locally</description>
             <range min='2' max='100'/>
@@ -39,9 +39,9 @@
         </key>
 
         <key name='source' enum='org.gnome.shell.extensions.space.iflow.randomwallpaper.sources'>
-            <default>'desktoppr'</default>
+            <default>'unsplash'</default>
             <summary>Wallpaper Source</summary>
-            <description>Describs the adapter that will be used.</description>
+            <description>Describes the adapter that will be used.</description>
         </key>
 
         <key type='as' name='history'>
diff --git a/randomwallpaper@iflow.space/settings.ui b/randomwallpaper@iflow.space/settings.ui
index 2134cbd..6a993b8 100644
--- a/randomwallpaper@iflow.space/settings.ui
+++ b/randomwallpaper@iflow.space/settings.ui
@@ -53,7 +53,8 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="label" translatable="yes">This feature requires some know how but many different wallpaper providers can be used with this generic JSON source.
-You have to specify an URL to a JSON response and a path to the target picture url within the JSON response.</property>
+You have to specify an URL to a JSON response and a path to the target image URL within the JSON response. 
+You can also define a prefix that will be added to the image URL.</property>
         <property name="wrap">True</property>
       </object>
       <packing>
@@ -277,7 +278,7 @@ You have to specify an URL to a JSON response and a path to the target picture u
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="hexpand">True</property>
-                                        <property name="label" translatable="yes">The source that is used to fetch random wallpapers. You can select between desktoppr.co (default) and an experimental version of wallheaven.cc and unsplash.com.</property>
+                                        <property name="label" translatable="yes">The source that is used to fetch random wallpapers. You can select between unsplash.com, desktoppr.co, wallheaven.cc and a generic JSON source for experienced users.</property>
                                         <property name="wrap">True</property>
                                         <property name="max_width_chars">1</property>
                                         <property name="xalign">0</property>
@@ -313,8 +314,8 @@ You have to specify an URL to a JSON response and a path to the target picture u
                                     <property name="can_focus">False</property>
                                     <property name="active_id">0</property>
                                     <items>
-                                      <item id="desktoppr">desktoppr.co</item>
                                       <item id="unsplash">unsplash.com</item>
+                                      <item id="desktoppr">desktoppr.co</item>
                                       <item id="wallheaven">alpha.wallheaven.cc</item>
                                       <item id="genericJSON" translatable="yes">Generic JSON</item>
                                     </items>
diff --git a/randomwallpaper@iflow.space/wallpaperController.js b/randomwallpaper@iflow.space/wallpaperController.js
index bc5446a..408a72c 100644
--- a/randomwallpaper@iflow.space/wallpaperController.js
+++ b/randomwallpaper@iflow.space/wallpaperController.js
@@ -91,10 +91,10 @@ let WallpaperController = new Lang.Class({
 		this.imageSourceAdapter = this._desktopperAdapter;
 		switch (this._settings.get('source', 'enum')) {
 			case 0:
-				this.imageSourceAdapter = this._desktopperAdapter;
+				this.imageSourceAdapter = this._unsplashAdapter;
 				break;
 			case 1:
-				this.imageSourceAdapter = this._unsplashAdapter;
+				this.imageSourceAdapter = this._desktopperAdapter;
 				break;
 			case 2:
 				this.imageSourceAdapter = this._wallheavenAdapter;