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/%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/%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/general/%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/general/%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/general/allscreens/%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/general/allscreens/%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/%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/%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/animation/%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/animation/%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/animation/screen0/%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/animation/screen0/%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/decoration/%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/decoration/%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/decoration/allscreens/%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/decoration/allscreens/%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/move/%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/move/%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/move/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/move/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/place/%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/place/%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/place/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/place/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/scale/%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/scale/%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/scale/allscreens/%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/scale/allscreens/%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/snap/%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/snap/%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/snap/screen0/%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/snap/screen0/%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/staticswitcher/%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/staticswitcher/%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/staticswitcher/screen0/%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/staticswitcher/screen0/%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/30-gnome-2.6/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%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/staticswitcher/%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/staticswitcher/screen0/%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/staticswitcher/screen0/%gconf.xml
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/30-gnome-2.6/.gconf/apps/compiz/plugins/wall/%gconf.xml b/client-profiles/90-compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%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/vpswitch/%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/vpswitch/allscreens/%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/vpswitch/allscreens/%gconf.xml
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#