diff --git a/profiles/calculate/desktop/CLDX/package.keywords b/profiles/calculate/desktop/CLDX/package.keywords
index f38341a4b..6d4605d20 100644
--- a/profiles/calculate/desktop/CLDX/package.keywords
+++ b/profiles/calculate/desktop/CLDX/package.keywords
@@ -1,4 +1,7 @@
-~media-gfx/shotwell-0.15.1 amd64 x86
+~media-sound/clementine-1.2.2 amd64 x86
+~media-libs/libmygpo-qt-1.0.7 amd64 x86
+
+~media-gfx/shotwell-0.18.0 amd64 x86
 ~mail-client/claws-mail-3.9.0 amd64 x86
 ~media-sound/audacious-3.4.1 amd64 x86
 ~media-plugins/audacious-plugins-3.4.1 amd64 x86
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-clementine/.calculate_directory
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/.calculate_directory
rename to profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-clementine/.calculate_directory
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/.calculate_directory
rename to profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-clementine/install/.calculate_directory
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/amarok-2.5.desktop b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-clementine/install/amarok-2.5.desktop
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/amarok-2.5.desktop
rename to profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-clementine/install/amarok-2.5.desktop
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/mimeapps.list b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/install/mimeapps.list
rename to profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-clementine/install/mimeapps.list
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/uninstall b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-clementine/uninstall
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-clementine/uninstall
rename to profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-clementine/uninstall
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-rhythmbox/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-rhythmbox/.calculate_directory
rename to profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-rhythmbox/.calculate_directory
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-rhythmbox/install/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-rhythmbox/install/.calculate_directory
rename to profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-rhythmbox/install/.calculate_directory
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-rhythmbox/install/mimeapps.list b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-rhythmbox/install/mimeapps.list
rename to profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-rhythmbox/install/mimeapps.list
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-rhythmbox/install/rhythmbox-0.12.desktop b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-rhythmbox/install/rhythmbox-0.12.desktop
rename to profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-rhythmbox/install/rhythmbox-0.12.desktop
diff --git a/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-rhythmbox/uninstall b/profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-rhythmbox/uninstall
similarity index 100%
rename from profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/20-rhythmbox/uninstall
rename to profiles/templates/3.1/2_ac_install_merge/Desktop/400-AudioPlayer/40-rhythmbox/uninstall
diff --git a/profiles/templates/3.1/6_ac_update_sync/world/1_create/ini.env b/profiles/templates/3.1/6_ac_update_sync/world/1_create/ini.env
index bd19ba957..b29ef95ff 100644
--- a/profiles/templates/3.1/6_ac_update_sync/world/1_create/ini.env
+++ b/profiles/templates/3.1/6_ac_update_sync/world/1_create/ini.env
@@ -1,4 +1,4 @@
 # Calculate path=/etc/calculate format=samba
 
 [update]
-world = 42
+world = 43
diff --git a/profiles/templates/3.1/6_ac_update_sync/world/1_create/multimedia b/profiles/templates/3.1/6_ac_update_sync/world/1_create/multimedia
index 39b3a1734..05945b028 100644
--- a/profiles/templates/3.1/6_ac_update_sync/world/1_create/multimedia
+++ b/profiles/templates/3.1/6_ac_update_sync/world/1_create/multimedia
@@ -25,7 +25,7 @@ media-video/cheese
 
 #?in(os_linux_shortname, CLDX)!=#
 app-cdr/xfburn
-media-sound/audacious
+media-sound/clementine
 media-video/smplayer
 #in#
 
diff --git a/profiles/templates/3.1/6_ac_update_sync/world/2_update/43 b/profiles/templates/3.1/6_ac_update_sync/world/2_update/43
new file mode 100644
index 000000000..e8b60229e
--- /dev/null
+++ b/profiles/templates/3.1/6_ac_update_sync/world/2_update/43
@@ -0,0 +1,8 @@
+# Calculate format=world name=world ini(update.world)<43
+
+#-ini(update.world,43)-#
+
+#?in(os_linux_shortname, CLDX)!=#
+!media-sound/audacious
+media-sound/clementine
+#in#