diff --git a/trac/htdocs/libcaca.css b/trac/htdocs/libcaca.css
index 2cd4fa0..a160180 100644
--- a/trac/htdocs/libcaca.css
+++ b/trac/htdocs/libcaca.css
@@ -2,7 +2,7 @@
 
 */
 
-/* styles généraux */
+/* = styles généraux = */
 
 body {
     background: #552701 /*url(/browser/web/trunk/static/img/libcaca.png?format=raw) no-repeat top center*/;
@@ -22,72 +22,42 @@ body, td, th, h1, h2, h3, h4, #main {
 }
 
 h1, h2, h3 {
-    border-color: #984601;
+  text-indent: 0.5em;
+  border-style: solid;
+  background-color: inherit;
+  font-variant: small-caps;
+  border-width: 0 0 2px 0;
+  border-color: #984601;
+  color: #984601;
 }
 
-:link, :visited {
-    color: #984601;
-    border-bottom: none;
+h1 {
+  font-size: 1.6em;
 }
 
-:link:hover, :visited:hover {
-    color: #2C1F1C;
+h2 {
+  font-size: 1.3em;
 }
 
-/* FORMS */
-
-input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover {
-    background: #984601;
-}
-input[type="button"], input[type="submit"], input[type="reset"] {
-    background: #C46300;
-    border: 1px outset #984601;
-    -moz-border-radius: 4px;
-}
-input[type="text"], input.textwidget, textarea {
-    border: 1px solid #C46300;
-}
-legend {
-    color: #984601;
+h3 {
+  font-size: 1.1em;
 }
 
-fieldset {
-    border-color: #984601;
+p {
+  text-indent: 1em;
+  text-align: inherit;
 }
 
-#content.ticket {
-    margin: 0 auto;
-}
-.buttons {
-    text-align: center;
-}
-.buttons input {
-    margin: 0.5em;
-}
-#content.ticket fieldset {
-    background: #E5DCDC;
-}
-#field-description {
-    background: #fff url(/browser/web/trunk/static/img/dashit-light.png?format=raw) no-repeat right bottom;
-}
-#attachments {
-    background: #fff;
-    border: none;
-}
-#attachfile {
-    text-align: center;
-}
-#changelog {
-    background: #cccc88;
-    border: 1px solid #C46300;
-}
-a.ext-link .icon {
-    background-position: right center;
-    padding-right: 16px;
+:link, :visited {
+    color: #984601;
+    border-bottom: none;
 }
 
+:link:hover, :visited:hover {
+    color: #2C1F1C;
+}
 
-/*  HEADER */
+/*   = HEADER = */
 
 .nav {
     text-align: right;
@@ -111,11 +81,12 @@ border-right: none !important;
     font-family:"Arial","Geneva",sans-serif;
 }
 
-/* MENU PRINCIPAL*/
+/* == MENU PRINCIPAL == */
 
 #mainnav :link, #mainnav :visited {
     background-image: none;
     border-color: #984601;
+    padding-left: 8px; padding-right: 8px;
 }
 #mainnav {
     margin: 0;
@@ -159,7 +130,7 @@ border-right: none !important;
     color: #984601;
 }
 
-/* Subnav */
+/* == Subnav == */
 
 #metanav ul {
     font-weight: normal;
@@ -181,8 +152,90 @@ border-right: none !important;
     border-bottom: 1px dotted #C46300;
 }
 
