diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml
index 3b33a24..7804447 100644
--- a/client-profiles/30-gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml
@@ -3,7 +3,7 @@
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
 	#-pop(offsetx)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+32)-#"/>
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+31)-#"/>
 	#-push(offsetx)-#
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
 	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/%gconf.xml
index 6727621..99bee7e 100644
--- a/client-profiles/30-gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/%gconf.xml
@@ -3,7 +3,7 @@
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
 	#-pop(offsetx)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx,offsetx+147)-#"/>
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(offsetx,offsetx+1,offsetx+147)-#"/>
 	#-push(offsetx)-#
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
 	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/panel/general/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/apps/panel/general/%gconf.xml
index e831536..b15fd2e 100644
--- a/client-profiles/30-gnome-2.6/.gconf/apps/panel/general/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/apps/panel/general/%gconf.xml
@@ -8,17 +8,12 @@
 		<li type="string">
 			<stringvalue>101_home</stringvalue>
 		</li>
-#?cl_remote_host!=#
 		<li type="string">
 			<stringvalue>102_disks</stringvalue>
 		</li>
-#cl_remote_host#
-#?cl_remote_host!=&cl_remote_ftp!=#
 		<li type="string">
 			<stringvalue>103_ftp</stringvalue>
 		</li>
-#cl_remote_host#
-
 #?cl_remote_host!=#
 		<li type="string">
 			<stringvalue>200_logout</stringvalue>
