diff --git a/media-gfx/calculate-wallpapers/Manifest b/media-gfx/calculate-wallpapers/Manifest
index 30d991416..b10606b51 100644
--- a/media-gfx/calculate-wallpapers/Manifest
+++ b/media-gfx/calculate-wallpapers/Manifest
@@ -2,4 +2,4 @@ DIST wallpapers-cld-13.tar.bz2 4483088 SHA256 2f9562654249c8056e23a7223768168d35
 DIST wallpapers-cldg-13.tar.bz2 4722030 SHA256 8c8ab0b938829a2b6aca8d64af0776996d0f8b6938a50fc5ae4149d004a078fc SHA512 993f51991d2e68c4dccc48762bc72a8f14df80ad0f8c6206256753102c4bdcff7144b9bff1e6e83afe78b9fd648efbe7b9f17c1b578290cfa99563acb5042e47 WHIRLPOOL 5ce8b4c5dac7e420bf618ee74f88e37ddb51fac8b5b6ebb2393f8416dc1e7f6e0030f737dd27c1ab69f899872b28ff0e3a39055514f38ac680e580255c1c5aa6
 DIST wallpapers-cldx-13.tar.bz2 4273847 SHA256 7b63cb69fe45332717c0831c2d8d6bbc54cff31ac009ba0566120229bb11e300 SHA512 3b384b6fbe2783baa480bb59ce35e328c340624f0ad55efd626b0c14f69d950d02359d6e02108abcc419fbf6cebf2b91ed857ef919bf4ed1593be3032bb58e75 WHIRLPOOL ab9dc36312e21f83ef0cc9a2980667f65b8a2242dc07284c15a6df8cee7df206d0ab90814e67e1fe5ee0b4fb27a71690149a3059f2fcf040dde3933f6962f75d
 DIST wallpapers-cls-13.tar.bz2 4701593 SHA256 c21121ccbbd97691be6f56ce4cf873471c5c103b11e616b84795cf343de6a629 SHA512 faa275e3da6d47ef032dddf54d1b57f2f677facd6db82c98a3c26509e36b37bcaf7e5e2f4ad26e16d8135ee38210cbbb229184c9460b58f43d13645b41239384 WHIRLPOOL a2c56a058cfc7f799d71261d5cfa9f076a503855452b3b85a245c65b9f95589923a51482e1782fbf99df9760e78c0b8b5470c2092123b68483d982a0640702f1
-EBUILD calculate-wallpapers-13.ebuild 1004 SHA256 0483a3cbceedeaefe73d23a56098b50bcf48ed74d4cafaa707ff79350e5cb8ae SHA512 ccfb6b4df953b6d7d6d08f28adc1ec2d831c71ee1ae1d91bf574339cc99367238d830f6a1af126bbff756ec56d418f4f699180694b52951d6cfd42dac606f8e7 WHIRLPOOL 8ef4b5141a9dab610ffebd756c2546a5e943382a63c07cb08cfe9f16efb9ef881aba30eaa4c78bb82fa646f7df04ad77447d2854f27dccd55e5617ccd5157845
+EBUILD calculate-wallpapers-13.ebuild 1028 SHA256 b524332b066153ef1d0ba2644954c4a9e208dadad6a85c57b583bbcb98019731 SHA512 d8e344c3a9ca1a700af90b313e903e9b8ff9d0029d7d7c719dcc7d3d49175f7f67537aad2ec49362106f80b2381ca98752757bc444a21b120869bf193a522fc0 WHIRLPOOL 903b55e05be973605a980c63323fde388e856eb7fb0b623e8444f83df32d7d84d1ea532b98938ac3926e8440fb6bd30818a1506833127b2de55a9cd176be183b
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-13.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-13.ebuild
index e40b3463e..7b51a78fa 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-13.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-13.ebuild
@@ -30,6 +30,7 @@ REQUIRED_USE="^^ ( themes_CLD themes_CLDX themes_CLS themes_CLDG )"
 
 RDEPEND="!media-gfx/calculate-cldx-themes
 		!media-gfx/calculate-cld-themes
+		!media-gfx/cld-themes
 		!media-gfx/cldx-themes"
 
 DEPEND="${RDEPEND}"
diff --git a/profiles/templates/3.1/2_ac_install_merge/app-portage/eix/eix-sync.conf b/profiles/templates/3.1/2_ac_install_merge/app-portage/eix/eix-sync.conf
index f29108dd1..a28dd3797 100644
--- a/profiles/templates/3.1/2_ac_install_merge/app-portage/eix/eix-sync.conf
+++ b/profiles/templates/3.1/2_ac_install_merge/app-portage/eix/eix-sync.conf
@@ -2,6 +2,9 @@
 *
 !![ -x /usr/bin/eix-checkout ] && /usr/bin/eix-checkout || true
 @egencache --repo=calculate --update --jobs=4
-#?pkg(sys-apps/calculate-update)!=#
+#?pkg(sys-apps/calculate-update)!=&&pkg(sys-apps/calculate-update)<3.1.1_beta2-r1#
 @@/usr/sbin/cl-core --method update --update-world || true
 #pkg#
+#?pkg(sys-apps/calculate-update)>=3.1.1_beta2-r1#
+@@/usr/sbin/cl-core --method update --update-rev || true
+#pkg#
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/.calculate_directory b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/.calculate_directory
index 8aff98b40..d14f68ac6 100644
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/.calculate_directory
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip merge()!=&&pkg()!=
+# Calculate append=skip merge()!=&&pkg()!= merge=sys-apps/calculate-update