diff --git a/client-profiles/00-new_templates/.calculate/ini.env b/client-profiles/00-new_templates/.calculate/ini.env
index b65c032..45f3818 100644
--- a/client-profiles/00-new_templates/.calculate/ini.env
+++ b/client-profiles/00-new_templates/.calculate/ini.env
@@ -17,6 +17,7 @@ vim = 7.2
 mc = 4.7
 firefox = 3.5
 fbreader = 0.1
+xscreensaver = 5.10
 
 [update]
 #?load(ver,~/.zzz-calculate.kde)!=#
@@ -35,6 +36,7 @@ vim = on
 mc = on
 firefox = on
 fbreader = on
+xscreensaver = on
 
 [main]
 update = on
diff --git a/client-profiles/40-xfce-4.6/.xscreensaver b/client-profiles/40-xfce-4.6/.xscreensaver
deleted file mode 100644
index b335c44..0000000
--- a/client-profiles/40-xfce-4.6/.xscreensaver
+++ /dev/null
@@ -1,12 +0,0 @@
-timeout:	0:10:00
-#?os_root_type==livecd#
-lock:		false
-#os_root_type#
-#?os_root_type!=livecd#
-lock:		true
-lockTimeout:	0:00:05
-#os_root_type#
-mode:		one
-selected:	139
-textMode:	literal
-textLiteral:	Calculate Linux Desktop
diff --git a/client-profiles/90-pidgin-2.6/.purple/prefs.xml b/client-profiles/90-pidgin-2.6/.purple/prefs.xml
index b5cd7b0..39fe3be 100644
--- a/client-profiles/90-pidgin-2.6/.purple/prefs.xml
+++ b/client-profiles/90-pidgin-2.6/.purple/prefs.xml
@@ -26,6 +26,9 @@
 			<pref name='loaded' type='pathlist'>
 				<item value='/usr/lib/pidgin/history.so'/>
 				<item value='/usr/lib/pidgin/sendbutton.so'/>
+#?pkg(x11-plugins/pidgin-hotkeys)!=#
+				<item value='/usr/lib/pidgin/hotkeys.so' />
+#pkg#
 			</pref>
 		</pref>
 		<pref name='sound'>
@@ -36,4 +39,12 @@
 			<pref name='conv_focus' type='bool' value='0'/>
 		</pref>
 	</pref>
+	<pref name='plugins'>
+		<pref name='gtk'>
+			<pref name='hotkeys'>
+				<pref name='use_hotkey_read_msg' type='bool' value='1'/>
+				<pref name='hotkey_read_msg' type='string' value='.*..grave'/>
+			</pref>
+		</pref>
+	</pref>
 </pref>
diff --git a/client-profiles/90-xscreensaver-5.10/.calculate/ini.env b/client-profiles/90-xscreensaver-5.10/.calculate/ini.env
new file mode 100644
index 0000000..1e71c14
--- /dev/null
+++ b/client-profiles/90-xscreensaver-5.10/.calculate/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba
+
+[ver]
+xscreensaver = 5.10
+
+[update]
+xscreensaver = on
diff --git a/client-profiles/40-cldx-10.2-10.4/.xscreensaver b/client-profiles/90-xscreensaver-5.10/.xscreensaver
similarity index 100%
rename from client-profiles/40-cldx-10.2-10.4/.xscreensaver
rename to client-profiles/90-xscreensaver-5.10/.xscreensaver