--- a/annot-server/static/js/pianoroll.js	Sat Oct 25 12:05:37 2014 +0200
+++ b/annot-server/static/js/pianoroll.js	Sat Oct 25 13:33:08 2014 +0200
@@ -132,6 +132,7 @@
     var width = duration * pixelsPerSecond / 1000;
     // We draw the rectangle
     var graphics = new PIXI.Graphics();
+    //console.log("beginX = ", beginX, "canal = ", canal, "color = ", noteColor[canal], "width = ", width, "note = ", note, "velocity = ", velocity);
     graphics.beginFill(noteColor[canal], (velocity / 128));
     var y = (128-note) * prHeight / 128; // (128-note) because y = 0 is for note = 128 and y = 128 for note = 0
     graphics.drawRect(beginX, Math.floor(y - (noteHeight/2) + ((prHeight / 128)/2)), width, noteHeight);

--- a/client/data/categories.json	Sat Oct 25 12:05:37 2014 +0200
+++ b/client/data/categories.json	Sat Oct 25 13:33:08 2014 +0200
@@ -3,49 +3,49 @@
         {
             "label": "Ça me raconte",
             "prelabel": "",
-            "color": "rgb(205,200,63)",
+            "color": "rgb(121,187,146)",
             "code": "melodie",
             "subcategories": [
                 {
                     "label": "Mélodieux",
                     "prelabel": "Ça me raconte",
-                    "color": "rgb(205,200,63)",
+                    "color": "rgb(121,187,146)",
                     "code": "cameraconte-melodieux"
                 },
                 {
                     "label": "Consonnant",
                     "prelabel": "Ça me raconte",
-                    "color": "rgb(205,200,63)",
+                    "color": "rgb(121,187,146)",
                     "code": "cameraconte-consonnant"
                 },
                 {
                     "label": "Dissonnant",
                     "prelabel": "Ça me raconte",
-                    "color": "rgb(205,200,63)",
+                    "color": "rgb(121,187,146)",
                     "code": "cameraconte-dissonnant"
                 },
                 {
                     "label": "Construction",
                     "prelabel": "Ça me raconte",
-                    "color": "rgb(211,94,60)",
+                    "color": "rgb(121,187,146)",
                     "code": "cameraconte-construction"
                 },
                 {
                     "label": "Suspense",
                     "prelabel": "Ça me raconte",
-                    "color": "rgb(211,94,60)",
+                    "color": "rgb(121,187,146)",
                     "code": "cameraconte-suspens"
                 },
                 {
                     "label": "Intriguant",
                     "prelabel": "Ça me raconte",
-                    "color": "rgb(211,94,60)",
+                    "color": "rgb(121,187,146)",
                     "code": "cameraconte-intriguant"
                 },
                 {
                     "label": "Régulier",
                     "prelabel": "Ça me raconte",
-                    "color": "rgb(211,94,60)",
+                    "color": "rgb(121,187,146)",
                     "code": "cameraconte-regulier"
                 }
             ]
@@ -53,31 +53,31 @@
         {
             "label": "Ça me bouge",
             "prelabel": "",
-            "color": "rgb(78,144,204)",
+            "color": "rgb(255,50,50)",
             "code": "rythme",
             "subcategories": [
                 {
                     "label": "Lent",
                     "prelabel": "Ça me bouge",
-                    "color": "rgb(78,144,204)",
+                    "color": "rgb(255,50,50)",
                     "code": "camebouge-lent"
                 },
                 {
                     "label": "Rapide",
                     "prelabel": "Ça me bouge",
-                    "color": "rgb(78,144,204)",
+                    "color": "rgb(255,50,50)",
                     "code": "camebouge-rapide"
                 },
                 {
                     "label": "Déstructuré",
                     "prelabel": "Ça me bouge",
-                    "color": "rgb(78,144,204)",
+                    "color": "rgb(255,50,50)",
                     "code": "camebouge-destructure"
                 },
                 {
                     "label": "Ça swingue",
                     "prelabel": "Ça me bouge",
-                    "color": "rgb(78,144,204)",
+                    "color": "rgb(255,50,50)",
                     "code": "camebouge-caswingue"
                 }
             ]
@@ -85,31 +85,31 @@
         {
             "label": "Ça se bagarre",
             "prelabel": "",
-            "color": "rgb(121,187,146)",
+            "color": "rgb(78,144,204)",
             "code": "gestuelle",
             "subcategories": [
                 {
                     "label": "Interaction entre musiciens",
                     "prelabel": "Ça se bagarre",
-                    "color": "rgb(121,187,146)",
+                    "color": "rgb(78,144,204)",
                     "code": "casebagarre-interaction"
                 },
                 {
                     "label": "Contact",
                     "prelabel": "Ça se bagarre",
-                    "color": "rgb(121,187,146)",
+                    "color": "rgb(78,144,204)",
                     "code": "casebagarre-contact"
                 },
                 {
                     "label": "Théâtralité",
                     "prelabel": "Ça se bagarre",
-                    "color": "rgb(121,187,146)",
+                    "color": "rgb(78,144,204)",
                     "code": "casebagarre-theatralite"
                 },
                 {
                     "label": "Danse",
                     "prelabel": "Ça se bagarre",
-                    "color": "rgb(121,187,146)",
+                    "color": "rgb(78,144,204)",
                     "code": "casebagarre-danse"
                 }
             ]
@@ -117,123 +117,135 @@
         {
             "label": "Ça sonne",
             "prelabel": "",
-            "color": "rgb(137,199,214)",
+            "color": "rgb(222,139,83)",
             "code": "a-rejouer",
             "subcategories": [
                 {
                     "label": "Piano",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-piano"
                 },
                 {
                     "label": "Clarinette",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-clarinette"
                 },
                 {
                     "label": "Saxophone",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-saxophone"
                 },
                 {
                     "label": "Batterie",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-batterie"
                 },
                 {
                     "label": "Voix chantée",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-voixchantee"
                 },
                 {
                     "label": "Guitare",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-guitare"
                 },
                 {
                     "label": "Synthé",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-synthe"
                 },
                 {
                     "label": "Voix parlée",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-voixparlee"
                 },
                 {
                     "label": "Karlax",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-karlax"
                 },
                 {
                     "label": "Boîte à rythme",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-boitearythme"
                 },
                 {
                     "label": "Flûte",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-flute"
                 },
                 {
                     "label": "Violon",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-violon"
                 },
                 {
                     "label": "Flûte Scoatariu",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-flutescoatariu"
                 },
                 {
                     "label": "Violoncelle",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-violoncelle"
                 },
                 {
                     "label": "Accordéon",
                     "prelabel": "Ça sonne",
-                    "color": "rgb(137,199,214)",
+                    "color": "rgb(222,139,83)",
                     "code": "casonne-accordeon"
+                },
+                {
+                    "label": "Guitare électrique",
+                    "prelabel": "Ça sonne",
+                    "color": "rgb(222,139,83)",
+                    "code": "casonne-guitareelectrique"
                 }
             ]
         },
         {
             "label": "À Rejouer",
             "prelabel": "",
-            "color": "rgb(222,139,83)",
+            "color": "rgb(205,200,63)",
             "code": "a-rejouer",
             "subcategories": [
                 {
+                    "label": "À l'identique",
+                    "prelabel": "À Rejouer",
+                    "color": "rgb(205,200,63)",
+                    "code": "a-rejouer-alidentique"
+                },
+                {
                     "label": "Plus vite",
                     "prelabel": "À Rejouer",
-                    "color": "rgb(222,139,83)",
+                    "color": "rgb(205,200,63)",
                     "code": "a-rejouer-plus-vite"
                 },
                 {
                     "label": "Plus lentement",
                     "prelabel": "À Rejouer",
-                    "color": "rgb(222,139,83)",
+                    "color": "rgb(205,200,63)",
                     "code": "a-rejouer-plus-lentement"
                 },
                 {
                     "label": "Avec un autre instrument",
                     "prelabel": "À Rejouer",
-                    "color": "rgb(222,139,83)",
+                    "color": "rgb(205,200,63)",
                     "code": "a-rejouer-autre-instrument"
                 }
             ]