13 files changed, 574 insertions, 169 deletions

diff --git a/desktop-themes/TraditionalOk/doc/LISEZ-MOI.mkd b/desktop-themes/TraditionalOk/doc/LISEZ-MOI.mkd
index a603c41e..f1b7e1c0 100644
--- a/desktop-themes/TraditionalOk/doc/LISEZ-MOI.mkd
+++ b/desktop-themes/TraditionalOk/doc/LISEZ-MOI.mkd
@@ -6,11 +6,11 @@ Le projet Clearlooks-Phénix (anciennement nommé Clearwaita) a pour but de cré
 
 Voici quelques captures d'écran (s'il y a lieu, cliquer pour télécharger l'image au format original):
 
-<a href="http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/doc/exemple1.png"><img src="http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/doc/exemple1.png" alt="Capture d'écran du bureau sous Gnome 3 (mode fallback) avec le thème Clearlooks-Phénix" width="658" height="493" /></a>
+<a href="https://gitorious.org/projets-divers/clearlooks-phenix/raw/master:doc/exemple1.png"><img src="https://gitorious.org/projets-divers/clearlooks-phenix/raw/master:doc/exemple1.png" alt="Capture d'écran du bureau sous Gnome 3 (mode fallback) avec le thème Clearlooks-Phénix" width="658" height="493" /></a>
 
-<img src="http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/doc/exemple2.png" alt="Capture d'écran de gedit 3 avec le thème Clearlooks-Phénix" width="659" height="537" />
+<img src="https://gitorious.org/projets-divers/clearlooks-phenix/raw/master:doc/exemple2.png" alt="Capture d'écran de gedit 3 avec le thème Clearlooks-Phénix" width="659" height="537" />
 
-<a href="http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/doc/exemple3.png"><img src="http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/doc/exemple3.png" alt="Capture d'écran de GTK+ Widget Factory avec le thème Clearlooks-Phénix" width="658" height="443" /></a>
+<a href="https://gitorious.org/projets-divers/clearlooks-phenix/raw/master:doc/exemple3.png"><img src="https://gitorious.org/projets-divers/clearlooks-phenix/raw/master:doc/exemple3.png" alt="Capture d'écran de GTK+ Widget Factory avec le thème Clearlooks-Phénix" width="658" height="443" /></a>
 
 ## Dépendances
 
@@ -40,11 +40,11 @@ Peu importe la méthode d'installation choisie, le thème devra être sélection
 
 - Télécharger l'archive de la version correspondant à votre situation:
 