diff --git a/client-profiles/30-gnome-always/.calculate_directory b/client-profiles/30-gnome-always/.calculate_directory
new file mode 100644
index 0000000..abd22c5
--- /dev/null
+++ b/client-profiles/30-gnome-always/.calculate_directory
@@ -0,0 +1 @@
+# Calculate ini(main.update)!=off&ini(update.gnome)!=off&pkg(gnome-base/libgnome)>=2.26&ini(domain)!=cl_remote_host
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/%gconf.xml b/client-profiles/30-gnome-always/.gconf/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/%gconf.xml
rename to client-profiles/30-gnome-always/.gconf/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/general/%gconf.xml b/client-profiles/30-gnome-always/.gconf/apps/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/general/%gconf.xml
rename to client-profiles/30-gnome-always/.gconf/apps/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/general/allscreens/%gconf.xml b/client-profiles/30-gnome-always/.gconf/apps/panel/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/general/allscreens/%gconf.xml
rename to client-profiles/30-gnome-always/.gconf/apps/panel/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/%gconf.xml b/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/%gconf.xml
rename to client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/%gconf.xml
diff --git a/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/.calculate_directory b/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/.calculate_directory
new file mode 100644
index 0000000..5f5ba49
--- /dev/null
+++ b/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate name=objects
+
diff --git a/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml b/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml
new file mode 100644
index 0000000..445d13c
--- /dev/null
+++ b/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml
@@ -0,0 +1,24 @@
+# Calculate format=xml_gconf cl_remote_host!=&cl_remote_ftp!=
+<?xml version="1.0"?>
+<gconf>
+	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="64"/>
+	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
+	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
+	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
+		<stringvalue>top_panel_screen0</stringvalue>
+	</entry>
+	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
+	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
+	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
+		<stringvalue>launcher-object</stringvalue>
+	</entry>
+	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="false"/>
+	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
+	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
+	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
+	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location" type="string">
+		<stringvalue>FTP.desktop</stringvalue>
+	</entry>
+	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
+</gconf>
diff --git a/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove b/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove
new file mode 100644
index 0000000..a90347d
--- /dev/null
+++ b/client-profiles/30-gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove
@@ -0,0 +1 @@
+# Calculate append=remove name=%gconf.xml cl_remote_host!=&cl_remote_ftp==
diff --git a/client-profiles/30-gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop b/client-profiles/30-gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop
new file mode 100644
index 0000000..20988f6
--- /dev/null
+++ b/client-profiles/30-gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop
@@ -0,0 +1,10 @@
+# Calculate format=samba cl_remote_host!=&cl_remote_ftp!=
+
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=FTP
+Comment=Browser FTP
+Icon=update-manager
+URL=file:///home/#-ur_login-#/FTP
+Type=Link
diff --git a/client-profiles/30-gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove b/client-profiles/30-gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove
new file mode 100644
index 0000000..cb52cde
--- /dev/null
+++ b/client-profiles/30-gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove
@@ -0,0 +1,2 @@
+# Calculate append=remove name=FTP.desktop cl_remote_host!=&cl_remote_ftp==
+
diff --git a/client-profiles/30-gnome-always/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml b/client-profiles/30-gnome-always/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml
new file mode 100644
index 0000000..57840f3
--- /dev/null
+++ b/client-profiles/30-gnome-always/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml
@@ -0,0 +1,3 @@
+# Calculate os_root_type==livecd
+<?xml version="1.0"?>
+<directory><file name="calculate-community.desktop" icon_position="187,202" icon_scale="1" /><file name="gparted.desktop" icon_position="187,102" icon_scale="1" /><file name="README.desktop" icon_position="64,202" icon_scale="1" /><file name="calculate-install.desktop" icon_position="64,102" icon_scale="1" /></directory>
diff --git a/client-profiles/30-gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml b/client-profiles/30-gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml
new file mode 100644
index 0000000..947f6f5
--- /dev/null
+++ b/client-profiles/30-gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+#?cl_remote_host==#
+<directory><file name="home" timestamp="1267778829" icon_position="64,22" icon_scale="1" icon_position_timestamp="1267778829"/></directory>
+#cl_remote_host#
+#?cl_remote_host!=#
+<directory><file name="Home.volume" icon_position="64,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/user-home.svg"/><file name="FTP.volume" icon_position="220,22" custom_icon="file:///usr/share/icons/gnome/scalable/apps/update-manager.svg" icon_scale="1"/><file name="Disks.volume" icon_position="142,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/folder-remote.svg" icon_scale="1"/></directory>
+#cl_remote_host#
diff --git a/client-profiles/90-compiz-0.8.4/.calculate/ini.env b/client-profiles/90-compiz-0.8.4/.calculate/ini.env
new file mode 100644
index 0000000..ecaece0
--- /dev/null
+++ b/client-profiles/90-compiz-0.8.4/.calculate/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba
+
+[ver]
+compiz = 0.8.4
+
+[update]
+compiz = on
diff --git a/client-profiles/90-compiz-0.8.4/.calculate_directory b/client-profiles/90-compiz-0.8.4/.calculate_directory
new file mode 100644
index 0000000..4e8b762
--- /dev/null
+++ b/client-profiles/90-compiz-0.8.4/.calculate_directory
@@ -0,0 +1 @@
+# Calculate ini(main.update)!=off&ini(update.compiz)!=off&ini(ver.compiz)==&pkg(x11-wm/compiz)>=0.8.4
diff --git a/client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop b/client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop
new file mode 100644
index 0000000..343b95f
--- /dev/null
+++ b/client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop
@@ -0,0 +1 @@
+# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pgk(fusion-icon)!=
diff --git a/client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop b/client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop
new file mode 100644
index 0000000..fd39297
--- /dev/null
+++ b/client-profiles/90-compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop
@@ -0,0 +1 @@
+# Calculate append=remove name=fusion-icon-autostart pkg(x11-apps/fusion-icon)==
diff --git a/client-profiles/90-compiz-0.8.4/.config/compiz/compizconfig/config b/client-profiles/90-compiz-0.8.4/.config/compiz/compizconfig/config
new file mode 100644
index 0000000..7a857de
--- /dev/null
+++ b/client-profiles/90-compiz-0.8.4/.config/compiz/compizconfig/config
@@ -0,0 +1,3 @@
+[gnome_session]
+profile = 
+
diff --git a/client-profiles/90-compiz-0.8.4/.config/compiz/fusion-icon b/client-profiles/90-compiz-0.8.4/.config/compiz/fusion-icon
new file mode 100644
index 0000000..0da4d2c
--- /dev/null
+++ b/client-profiles/90-compiz-0.8.4/.config/compiz/fusion-icon
@@ -0,0 +1,12 @@
+# Calculate format=samba pkg(x11-apps/fusion-icon)!=
+[compiz options]
+indirect rendering = true
+loose binding = false
+
+[window manager]
+#?hr_x11_composite==on#
+active wm = compiz
+#hr_x11_composite#
+#?hr_x11_composite==off#
+active wm = metacity
+#hr_x11_composite#
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/animation/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/animation/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/decoration/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/decoration/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/move/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/move/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/general/allscreens/options/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/general/allscreens/options/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/place/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/place/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/scale/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/scale/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/snap/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/snap/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/wall/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/wall/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml
diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml
new file mode 100644
index 0000000..e69de29
diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml
new file mode 100644
index 0000000..e69de29
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml
diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml
new file mode 100644
index 0000000..e69de29
diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml
new file mode 100644
index 0000000..e69de29
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml
diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml
new file mode 100644
index 0000000..e69de29
diff --git a/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml
new file mode 100644
index 0000000..e69de29
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml
similarity index 100%
rename from client-profiles/30-gnome-2.6/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml
rename to client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml
diff --git a/client-profiles/90-compiz-always/.calculate_directory b/client-profiles/90-compiz-always/.calculate_directory
new file mode 100644
index 0000000..a29acdc
--- /dev/null
+++ b/client-profiles/90-compiz-always/.calculate_directory
@@ -0,0 +1 @@
+# Calculate ini(main.update)!=off&ini(update.compiz)!=off&pkg(x11-wm/compiz)>=0.8.4
diff --git a/client-profiles/90-compiz-always/.config/autostart/fusion-icon-autostart.desktop b/client-profiles/90-compiz-always/.config/autostart/fusion-icon-autostart.desktop
new file mode 100644
index 0000000..343b95f
--- /dev/null
+++ b/client-profiles/90-compiz-always/.config/autostart/fusion-icon-autostart.desktop
@@ -0,0 +1 @@
+# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pgk(fusion-icon)!=
diff --git a/client-profiles/90-compiz-always/.config/autostart/fusion-icon-remove.desktop b/client-profiles/90-compiz-always/.config/autostart/fusion-icon-remove.desktop
new file mode 100644
index 0000000..fd39297
--- /dev/null
+++ b/client-profiles/90-compiz-always/.config/autostart/fusion-icon-remove.desktop
@@ -0,0 +1 @@
+# Calculate append=remove name=fusion-icon-autostart pkg(x11-apps/fusion-icon)==
diff --git a/client-profiles/90-compiz-always/.config/compiz/compizconfig/config b/client-profiles/90-compiz-always/.config/compiz/compizconfig/config
new file mode 100644
index 0000000..7a857de
--- /dev/null
+++ b/client-profiles/90-compiz-always/.config/compiz/compizconfig/config
@@ -0,0 +1,3 @@
+[gnome_session]
+profile = 
+
diff --git a/client-profiles/90-compiz-always/.config/compiz/fusion-icon b/client-profiles/90-compiz-always/.config/compiz/fusion-icon
new file mode 100644
index 0000000..0da4d2c
--- /dev/null
+++ b/client-profiles/90-compiz-always/.config/compiz/fusion-icon
@@ -0,0 +1,12 @@
+# Calculate format=samba pkg(x11-apps/fusion-icon)!=
+[compiz options]
+indirect rendering = true
+loose binding = false
+
+[window manager]
+#?hr_x11_composite==on#
+active wm = compiz
+#hr_x11_composite#
+#?hr_x11_composite==off#
+active wm = metacity
+#hr_x11_composite#