diff --git a/profiles/templates/3.1/2_ac_install_merge/Depends/dm-themes-calculate b/profiles/templates/3.1/2_ac_install_merge/Depends/dm-themes-calculate
index 5517e20ca..6cfd5bc85 100644
--- a/profiles/templates/3.1/2_ac_install_merge/Depends/dm-themes-calculate
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/dm-themes-calculate
@@ -1 +1 @@
-# Calculate append=skip merge(media-gfx/dm-themes-calculate)!= merge=gnome-base/gconf,gnome-base/gdm,kde-base/kdm,lxde-base/lxdm
+# Calculate append=skip merge(media-gfx/dm-themes-calculate)!= merge=gnome-base/gconf,gnome-base/gdm,kde-base/kdm,lxde-base/lxdm,x11-themes/gnome-themes-standard,media-gfx/gdm-themes-calculate,gnome-extra/gnome-screensaver,media-gfx/kdm-themes-calculate,x11-misc/lightdm-gtk-greeter
diff --git a/profiles/templates/3.1/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml b/profiles/templates/3.1/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
index 1343321a4..6ae836146 100644
--- a/profiles/templates/3.1/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
+++ b/profiles/templates/3.1/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml
@@ -14,8 +14,11 @@
#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldg-themes)>=12.0_alpha1#
/usr/share/pixmaps/calculate-gdm-#-os_x11_standart-#.jpg
#pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=#
- /usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+ /usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
+ /usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
#pkg#
File to use for the background image.
diff --git a/profiles/templates/3.1/2_ac_install_merge/gnome-base/gdm/10-calculate-settings b/profiles/templates/3.1/2_ac_install_merge/gnome-base/gdm/10-calculate-settings
index ae9149746..12a17b8c4 100644
--- a/profiles/templates/3.1/2_ac_install_merge/gnome-base/gdm/10-calculate-settings
+++ b/profiles/templates/3.1/2_ac_install_merge/gnome-base/gdm/10-calculate-settings
@@ -13,7 +13,10 @@ picture-uri='file:///usr/share/pixmaps/calculate-gdm.jpg'
#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldg-themes)>=12.0_alpha1#
picture-uri='file:///usr/share/pixmaps/calculate-gdm-#-os_x11_standart-#.jpg'
#pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=#
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+picture-uri='file:///usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg'
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
picture-uri='file:///usr/share/wallpapers/dm-#-os_x11_standart-#.jpg'
#pkg#
picture-options='stretched'
diff --git a/profiles/templates/3.1/2_ac_install_merge/kde-base/kdm/backgroundrc b/profiles/templates/3.1/2_ac_install_merge/kde-base/kdm/backgroundrc
index 1b65a7409..62a9a8971 100644
--- a/profiles/templates/3.1/2_ac_install_merge/kde-base/kdm/backgroundrc
+++ b/profiles/templates/3.1/2_ac_install_merge/kde-base/kdm/backgroundrc
@@ -15,7 +15,10 @@ Pattern=fish
Program=
ReverseBlending=false
UseSHM=false
-#?pkg(media-gfx/dm-themes-calculate)!=#
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+Wallpaper=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
Wallpaper=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
#pkg#
WallpaperList=Custom
diff --git a/profiles/templates/3.1/2_ac_install_merge/lxde-base/lxdm/lxdm.conf b/profiles/templates/3.1/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
index a7e8b9575..9870bb792 100644
--- a/profiles/templates/3.1/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
+++ b/profiles/templates/3.1/2_ac_install_merge/lxde-base/lxdm/lxdm.conf
@@ -41,7 +41,10 @@ bg=/usr/share/lxdm/themes/Calculate/bg.jpg
#?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldx-themes)>=12.0_alpha1#
bg=/usr/share/lxdm/themes/Calculate/calculate-lxdm-#-os_x11_standart-#.jpg
#pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=#
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+bg=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
bg=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
#pkg#
diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png b/profiles/templates/3.1/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png
index 8551ede6d..a2a8a6f0f 100644
--- a/profiles/templates/3.1/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png
+++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png
@@ -1 +1 @@
-# Calculate link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg symbolic
+# Calculate pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1 link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg symbolic
diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png.14-r1 b/profiles/templates/3.1/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png.14-r1
new file mode 100644
index 000000000..be016aefe
--- /dev/null
+++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png.14-r1
@@ -0,0 +1 @@
+# Calculate name=background.png pkg(media-gfx/dm-themes-calculate)>=14-r1 link=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg symbolic
diff --git a/profiles/templates/3.1/2_ac_install_merge/x11-themes/gnome-themes-standard/adwaita-timed.xml b/profiles/templates/3.1/2_ac_install_merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
index 10bbdf72b..7a67c2f8b 100644
--- a/profiles/templates/3.1/2_ac_install_merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
+++ b/profiles/templates/3.1/2_ac_install_merge/x11-themes/gnome-themes-standard/adwaita-timed.xml
@@ -1,6 +1,11 @@
# Calculate append=replace pkg(x11-themes/gnome-themes-standard)>=3.8 path=/usr/share/themes/Adwaita/backgrounds
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
+#pkg#
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/gnome-extra/gnome-screensaver/%gconf-tree.xml b/profiles/templates/3.1/3_ac_install_live/1-live/gnome-extra/gnome-screensaver/%gconf-tree.xml
index 046ce8349..30606c2dd 100644
--- a/profiles/templates/3.1/3_ac_install_live/1-live/gnome-extra/gnome-screensaver/%gconf-tree.xml
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/gnome-extra/gnome-screensaver/%gconf-tree.xml
@@ -6,7 +6,7 @@
\s*<dir name="keyboard">)
\1\2<dir name="background">
\2 <entry name="picture_filename" type="string">
-\2 <stringvalue>/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg</stringvalue>
+\2 <stringvalue>/usr/share/wallpapers/#?pkg(media-gfx/dm-themes-calculate)>=14-r1#Calculate-dm/contents/images/#pkg##?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#dm-#pkg##-os_x11_standart-#.jpg</stringvalue>
\2 </entry>
\2</dir>
\2\3
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg b/profiles/templates/3.1/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg
index 3914009a4..c97c6c154 100644
--- a/profiles/templates/3.1/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg
@@ -1 +1 @@
-# Calculate link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg mirror
+# Calculate pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1 link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg mirror
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg.14-r1 b/profiles/templates/3.1/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg.14-r1
new file mode 100644
index 000000000..ad9fe8361
--- /dev/null
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg.14-r1
@@ -0,0 +1 @@
+# Calculate name=bg.jpg pkg(media-gfx/dm-themes-calculate)>=14-r1 link=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg mirror
diff --git a/profiles/templates/3.1/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf b/profiles/templates/3.1/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
index 10001871f..59e2a70fa 100644
--- a/profiles/templates/3.1/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
+++ b/profiles/templates/3.1/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf
@@ -1,7 +1,10 @@
# Calculate format=kde path=/etc/lightdm
[greeter]
-#?pkg(media-gfx/dm-themes-calculate)!=#
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+background=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
background=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
#pkg#
logo=/usr/share/wallpapers/calculate-logo.png
diff --git a/profiles/templates/3.1/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-overlay-appletsrc b/profiles/templates/3.1/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-overlay-appletsrc
index 0205637f5..84860cdf3 100644
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-overlay-appletsrc
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-overlay-appletsrc
@@ -31,7 +31,12 @@ timezone=Local
slideTimer=10
slidepaths=/usr/share/wallpapers/
userswallpapers=
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+wallpaper=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
wallpaper=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
+#pkg#
wallpapercolor=0,0,0
wallpaperposition=0
diff --git a/profiles/templates/3.1/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.9-4.10/plasma-overlay-appletsrc b/profiles/templates/3.1/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.9-4.10/plasma-overlay-appletsrc
index 0205637f5..84860cdf3 100644
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.9-4.10/plasma-overlay-appletsrc
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.9-4.10/plasma-overlay-appletsrc
@@ -31,7 +31,12 @@ timezone=Local
slideTimer=10
slidepaths=/usr/share/wallpapers/
userswallpapers=
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+wallpaper=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
wallpaper=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
+#pkg#
wallpapercolor=0,0,0
wallpaperposition=0