-	- pour GTK 3.0 et 3.2: [télécharger Clearlooks-Phénix 1](http://jpfleury.indefero.net/p/clearlooks-phenix/source/download/v1/);
+	- pour GTK 3.0 et 3.2: [télécharger Clearlooks-Phénix 1](https://gitorious.org/projets-divers/clearlooks-phenix/archive/v1.zip);
 	
-	- pour GTK 3.4: [télécharger Clearlooks-Phénix 2](http://jpfleury.indefero.net/p/clearlooks-phenix/source/download/v2/).
+	- pour GTK 3.4: [télécharger Clearlooks-Phénix 2](https://gitorious.org/projets-divers/clearlooks-phenix/archive/v2.zip).
 	
-	- pour GTK 3.6 et versions suivantes: [télécharger Clearlooks-Phénix 3](http://jpfleury.indefero.net/p/clearlooks-phenix/source/download/master/).
+	- pour GTK 3.6 et versions suivantes: [télécharger Clearlooks-Phénix 3](https://gitorious.org/projets-divers/clearlooks-phenix/archive/master.zip).
 	
 	Pour connaître sa version de GTK:
 	
@@ -76,13 +76,13 @@ Le paquet [`clearlooks-phenix-theme`](http://packages.debian.org/sid/clearlooks-
 
 ### Gentoo
 
-Le `ebuild` suivant peut être utilisé:
+Voir le paquet suivant:
 
-	http://bbgentoo.ilb.ru/repos/bbgentoo/bbgentoo_overlay/tags/current/x11-themes/clearlooks-phenix/clearlooks-phenix-2.0.10.ebuild
+	http://packages.gentoo.org/package/x11-themes/clearlooks-phenix
 
 ### Ubuntu
 
-Le paquet [`clearlooks-phenix-theme`](http://packages.ubuntu.com/quantal/clearlooks-phenix-theme) peut être installé sous Ubuntu 12.10 ou toute version ultérieure. Cependant, le paquet n'est pas à jour, et le [PPA d'Andrew Shadura](https://launchpad.net/~andrewshadoura/+archive/clearlooks-phenix) peut être utilisé à la place.
+Le paquet [`clearlooks-phenix-theme`](http://packages.ubuntu.com/search?keywords=clearlooks-phenix-theme) peut être installé sous Ubuntu 12.10 ou toute version ultérieure.
 
 ## Configuration
 
@@ -110,15 +110,7 @@ Le thème d'icônes utilisé dans la même capture d'écran est Mist, installé
 	
 	- sous Xfce: en allant dans *Paramètres > Apparence > Icônes* du menu principal.
 
-Aussi, des jeux de couleurs ont été réalisés par DDZ pour s'agencer avec Clearlooks-Phénix:
-
-- [Gnome-Colors-Clearlooks](http://opendesktop.org/content/show.php?content=151907), jeu de couleurs pour le thème d'icônes Gnome-Colors;
-
-- [Humanities-Clearlooks](http://opendesktop.org/content/show.php?content=151908), jeu de couleurs pour le thème d'icônes Humanities.
-
-- [KDE3-Clearlooks-Colors](http://opendesktop.org/content/show.php?content=151994), jeu de couleurs pour KDE 3.
-
-- [KDE4-Clearlooks-Colors](http://opendesktop.org/content/show.php?content=151993), jeu de couleurs pour KDE 4.
+Aussi, des [jeux de couleurs](http://opendesktop.org/usermanager/search.php?username=DDZ&action=contents) ont été réalisés par DDZ pour s'agencer avec Clearlooks-Phénix.
 
 ### Bureau géré par Nautilus
 
@@ -160,20 +152,14 @@ Si après une installation ou une mise à jour d'Ubuntu, les boutons de fenêtre
 
 ## Développement
 
-Dernière version: 3.0.13 (2012-12-09)
-
-Le logiciel Git est utilisé pour la gestion de versions. [Le dépôt peut être consulté en ligne ou récupéré en local.][git]
-
-Clearlooks-Phénix dispose également d'un [système de suivi], sur lequel les rapports de bogues et les suggestions peuvent être soumis. Des commentaires peuvent également être postés sur la page de [Clearlooks-Phénix sur GNOME-Look.org][gnome-look].
+Dernière version: 3.0.16 (2013-09-07)
 
-[git]: http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/
-[système de suivi]: http://jpfleury.indefero.net/p/clearlooks-phenix/issues/
-[gnome-look]: http://gnome-look.org/content/show.php?content=145210
+Le logiciel Git est utilisé pour la gestion de versions. [Le dépôt peut être consulté en ligne ou récupéré en local.](https://gitorious.org/projets-divers/clearlooks-phenix)
 
 ## Licence
 
-Auteur: Jean-Philippe Fleury <[email protected]>  
-Copyright © Jean-Philippe Fleury, 2011-2012.
+Auteur: Jean-Philippe Fleury (<http://www.jpfleury.net/contact.php>)  
+Copyright © Jean-Philippe Fleury, 2011-2013.
 
 Ce programme est un logiciel libre; vous pouvez le redistribuer ou le
 modifier suivant les termes de la GNU General Public License telle que
diff --git a/desktop-themes/TraditionalOk/doc/Makefile.am b/desktop-themes/TraditionalOk/doc/Makefile.am
index f5053fe1..1b473f94 100644
--- a/desktop-themes/TraditionalOk/doc/Makefile.am
+++ b/desktop-themes/TraditionalOk/doc/Makefile.am
@@ -8,6 +8,7 @@ theme_DATA = \
 	exemple3.png \
 	gpl-3.0-fr.txt \
 	gpl-3.0.txt \
+	images.sh.txt \
 	LISEZ-MOI.mkd \
 	README.mkd \
 	version.txt
diff --git a/desktop-themes/TraditionalOk/doc/README.mkd b/desktop-themes/TraditionalOk/doc/README.mkd
index 97c03726..badb271c 100644
--- a/desktop-themes/TraditionalOk/doc/README.mkd
+++ b/desktop-themes/TraditionalOk/doc/README.mkd
@@ -6,11 +6,11 @@ The Clearlooks-Phenix project (formerly known as Clearwaita) aims at creating a
 
 Here are screenshots (if applicable, click to download the original image):
 
-<a href="http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/doc/exemple1.png"><img src="http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/doc/exemple1.png" alt="Screenshot of a Gnome 3 desktop (fallback mode) with the Clearlooks-Phenix theme" width="658" height="493" /></a>
+<a href="https://gitorious.org/projets-divers/clearlooks-phenix/raw/master:doc/exemple1.png"><img src="https://gitorious.org/projets-divers/clearlooks-phenix/raw/master:doc/exemple1.png" alt="Screenshot of a Gnome 3 desktop (fallback mode) with the Clearlooks-Phenix theme" width="658" height="493" /></a>
 
-<img src="http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/doc/exemple2.png" alt="Screenshot of gedit 3 with the Clearlooks-Phenix theme" width="659" height="537" />
+<img src="https://gitorious.org/projets-divers/clearlooks-phenix/raw/master:doc/exemple2.png" alt="Screenshot of gedit 3 with the Clearlooks-Phenix theme" width="659" height="537" />
 
-<a href="http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/doc/exemple3.png"><img src="http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/doc/exemple3.png" alt="Screenshot of GTK+ Widget Factory with the Clearlooks-Phenix theme" width="658" height="435" /></a>
+<a href="https://gitorious.org/projets-divers/clearlooks-phenix/raw/master:doc/exemple3.png"><img src="https://gitorious.org/projets-divers/clearlooks-phenix/raw/master:doc/exemple3.png" alt="Screenshot of GTK+ Widget Factory with the Clearlooks-Phenix theme" width="658" height="435" /></a>
 
 ## Requirements
 
@@ -40,11 +40,11 @@ Regardless of the installation method chosen, the theme must be selected once th
 
 - Download the appropriate version according to your situation:
 
-	- for GTK 3.0 and 3.2: [download Clearlooks-Phenix 1](http://jpfleury.indefero.net/p/clearlooks-phenix/source/download/v1/);
+	- for GTK 3.0 and 3.2: [download Clearlooks-Phenix 1](https://gitorious.org/projets-divers/clearlooks-phenix/archive/v1.zip);
 	
-	- for GTK 3.4: [download Clearlooks-Phenix 2](http://jpfleury.indefero.net/p/clearlooks-phenix/source/download/v2/).
+	- for GTK 3.4: [download Clearlooks-Phenix 2](https://gitorious.org/projets-divers/clearlooks-phenix/archive/v2.zip).
 	
-	- for GTK 3.6 and newer: [download Clearlooks-Phenix 3](http://jpfleury.indefero.net/p/clearlooks-phenix/source/download/master/).
+	- for GTK 3.6 and newer: [download Clearlooks-Phenix 3](https://gitorious.org/projets-divers/clearlooks-phenix/archive/master.zip).
 	
 	To find your GTK version:
 	
@@ -76,13 +76,13 @@ The package [`clearlooks-phenix-theme`](http://packages.debian.org/sid/clearlook
 
 ### Gentoo
 
-The following `ebuild` can be used:
+See the following package:
 
-	http://bbgentoo.ilb.ru/repos/bbgentoo/bbgentoo_overlay/tags/current/x11-themes/clearlooks-phenix/clearlooks-phenix-2.0.10.ebuild
+	http://packages.gentoo.org/package/x11-themes/clearlooks-phenix
 
 ### Ubuntu
 
-The package [`clearlooks-phenix-theme`](http://packages.ubuntu.com/quantal/clearlooks-phenix-theme) can be installed on Ubuntu 12.10 and newer. However, this package is not up-to-date, and the [PPA maintained by Andrew Shadura](https://launchpad.net/~andrewshadoura/+archive/clearlooks-phenix) can be used instead.
+The package [`clearlooks-phenix-theme`](http://packages.ubuntu.com/search?keywords=clearlooks-phenix-theme) can be installed on Ubuntu 12.10 and newer.
 
 ## Configuration
 
@@ -110,15 +110,7 @@ The icon theme used for the same screenshot is Mist, installed with the package
 	
 	- on Xfce: by going to *Settings > Appearence > Icons* in the main menu.
 
-Also, color schemes were made by DDZ to fit with Clearlooks-Phenix:
-
-- [Gnome-Colors-Clearlooks](http://opendesktop.org/content/show.php?content=151907), color scheme for the icon theme Gnome-Colors;
-
-- [Humanities-Clearlooks](http://opendesktop.org/content/show.php?content=151908), color scheme for the icon theme Humanities.
-
-- [KDE3-Clearlooks-Colors](http://opendesktop.org/content/show.php?content=151994), color scheme for KDE 3.
-
-- [KDE4-Clearlooks-Colors](http://opendesktop.org/content/show.php?content=151993), color scheme for KDE 4.
+Also, [color schemes](http://opendesktop.org/usermanager/search.php?username=DDZ&action=contents) were made by DDZ to fit with Clearlooks-Phenix.
 
 ### Desktop managed by Nautilus
 
@@ -160,20 +152,14 @@ If after installing or updating Ubuntu, the window buttons are on the left side,
 
 ## Development
 
-Last version: 3.0.13 (2012-12-09)
-
-Git is used for revision control. [Repository can be browsed online or cloned.][git]
-
-Clearlooks-Phenix has an [issue tracker], on which bug reports and feature requests can be submitted. Comments can also be posted on the webpage [Clearlooks-Phenix on GNOME-Look.org][gnome-look].
+Last version: 3.0.16 (2013-09-07)
 
-[git]: http://jpfleury.indefero.net/p/clearlooks-phenix/source/tree/master/
-[issue tracker]: http://jpfleury.indefero.net/p/clearlooks-phenix/issues/
-[gnome-look]: http://gnome-look.org/content/show.php?content=145210
+Git is used for revision control. [Repository can be browsed online or cloned.](https://gitorious.org/projets-divers/clearlooks-phenix)
 
 ## License
 
-Author: Jean-Philippe Fleury <[email protected]>  
-Copyright © 2011-2012 Jean-Philippe Fleury
+Author: Jean-Philippe Fleury (<http://www.jpfleury.net/en/contact.php>)  
+Copyright © 2011-2013 Jean-Philippe Fleury
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/desktop-themes/TraditionalOk/doc/images.sh.txt b/desktop-themes/TraditionalOk/doc/images.sh.txt
new file mode 100755
index 00000000..ad401d60
--- /dev/null
+++ b/desktop-themes/TraditionalOk/doc/images.sh.txt
@@ -0,0 +1,207 @@
+#!/bin/bash
+
+# Script d'assistance à la modification des images du thème Clearlooks-Phénix
+# dans le but de créer une variante de couleurs.
+#
+# Placer ce script à la racine du thème (c'est-à-dire au même emplacement que
+# le fichier «index.theme»), personnaliser la section «Variables à modifier.»
+# et lancer le script dans une console:
+#
+# $ bash images.sh
+
+########################################################################
+##
+## Variables à modifier.
+##
+########################################################################
+
+# Variation de la luminosité, de la saturation et de la teinte des fichiers PNG
+# pour le style «hover». Pour plus de détails, voir le lien suivant:
+# <http://www.imagemagick.org/script/command-line-options.php#modulate>.
+pngVariation=100,100,300
+
+# Liste des fichiers SVG.
+
+# Fichiers SVG à modifier pour une variante de couleurs.
+
+# Fichier «border-focused.svg».
+svgBfCouleurBordure=4b6e99
+svgBfCouleurBordureInterne=c8daef
+svgBfCouleurBordureExterneBas=ffffff
+
+# Fichier «border-focused-ptb.svg».
+svgBfPtbCouleurBordure=869bb7
+svgBfPtbCouleurBordureInterne=cccccc
+
+# Fichier «border-focused-switch.svg».
+svgBfScouleurBordure=4b6e99
+svgBfScouleurBordureExterneBas=ffffff
+
+# Fichiers SVG ne devant pas nécessairement être modifiés pour une variante
+# de couleurs.
+
+# Fichier «border.svg».
+svgBcouleurBordure=918e8c
+svgBcouleurBordureExterneBas=ffffff
+
+# Fichier «border-error.svg».
+svgBeCouleurBordure=9b3636
+svgBeCouleurBordureExterneBas=ffffff
+
+# Fichier «border-gnome-panel-button.svg».
+svgBgPbCouleurBordure=918e8c
+
+# Fichier «border-inline-button.svg».
+svgBiBcouleurBordure=918e8c
+svgBiBcouleurBordureExterneBas=ffffff
+
+# Fichier «border-insensitive.svg».
+svgBiCouleurBordure=a9a5a2
+svgBiCouleurBordureExterneBas=ffffff
+
+########################################################################
+##
+## Code principal. Ne pas modifier.
+##
+########################################################################
+
+# Dépendances.
+
+if ! type convert > /dev/null 2>&1; then
+	echo "Veuillez installer le paquet «imagemagick»" >&2
+	exit 1
+fi
+
+if ! type sed > /dev/null 2>&1; then
+	echo "Veuillez installer le paquet «sed»" >&2
+	exit 1
+fi
+
+# Dossier de sauvegarde des images modifiées.
+
+dossierSauv=gtk-3.0/img/modif
+i=0
+
+while ! mkdir "$dossierSauv" > /dev/null 2>&1 && ((i < 100)); do
+	((++i))
+	dossierSauv=gtk-3.0/img/modif-$i
+done
+
+if [[ ! -d $dossierSauv ]]; then
+	echo "Impossible de créer un dossier de sauvegarde pour y déplacer les images modifiées." >&2
+	exit 1
+fi
+
+# Modification des images PNG.
+
+png=(
+	gtk-3.0/img/checkbox-checked-hover.png
+	gtk-3.0/img/checkbox-mixed-hover.png
+	gtk-3.0/img/checkbox-unchecked-hover.png
+	gtk-3.0/img/menuitem-checkbox-checked-hover.png
+	gtk-3.0/img/menuitem-checkbox-hover.png
+	gtk-3.0/img/menuitem-checkbox-mixed-hover.png
+	gtk-3.0/img/menuitem-radio-checked-hover.png
+	gtk-3.0/img/menuitem-radio-hover.png
+	gtk-3.0/img/radio-checked-hover.png
+	gtk-3.0/img/radio-mixed-hover.png
+	gtk-3.0/img/radio-unchecked-hover.png
+)
+
+for image in "${png[@]}"; do
+	convert "$image" -modulate "$pngVariation" "$dossierSauv/${image##*/}"
+done
+
+# Modification des images SVG.
+
+couleur1=918e8c
+couleur2=ffffff
+
+if [[ $svgBcouleurBordure != $couleur1 \
+   || $svgBcouleurBordureExterneBas != $couleur2 ]]; then
+	fichier=gtk-3.0/img/border.svg
+	cp "$fichier" "$dossierSauv"
+	sed -i "s/#$couleur1;/#$svgBcouleurBordure;/" "$dossierSauv/${fichier##*/}"
+	sed -i "s/#$couleur2;/#$svgBcouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
+fi
+
+couleur1=9b3636
+couleur2=ffffff
+
+if [[ $svgBeCouleurBordure != $couleur1 \
+   || $svgBeCouleurBordureExterneBas != $couleur2 ]]; then
+	fichier=gtk-3.0/img/border-error.svg
+	cp "$fichier" "$dossierSauv"
+	sed -i "s/#$couleur1;/#$svgBeCouleurBordure;/" "$dossierSauv/${fichier##*/}"
+	sed -i "s/#$couleur2;/#$svgBeCouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
+fi
+
+couleur1=4b6e99
+couleur2=c8daef
+couleur3=ffffff
+
+if [[ $svgBfCouleurBordure != $couleur1 || $svgBfCouleurBordureInterne != $couleur2 \
+   || $svgBfCouleurBordureExterneBas != $couleur3 ]]; then
+	fichier=gtk-3.0/img/border-focused.svg
+	cp "$fichier" "$dossierSauv"
+	sed -i "s/#$couleur1;/#$svgBfCouleurBordure;/" "$dossierSauv/${fichier##*/}"
+	sed -i "s/#$couleur2;/#$svgBfCouleurBordureInterne;/" "$dossierSauv/${fichier##*/}"
+	sed -i "s/#$couleur3;/#$svgBfCouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
+fi
+
+couleur1=869bb7
+couleur2=cccccc
+
+if [[ $svgBfPtbCouleurBordure != $couleur1 \
+   || $svgBfPtbCouleurBordureInterne != $couleur2 ]]; then
+	fichier=gtk-3.0/img/border-focused-ptb.svg
+	cp "$fichier" "$dossierSauv"
+	sed -i "s/#$couleur1;/#$svgBfPtbCouleurBordure;/" "$dossierSauv/${fichier##*/}"
+	sed -i "s/#$couleur2;/#$svgBfPtbCouleurBordureInterne;/" "$dossierSauv/${fichier##*/}"
+fi
+
+couleur1=4b6e99
+couleur2=ffffff
+
+if [[ $svgBfScouleurBordure != $couleur1 \
+   || $svgBfScouleurBordureExterneBas != $couleur2 ]]; then
+	fichier=gtk-3.0/img/border-focused-switch.svg
+	cp "$fichier" "$dossierSauv"
+	sed -i "s/#$couleur1;/#$svgBfScouleurBordure;/" "$dossierSauv/${fichier##*/}"
+	sed -i "s/#$couleur2;/#$svgBfScouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
+fi
+
+couleur1=918e8c
+
+if [[ $svgBgPbCouleurBordure != $couleur1 ]]; then
+	fichier=gtk-3.0/img/border-gnome-panel-button.svg
+	cp "$fichier" "$dossierSauv"
+	sed -i "s/#$couleur1;/#$svgBgPbCouleurBordure;/" "$dossierSauv/${fichier##*/}"
+fi
+
+couleur1=918e8c
+couleur2=ffffff
+
+if [[ $svgBiBcouleurBordure != $couleur1 \
+   || $svgBiBcouleurBordureExterneBas != $couleur2 ]]; then
+	fichier=gtk-3.0/img/border-inline-button.svg
+	cp "$fichier" "$dossierSauv"
+	sed -i "s/#$couleur1;/#$svgBiBcouleurBordure;/" "$dossierSauv/${fichier##*/}"
+	sed -i "s/#$couleur2;/#$svgBiBcouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
+fi
+
+couleur1=a9a5a2
+couleur2=ffffff
+
+if [[ $svgBiCouleurBordure != $couleur1 \
+   || $svgBiCouleurBordureExterneBas != $couleur2 ]]; then
+	fichier=gtk-3.0/img/border-insensitive.svg
+	cp "$fichier" "$dossierSauv"
+	sed -i "s/#$couleur1;/#$svgBiCouleurBordure;/" "$dossierSauv/${fichier##*/}"
+	sed -i "s/#$couleur2;/#$svgBiCouleurBordureExterneBas;/" "$dossierSauv/${fichier##*/}"
+fi
+
+# Fin du script.
+
+echo "Les images ont été modifiées."
+
diff --git a/desktop-themes/TraditionalOk/doc/version.txt b/desktop-themes/TraditionalOk/doc/version.txt
index b52c6e60..f9442898 100644
--- a/desktop-themes/TraditionalOk/doc/version.txt
+++ b/desktop-themes/TraditionalOk/doc/version.txt
@@ -1 +1 @@
-3.0.13 (2012-12-09)
+3.0.16 (2013-09-07)
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/Makefile.am b/desktop-themes/TraditionalOk/gtk-3.0/Makefile.am
index 004e0068..57bcd382 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/Makefile.am
+++ b/desktop-themes/TraditionalOk/gtk-3.0/Makefile.am
@@ -8,6 +8,7 @@ theme_DATA = \
 	gtk-variant.css \
 	gtk-widgets.css \
 	gtk-widgets-img.css \
+	mate-applications.css \
 	settings.ini
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/applications.css b/desktop-themes/TraditionalOk/gtk-3.0/applications.css
index 42140447..029a5495 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/applications.css
@@ -66,69 +66,6 @@ GtkIconView.documents-main-view.check {
 	border-radius: 3px;
 }
 
-/***************
- * gnome-panel *
- ***************/
-
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar,
-PanelToplevel,
-PanelWidget,
-PanelApplet {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
-.gnome-panel-menu-bar,
-PanelApplet > GtkMenuBar.menubar,
-PanelApplet > GtkMenuBar.menubar.menuitem,
-PanelMenuBar.menubar,
-PanelMenuBar.menubar.menuitem {
-	-PanelMenuBar-icon-visible: true;
-}
-
-PanelAppletFrame {
-	background-color: @applet_frame_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
-PanelApplet .button,
-PanelApplet .button:active,
-PanelApplet .button:hover,
-PanelApplet .button:hover:active {
-	border-image: url("img/border-gnome-panel-button.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-}
-
-PanelApplet .menu .menuitem *:active {
-	color: @theme_text_color;
-}
-
-PanelApplet .menu .menuitem *:selected {
-	color: @theme_selected_fg_color;
-}
-
-PanelWidget > .button
-{
-	padding: 0;
-}
-
-WnckPager {
-	background-color: @pager_bg_color;
-}
-
-NaTrayApplet {
-	-NaTrayApplet-icon-padding: 7;
-	-NaTrayApplet-icon-size: 22;
-}
-
-GsmFailWhaleDialog {
-	background-color: @os_chrome_bg_color;
-	background-image: none;
-	color: @os_chrome_fg_color;
-}
-
 /******************
  * gnome-terminal *
  ******************/
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css
index f3ea71fb..eeff8574 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css
@@ -386,6 +386,7 @@ GtkComboBox.combobox-entry .button,
 GtkSwitch.trough,
 /* generic button borders */
 .button,
+.titlebar .titlebutton:hover,
 .primary-toolbar .button.raised,
 .primary-toolbar .raised .button,
 .primary-toolbar GtkComboBox .button,
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index 95b54e25..e8cb82fb 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -63,7 +63,11 @@ GtkWindow {
 GtkImage,
 GtkImage:insensitive,
 GtkLabel,
-GtkLabel:insensitive {
+GtkLabel:insensitive,
+GtkBox,
+GtkBox:insensitive,
+GtkGrid,
+GtkGrid:insensitive {
 	background-color: transparent;
 }
 
@@ -416,7 +420,7 @@ GtkScale.mark {
 	border-color: @border_color;
 	border-style: solid;
 	border-radius: 3px;
-	background-color: @theme_base_color;
+	background-color: @theme_bg_color;
 	padding: 0;
 }
 
@@ -454,7 +458,13 @@ GtkComboBox.combobox-entry .button {
 	border-color: transparent;
 }
 
+/* We want anything inside the buttons to use their background */
+.button * {
+	background-color: transparent;
+}
+
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
+GtkMenuToolButton *,
 .primary-toolbar .button,
 .primary-toolbar .button:insensitive {
 	background-image: none;
@@ -535,6 +545,7 @@ GtkComboBox.combobox-entry .button {
 .toolbar GtkComboBox .button:focus,
 GtkComboBox.combobox-entry .button,
 .primary-toolbar GtkComboBox.combobox-entry .button,
+.titlebar .titlebutton:hover,
 GtkColorChooserWidget #add-color-button {
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -680,6 +691,7 @@ GtkComboBox.combobox-entry .button:insensitive {
 	border-radius: 3px;
 	border-style: solid;
 	border-width: 1px;
+	background-color: transparent;
 }
 
 .notebook tab.top {
@@ -770,6 +782,10 @@ GtkComboBox.combobox-entry .button:insensitive {
 	                  @notebook_active_tab_gradient_b);
 }
 
+.notebook tab * {
+	background-color: transparent;
+}
+
 /* close button styling */
 .notebook tab .button,
 .notebook tab .button:active,
@@ -1042,22 +1058,19 @@ GtkComboBox .button *:hover {
  *********/
 
 /* combobox menus */
-GtkTreeMenu.menu {
-	background-color: @theme_base_color;
+GtkTreeMenu.menu,
+GtkTreeMenu.menu * {
+	background-color: @menu_bg_color;
 }
 
 GtkTreeMenu .menuitem {
 	padding: 2px;
 }
 
-GtkTreeMenu .menuitem * {
-	color: @theme_text_color;
-}
-
 .menu {
 	background-color: @menu_bg_color;
 	color: @menu_fg_color;
-	padding: 0;
+	padding: 1px;
 	border-style: solid;
 	border-width: 1px;
 	border-color: @menu_border_color;
@@ -1065,7 +1078,7 @@ GtkTreeMenu .menuitem * {
 
 .menu.button {
 	background-image: none;
-	background-color: @theme_base_color;
+	background-color: @menu_bg_color;
 	color: @internal_element_color;
 
 	border-image: none;
@@ -1092,7 +1105,7 @@ GtkTreeMenu .menuitem * {
 /* this controls the general appearance of the menubar */
 .menubar {
 	border-style: none;
-	padding: 4px;
+	padding: 0px;
 	-GtkWidget-window-dragging: true;
 	-GtkMenuBar-internal-padding: 1;
 	background-image: -gtk-gradient (linear,
@@ -1115,6 +1128,7 @@ GtkTreeMenu .menuitem * {
 	border-width: 1px 1px 0px;
 	border-color: @menubar_menuitem_hover_border_color;
 	border-radius: 3px 3px 0 0;
+	color: @menubar_menuitem_hover_color;
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -1132,6 +1146,11 @@ GtkTreeMenu .menuitem * {
 .menu .menuitem {
 	-GtkMenuItem-arrow-scaling: 0.5;
 	padding: 4px;
+	background-color: @menu_bg_color;
+}
+
+.menu .menuitem > * {
+	background-color: transparent;
 }
 
 .menu .menuitem:hover {
@@ -1144,13 +1163,6 @@ GtkTreeMenu .menuitem:hover,
 	border-style: solid;
 	border-width: 1px;
 	border-color: @menubar_menuitem_hover_border_color;
-	background-image: -gtk-gradient (linear,
-	                  left top,
-	                  left bottom,
-	                  from (@menubar_menuitem_hover_gradient_a),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
-	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
-	                  to (@menubar_menuitem_hover_gradient_d));
 }
 
 GtkTreeMenu .menuitem *:hover,
@@ -1159,6 +1171,13 @@ GtkTreeMenu .menuitem *:hover,
 .menu .menuitem:hover,
 .menu .menuitem *:hover {
 	color: @theme_selected_fg_color;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@menubar_menuitem_hover_gradient_a),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_b),
+	                  color-stop (0.50, @menubar_menuitem_hover_gradient_c),
+	                  to (@menubar_menuitem_hover_gradient_d));
 }
 
 .menu .menuitem:insensitive,
@@ -1185,6 +1204,7 @@ GtkTreeMenu .menuitem *:hover,
 
 .menuitem.separator {
 	color: @menu_separator_color;
+	padding: 3px 1px 3px 1px;
 
 	-GtkMenuItem-horizontal-padding: 0;
 }
@@ -1348,29 +1368,11 @@ GtkCheckButton:selected:focus {
  ***********/
 
 .sidebar,
-.sidebar .view {
+.sidebar .view,
+.sidebar GtkScrolledWindow {
 	background-color: @sidebar_bg_color;
 }
 
-.sidebar .scrollbar.trough {
-	border-radius: 100px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: transparent;
-}
-
-.sidebar .scrollbar.trough {
-	background-color: shade(@sidebar_bg_color, 0.8);
-}
-
-.sidebar .scrollbar.slider {
-	background-color: @sidebar_bg_color;
-}
-
-.sidebar .scrollbar.slider:hover {
-	background-color: @theme_base_color;
-}
-
 .sidebar .radio,
 .sidebar .radio:focus,
 .sidebar .radio:selected {
@@ -1719,25 +1721,25 @@ GtkInfoBar:last-child,
 	border-style: solid;
 }
 
-.info {
+.info > * {
 	background-color: @info_bg_color;
 	color: @info_fg_color;
 	border-color: darker(@info_bg_color);
 }
 
-.warning {
+.warning > * {
 	background-color: @warning_bg_color;
 	color: @warning_fg_color;
 	border-color: darker(@warning_bg_color);
 }
 
-.question {
+.question > * {
 	background-color: @question_bg_color;
 	color: @question_fg_color;
 	border-color: darker(@question_bg_color);
 }
 
-.error {
+.error > * {
 	background-color: @error_bg_color;
 	color: @error_fg_color;
 	border-color: darker(@error_bg_color);
@@ -1763,3 +1765,61 @@ GtkInfoBar:last-child,
 	background-color: transparent;
 }
 
+/************
+ * Titlebar *
+ ************/
+
+.titlebar {
+	background-image: linear-gradient(to bottom,
+	                  @theme_base_color,
+	                  @theme_bg_color);
+	background-color: transparent;
+	border-radius: 7px 7px 0px 0px;
+	border-bottom: 1px solid;
+	border-color: shade(@border_color, 1.30);
+}
+
+.titlebar > * {
+	background: none;
+}
+
+.tiled .titlebar {
+	border-radius: 0;
+}
+
+.maximized .titlebar {
+	border-radius: 0;
+}
+
+.titlebar .title {
+	font: Bold;
+}
+
+.titlebar .titlebutton {
+	background: none;
+	border-image: none;
+	padding: 5px 5px 6px 5px;
+}
+
+.window-frame {
+	border-width: 1px;
+	border-radius: 7px 7px 0 0;
+	border-style: solid;
+	margin: 10px;
+}
+
+/************
+ * Popovers *
+ ************/
+
+GtkPopover {
+	border: 1px solid;
+	border-radius: 7px;
+	border-color: @border_color;
+	background-clip: border-box;
+}
+
+GtkPopover > .toolbar,
+GtkPopover.osd > .toolbar .button {
+	background-color: transparent;
+}
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk.css
index c916fc5a..6dd43210 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk.css
@@ -394,4 +394,5 @@
 @import url("gtk-widgets-img.css");
 @import url("gtk-widgets.css");
 @import url("applications.css");
+@import url("mate-applications.css");
 
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
new file mode 100644
index 00000000..5ee4a146
--- /dev/null
+++ b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
@@ -0,0 +1,225 @@
+/************
+ * Caja *
+ ************/
+
+
+.caja-desktop.caja-canvas-item {
+	color: @theme_base_color;
+	text-shadow: 1px 1px alpha (@theme_fg_color, 0.8);
+}
+
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:prelight,
+.caja-desktop.caja-canvas-item:selected {
+	text-shadow: none;
+}
+
+
+.caja-desktop .entry {
+	background-image: none;
+	border-image: none;
+}
+
+/***************
+ * mate-panel *
+ ***************/
+
+.mate-panel-menu-bar,
+MatePanelApplet > GtkMenuBar.menubar,
+PanelToplevel,
+PanelWidget,
+PanelFrame,
+PanelAppletFrame,
+MatePanelAppletFrameDBus,
+MatePanelAppletContainer,
+MatePanelApplet {
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@menubar_gradient_a),
+	                  color-stop (0.50, @menubar_gradient_b),
+	                  to (@menubar_gradient_c));
+	background-color: @theme_bg_color;
+	padding: 0px;
+	color: @theme_fg_color;
+	text-shadow: none;
+}
+
+/* set selected menubar button */
+PanelMenuBar.menubar .menuitem:hover {
+	background-image: none;
+	background-color: shade(@theme_selected_bg_color, 1.1);
+	border-style: none;
+	border-image: none;
+	/* join menuitem to menu */
+	border-radius: 3px 3px 0px 0px;
+	border-width: 0px;
+	text-shadow: none;
+	padding: 3px 5px;
+}
+
+/* set selected menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem:active:hover,
+PanelMenuBar.menubar .menu .menuitem:hover {
+	background-image: none;
+	color: @theme_text_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
+	border-color: alpha(@theme_selected_bg_color, 0.1);
+	padding: 3px 5px;
+}
+
+MatePanelApplet {
+	border-width: 0;
+}
+
+PanelSeparator {
+	border-width: 0;
+	background-image: none;
+	color: shade (@theme_bg_color, 0.75);
+	text-shadow: none;
+}
+
+/* desktop-applet, clockapplet, drivemount, character-map,
+dictionary */
+MatePanelApplet .button {
+	/* Due to a bug somewhere in gtk or cairo,
+	   a padding of zero (or even one) doesn't work always!!! */
+	padding: 0px;
+
+	border-radius: 3px;
+	border-width: 1px;
+	border-style: solid;
+	text-shadow: none;
+
+	color: @theme_fg_color;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@button_gradient_a),
+	                  color-stop (0.50, @button_gradient_b),
+	                  color-stop (0.50, @button_gradient_c),
+	                  to (@button_gradient_d));
+}
+
+MatePanelApplet .button:active:hover,
+MatePanelApplet .button:active {
+	border-style: solid;
+	background-image: linear-gradient(to bottom,
+	                  @button_active_gradient_a,
+	                  @button_active_gradient_b 3px,
+	                  @button_active_gradient_c 4px,
+	                  @button_active_gradient_d 50%,
+	                  @button_active_gradient_e 50%,
+	                  @button_active_gradient_f);
+}
+
+MatePanelApplet .button:hover {
+	border-style: solid;
+	background-image: linear-gradient(to bottom,
+	                                  @button_gradient_color_b,
+	                                  @button_gradient_color_a);
+}
+
+/*Wncklist */
+WnckTasklist .button {
+	padding: 0px;
+	border-radius: 3px;
+	border-width: 1px;
+	border-style: solid;
+	text-shadow: none;
+
+	color: @theme_fg_color;
+	background-color: transparent;
+	background-image: -gtk-gradient (linear,
+	                  left top,
+	                  left bottom,
+	                  from (@button_gradient_a),
+	                  color-stop (0.50, @button_gradient_b),
+	                  color-stop (0.50, @button_gradient_c),
+	                  to (@button_gradient_d));
+}
+
+WnckTasklist .button:active:hover,
+WnckTasklist .button:active {
+	border-style: solid;
+	background-color: transparent;
+	background-image: linear-gradient(to bottom,
+	                  @button_active_gradient_a,
+	                  @button_active_gradient_b 3px,
+	                  @button_active_gradient_c 4px,
+	                  @button_active_gradient_d 50%,
+	                  @button_active_gradient_e 50%,
+	                  @button_active_gradient_f);
+}
+
+WnckTasklist .button:hover {
+	border-style: solid;
+	background-color: transparent;
+	background-image: linear-gradient(to bottom,
+	                  @button_hover_gradient_c);
+}
+
+/* set selected button WnckSelector */
+.mate-panel-window-menu-menu-bar .menuitem:hover,
+MatePanelApplet > WnckSelector.menubar .menuitem:hover {
+	color: @theme_fg_color;
+	border-style: solid;
+	background-image: linear-gradient(to bottom,
+	                  @button_active_gradient_a,
+	                  @button_active_gradient_b 3px,
+	                  @button_active_gradient_c 4px,
+	                  @button_active_gradient_d 50%,
+	                  @button_active_gradient_e 50%,
+	                  @button_active_gradient_f);
+}
+
+/* set WnckSelector selected menuitem */
+.mate-panel-window-menu-menu-bar .menu .menuitem:hover,
+MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover {
+	background-image: none;
+	background-color: shade(@theme_selected_bg_color, 1.1);
+	color: @theme_text_color;
+	border-style: solid;
+	border-width: 1px;
+	border-radius: 3px;
+	border-image: url("assets/menu-border.svg") 2 / 2px stretch;
+	/*border-color: alpha(@theme_selected_bg_color, 0.1);*/
+}
+
+ClockBox,
+.mate-panel-menu-bar.menubar,
+MatePanelApplet > GtkMenuBar.menubar {
+	font: normal;
+}
+
+WnckPager {
+	background-image: none;
+	border-color: transparent;
+	background-color: shade(@theme_bg_color, 0.9);
+	text-shadow: none;
+}
+
+/* prelight of WnckPager */
+MatePanelApplet *:hover {
+	background-image: linear-gradient(to bottom,
+		shade (@theme_selected_bg_color, 2.86),
+		shade (@theme_selected_bg_color, 1.0));
+	background-color: @theme_base_color;
+}
+
+/* Classic icon style */
+/*.mate-panel-menu-bar {
+	-PanelMenuBar-icon-visible: true;
+}*/
+
+NaTrayApplet {
+	background-image: none;
+	background-color: @theme_bg_color;
+	padding: 0;
+	color: @theme_fg_color;
+	text-shadow: none;
+/*	-NaTrayApplet-icon-padding: 12;
+	-NaTrayApplet-icon-size: 16;*/
+}
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/settings.ini b/desktop-themes/TraditionalOk/gtk-3.0/settings.ini
index e38d9b13..0bd15f97 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/settings.ini
+++ b/desktop-themes/TraditionalOk/gtk-3.0/settings.ini
@@ -2,4 +2,4 @@
 gtk-color-scheme = "base_color:#ffffff\nbg_color:#edeceb\nfg_color:#000000\nselected_bg_color:#86abd9\nselected_fg_color:#ffffff\ntooltip_bg_color:#f5f5b5\ntooltip_fg_color:#000000\ntext_color:#1a1a1a\nlink_color:#0000ee\nvisited_link_color:#551a8b"
 gtk-auto-mnemonics = 0
 gtk-visible-focus = automatic
-
+gtk-primary-button-warps-slider = false
diff --git a/desktop-themes/TraditionalOk/metacity-1/metacity-theme-1.xml b/desktop-themes/TraditionalOk/metacity-1/metacity-theme-1.xml
index dbdc2ef2..f492ffc6 100644
--- a/desktop-themes/TraditionalOk/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/TraditionalOk/metacity-1/metacity-theme-1.xml
@@ -2,7 +2,7 @@
 <!-- 	$Id$	 -->
 <metacity_theme>
 <info>
-	<name>TraditionalOk</name>
+	<name>Clearlooks</name>
 	<author>Daniel Borgmann &lt;[email protected]&gt;, Andrea Cimitan &lt;[email protected]&gt;</author>
 	<copyright>&#194; 2005-2007 Daniel Borgmann, Andrea Cimitan</copyright>
 	<date>Apr, 2007</date>
@@ -349,7 +349,7 @@
 
 <draw_ops name="title_text_unfocused">
 	<!--<title color="shade/gtk:bg[NORMAL]/1.07" x="5 `max` (width-title_width)/2+1" y="1 `max` ((height-title_height)/2)+1"/>-->
-	<title color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
+	<title color="blend/gtk:fg[NORMAL]/gtk:text[NORMAL]/5.45" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
 </draw_ops>
 
 <draw_ops name="title">
@@ -463,12 +463,12 @@
 
 	<!-- fill gradient -->
 	<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
-		<color value="shade/gtk:bg[NORMAL]/1.15"/>
-		<color value="shade/gtk:bg[NORMAL]/1.07"/>
+		<color value="shade/gtk:bg[NORMAL]/0.95"/>
+		<color value="shade/gtk:bg[NORMAL]/0.87"/>
 	</gradient>
 	<gradient type="vertical" x="3" y="(height)/2" width="width-6" height="(height)/2-2">
-		<color value="shade/gtk:bg[NORMAL]/1.05"/>
-		<color value="shade/gtk:bg[NORMAL]/0.97"/>
+		<color value="shade/gtk:bg[NORMAL]/0.85"/>
+		<color value="shade/gtk:bg[NORMAL]/0.77"/>
 	</gradient>
 
 	<!-- bottom border smooth effect -->