+/* = FOOTER = */
+
+#footer {
+  display: none;
+}
+
+/* = PAGES ET MODULES = */
+/* == Styles for images in documentation and articles == */
+
+img.inline, img.inlinetop {
+  border: solid 2px;
+  padding: 2px;
+}
+
+img.inlinetop {
+  vertical-align: top;
+}
+
+img.math {
+  vertical-align: middle;
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+img.matrix {
+  vertical-align: top;
+  margin-right: 30px;
+  margin-top: 10px;
+}
+
+/* == FORMS == */
+
+input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover {
+    background: #984601;
+}
+input[type="button"], input[type="submit"], input[type="reset"] {
+    background: #C46300;
+    border: 1px outset #984601;
+    -moz-border-radius: 4px;
+}
+input[type="text"], input.textwidget, textarea {
+    border: 1px solid #C46300;
+}
+legend {
+    color: #984601;
+}
+
+fieldset {
+    border-color: #984601;
+}
+
+#content.ticket {
+    margin: 0 auto;
+}
+.buttons {
+    text-align: center;
+}
+.buttons input {
+    margin: 0.5em;
+}
+#content.ticket fieldset {
+    background: #E5DCDC;
+}
+#field-description {
+    background: #fff url(/browser/web/trunk/static/img/dashit-light.png?format=raw) no-repeat right bottom;
+}
+#attachments {
+    background: #fff;
+    border: none;
+}
+#attachfile {
+    text-align: center;
+}
+#changelog {
+    background: #cccc88;
+    border: 1px solid #C46300;
+}
+a.ext-link .icon {
+    background-position: right center;
+    padding-right: 16px;
+}
+
+/* === FORM TICKETS === */
 
-/* FORM TICKETS */
 #preview h3, #changelog h3 {
     border-bottom:1px solid #984601;
     color:#552701;
@@ -209,3 +262,5 @@ form #comment {
 .wikitoolbar :link, .wikitoolbar :visited {
     border: 1px solid #C46300;
 }
+
+
diff --git a/trac/htdocs/main.css b/trac/htdocs/main.css
index 860b1d3..139597f 100644
--- a/trac/htdocs/main.css
+++ b/trac/htdocs/main.css
@@ -1,78 +1,2 @@
-:link, :visited { color: #3a5; }
-:link:hover, :visited:hover { color: #a2d; }
 
-body, th, td {
- font-family: 'Bitstream Vera Serif',times,serif;
-}
-
-h1, h2, h3, h4 {
- font-family: 'Bitstream Vera Serif',times,serif;
-}
-
-#mainnav {
- font-family: 'Bitstream Vera Serif',times,serif;
-}
-
-#mainnav :link, #mainnav :visited {
- padding-left: 8px; padding-right: 8px;
-}
-
-h1, h2, h3 {
-  text-indent: 0.5em;
-  border-style: solid;
-  border-color: #88aa77;
-  background-color: inherit;
-}
-
-h1 {
-  font-size: 1.6em;
-  font-variant: small-caps;
-  color: #002200;
-  border-width: 0 0 2px 0;
-}
-
-h2 {
-  font-size: 1.3em;
-  font-variant: small-caps;
-  color: #224422;
-  border-width: 0 0 2px 0;
-}
-
-h3 {
-  font-size: 1.1em;
-  color: #335533;
-  border-width: 0 0 1px 0;
-}
-
-p {
-  text-indent: 1em;
-  text-align: inherit;
-}
-
-#footer {
-  display: none;
-}
-
-/* Styles for images in documentation and articles */
-
-img.inline, img.inlinetop {
-  border: solid 2px #88aa77;
-  padding: 2px;
-}
-
-img.inlinetop {
-  vertical-align: top;
-}
-
-img.math {
-  vertical-align: middle;
-  margin-left: 10px;
-  margin-right: 10px;
-}
-
-img.matrix {
-  vertical-align: top;
-  margin-right: 30px;
-  margin-top: 10px;
-}
 
diff --git a/trac/templates/site.html b/trac/templates/site.html
index ab08546..aed3270 100644
--- a/trac/templates/site.html
+++ b/trac/templates/site.html
@@ -5,8 +5,6 @@
   <!--! Add site-specific style sheet -->
   <head py:match="head" py:attrs="select('@*')">
     ${select('*|comment()|text()')}
-    <link rel="stylesheet" type="text/css"
-          href="${href.chrome('site/main.css')}" />
     <link rel="stylesheet" type="text/css"
           href="${href.chrome('site/libcaca.css')}" />
   </head>