diff -r a06fb50d574f -r 9d2a4916ee7a integration/v2/css/fonts.css
--- a/integration/v2/css/fonts.css	Tue Jun 18 11:48:49 2013 +0200
+++ b/integration/v2/css/fonts.css	Tue Jun 18 13:29:25 2013 +0200
@@ -1,27 +1,12 @@
 
 @font-face {
-    font-family: 'josefin_sansbold';
+    font-family: 'josefin_sans';
     src: url('fonts/josefinsans/josefinsans-bold-webfont.eot');
     src: url('fonts/josefinsans/josefinsans-bold-webfont.eot?#iefix') format('embedded-opentype'),
          url('fonts/josefinsans/josefinsans-bold-webfont.woff') format('woff'),
          url('fonts/josefinsans/josefinsans-bold-webfont.ttf') format('truetype'),
          url('fonts/josefinsans/josefinsans-bold-webfont.svg#josefin_sansbold') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-
-
-
-@font-face {
-    font-family: 'josefin_sansbold_italic';
-    src: url('fonts/josefinsans/josefinsans-bolditalic-webfont.eot');
-    src: url('fonts/josefinsans/josefinsans-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/josefinsans/josefinsans-bolditalic-webfont.woff') format('woff'),
-         url('fonts/josefinsans/josefinsans-bolditalic-webfont.ttf') format('truetype'),
-         url('fonts/josefinsans/josefinsans-bolditalic-webfont.svg#josefin_sansbold_italic') format('svg');
-    font-weight: normal;
+    font-weight: bold;
     font-style: normal;
 
 }
@@ -30,14 +15,14 @@
 
 
 @font-face {
-    font-family: 'josefin_sansitalic';
-    src: url('fonts/josefinsans/josefinsans-italic-webfont.eot');
-    src: url('fonts/josefinsans/josefinsans-italic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/josefinsans/josefinsans-italic-webfont.woff') format('woff'),
-         url('fonts/josefinsans/josefinsans-italic-webfont.ttf') format('truetype'),
-         url('fonts/josefinsans/josefinsans-italic-webfont.svg#josefin_sansitalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
+    font-family: 'josefin_sans';
+    src: url('fonts/josefinsans/josefinsans-bolditalic-webfont.eot');
+    src: url('fonts/josefinsans/josefinsans-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/josefinsans/josefinsans-bolditalic-webfont.woff') format('woff'),
+         url('fonts/josefinsans/josefinsans-bolditalic-webfont.ttf') format('truetype'),
+         url('fonts/josefinsans/josefinsans-bolditalic-webfont.svg#josefin_sansbold_italic') format('svg');
+    font-weight: bold;
+    font-style: italic;
 
 }
 
@@ -45,14 +30,14 @@
 
 
 @font-face {
-    font-family: 'josefin_sanslight';
-    src: url('fonts/josefinsans/josefinsans-light-webfont.eot');
-    src: url('fonts/josefinsans/josefinsans-light-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/josefinsans/josefinsans-light-webfont.woff') format('woff'),
-         url('fonts/josefinsans/josefinsans-light-webfont.ttf') format('truetype'),
-         url('fonts/josefinsans/josefinsans-light-webfont.svg#josefin_sanslight') format('svg');
+    font-family: 'josefin_sans';
+    src: url('fonts/josefinsans/josefinsans-italic-webfont.eot');
+    src: url('fonts/josefinsans/josefinsans-italic-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/josefinsans/josefinsans-italic-webfont.woff') format('woff'),
+         url('fonts/josefinsans/josefinsans-italic-webfont.ttf') format('truetype'),
+         url('fonts/josefinsans/josefinsans-italic-webfont.svg#josefin_sansitalic') format('svg');
     font-weight: normal;
-    font-style: normal;
+    font-style: italic;
 
 }
 
@@ -60,28 +45,13 @@
 
 
 @font-face {
-    font-family: 'josefin_sanslight_italic';
-    src: url('fonts/josefinsans/josefinsans-lightitalic-webfont.eot');
-    src: url('fonts/josefinsans/josefinsans-lightitalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/josefinsans/josefinsans-lightitalic-webfont.woff') format('woff'),
-         url('fonts/josefinsans/josefinsans-lightitalic-webfont.ttf') format('truetype'),
-         url('fonts/josefinsans/josefinsans-lightitalic-webfont.svg#josefin_sanslight_italic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-
-
-
-@font-face {
-    font-family: 'josefin_sansregular';
-    src: url('fonts/josefinsans/josefinsans-regular-webfont.eot');
-    src: url('fonts/josefinsans/josefinsans-regular-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/josefinsans/josefinsans-regular-webfont.woff') format('woff'),
-         url('fonts/josefinsans/josefinsans-regular-webfont.ttf') format('truetype'),
-         url('fonts/josefinsans/josefinsans-regular-webfont.svg#josefin_sansregular') format('svg');
-    font-weight: normal;
+    font-family: 'josefin_sans';
+    src: url('fonts/josefinsans/josefinsans-light-webfont.eot');
+    src: url('fonts/josefinsans/josefinsans-light-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/josefinsans/josefinsans-light-webfont.woff') format('woff'),
+         url('fonts/josefinsans/josefinsans-light-webfont.ttf') format('truetype'),
+         url('fonts/josefinsans/josefinsans-light-webfont.svg#josefin_sanslight') format('svg');
+    font-weight: 300;
     font-style: normal;
 
 }
@@ -90,14 +60,14 @@
 
 
 @font-face {
-    font-family: 'josefin_sanssemibold';
-    src: url('fonts/josefinsans/josefinsans-semibold-webfont.eot');
-    src: url('fonts/josefinsans/josefinsans-semibold-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/josefinsans/josefinsans-semibold-webfont.woff') format('woff'),
-         url('fonts/josefinsans/josefinsans-semibold-webfont.ttf') format('truetype'),
-         url('fonts/josefinsans/josefinsans-semibold-webfont.svg#josefin_sanssemibold') format('svg');
-    font-weight: normal;
-    font-style: normal;
+    font-family: 'josefin_sans';
+    src: url('fonts/josefinsans/josefinsans-lightitalic-webfont.eot');
+    src: url('fonts/josefinsans/josefinsans-lightitalic-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/josefinsans/josefinsans-lightitalic-webfont.woff') format('woff'),
+         url('fonts/josefinsans/josefinsans-lightitalic-webfont.ttf') format('truetype'),
+         url('fonts/josefinsans/josefinsans-lightitalic-webfont.svg#josefin_sanslight_italic') format('svg');
+    font-weight: 300;
+    font-style: italic;
 
 }
 
@@ -105,28 +75,25 @@
 
 
 @font-face {
-    font-family: 'josefin_sanssemibold_italic';
-    src: url('fonts/josefinsans/josefinsans-semibolditalic-webfont.eot');
-    src: url('fonts/josefinsans/josefinsans-semibolditalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/josefinsans/josefinsans-semibolditalic-webfont.woff') format('woff'),
-         url('fonts/josefinsans/josefinsans-semibolditalic-webfont.ttf') format('truetype'),
-         url('fonts/josefinsans/josefinsans-semibolditalic-webfont.svg#josefin_sanssemibold_italic') format('svg');
+    font-family: 'josefin_sans';
+    src: url('fonts/josefinsans/josefinsans-regular-webfont.eot');
+    src: url('fonts/josefinsans/josefinsans-regular-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/josefinsans/josefinsans-regular-webfont.woff') format('woff'),
+         url('fonts/josefinsans/josefinsans-regular-webfont.ttf') format('truetype'),
+         url('fonts/josefinsans/josefinsans-regular-webfont.svg#josefin_sansregular') format('svg');
     font-weight: normal;
     font-style: normal;
-
 }
 
 
-
-
 @font-face {
-    font-family: 'josefin_sansthin';
-    src: url('fonts/josefinsans/josefinsans-thin-webfont.eot');
-    src: url('fonts/josefinsans/josefinsans-thin-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/josefinsans/josefinsans-thin-webfont.woff') format('woff'),
-         url('fonts/josefinsans/josefinsans-thin-webfont.ttf') format('truetype'),
-         url('fonts/josefinsans/josefinsans-thin-webfont.svg#josefin_sansthin') format('svg');
-    font-weight: normal;
+    font-family: 'josefin_sans';
+    src: url('fonts/josefinsans/josefinsans-semibold-webfont.eot');
+    src: url('fonts/josefinsans/josefinsans-semibold-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/josefinsans/josefinsans-semibold-webfont.woff') format('woff'),
+         url('fonts/josefinsans/josefinsans-semibold-webfont.ttf') format('truetype'),
+         url('fonts/josefinsans/josefinsans-semibold-webfont.svg#josefin_sanssemibold') format('svg');
+    font-weight: 600;
     font-style: normal;
 
 }
@@ -135,67 +102,101 @@
 
 
 @font-face {
-    font-family: 'josefin_sansthin_italic';
+    font-family: 'josefin_sans';
+    src: url('fonts/josefinsans/josefinsans-semibolditalic-webfont.eot');
+    src: url('fonts/josefinsans/josefinsans-semibolditalic-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/josefinsans/josefinsans-semibolditalic-webfont.woff') format('woff'),
+         url('fonts/josefinsans/josefinsans-semibolditalic-webfont.ttf') format('truetype'),
+         url('fonts/josefinsans/josefinsans-semibolditalic-webfont.svg#josefin_sanssemibold_italic') format('svg');
+    font-weight: 600;
+    font-style: italic;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'josefin_sans';
+    src: url('fonts/josefinsans/josefinsans-thin-webfont.eot');
+    src: url('fonts/josefinsans/josefinsans-thin-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/josefinsans/josefinsans-thin-webfont.woff') format('woff'),
+         url('fonts/josefinsans/josefinsans-thin-webfont.ttf') format('truetype'),
+         url('fonts/josefinsans/josefinsans-thin-webfont.svg#josefin_sansthin') format('svg');
+    font-weight: 100;
+    font-style: normal;
+
+}
+
+
+
+
+@font-face {
+    font-family: 'josefin_sans';
     src: url('fonts/josefinsans/josefinsans-thinitalic-webfont.eot');
     src: url('fonts/josefinsans/josefinsans-thinitalic-webfont.eot?#iefix') format('embedded-opentype'),
          url('fonts/josefinsans/josefinsans-thinitalic-webfont.woff') format('woff'),
          url('fonts/josefinsans/josefinsans-thinitalic-webfont.ttf') format('truetype'),
          url('fonts/josefinsans/josefinsans-thinitalic-webfont.svg#josefin_sansthin_italic') format('svg');
-    font-weight: normal;
+    font-weight: 100;
+    font-style: italic;
+
+}
+
+
+
+/* Lato */
+
+@font-face {
+    font-family: 'Lato';
+    src: url('fonts/lato/Lato-Hai-webfont.eot');
+    src: url('fonts/lato/Lato-Hai-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/lato/Lato-Hai-webfont.woff') format('woff'),
+         url('fonts/lato/Lato-Hai-webfont.ttf') format('truetype'),
+         url('fonts/lato/Lato-Hai-webfont.svg#LatoHairline') format('svg');
+    font-weight: 100;
     font-style: normal;
 
 }
 
 @font-face {
-    font-family: 'LatoHairline';
-    src: url('fonts/lato/Lato-Hai-webfont.eot');
-    src: url('fonts/lato/Lato-Hai-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/lato/Lato-Hai-webfont.woff') format('woff'),
-         url('fonts/lato/Lato-Hai-webfont.ttf') format('truetype'),
-         url('fonts/lato/Lato-Hai-webfont.svg#LatoHairline') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'LatoHairlineItalic';
+    font-family: 'Lato';
     src: url('fonts/lato/Lato-HaiIta-webfont.eot');
     src: url('fonts/lato/Lato-HaiIta-webfont.eot?#iefix') format('embedded-opentype'),
          url('fonts/lato/Lato-HaiIta-webfont.woff') format('woff'),
          url('fonts/lato/Lato-HaiIta-webfont.ttf') format('truetype'),
          url('fonts/lato/Lato-HaiIta-webfont.svg#LatoHairlineItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
+    font-weight: 100;
+    font-style: italic;
 
 }
 
 @font-face {
-    font-family: 'LatoLight';
+    font-family: 'Lato';
     src: url('fonts/lato/Lato-Lig-webfont.eot');
     src: url('fonts/lato/Lato-Lig-webfont.eot?#iefix') format('embedded-opentype'),
          url('fonts/lato/Lato-Lig-webfont.woff') format('woff'),
          url('fonts/lato/Lato-Lig-webfont.ttf') format('truetype'),
          url('fonts/lato/Lato-Lig-webfont.svg#LatoLight') format('svg');
-    font-weight: normal;
+    font-weight: 300;
     font-style: normal;
 
 }
 
 @font-face {
-    font-family: 'LatoLightItalic';
+    font-family: 'Lato';
     src: url('fonts/lato/Lato-LigIta-webfont.eot');
     src: url('fonts/lato/Lato-LigIta-webfont.eot?#iefix') format('embedded-opentype'),
          url('fonts/lato/Lato-LigIta-webfont.woff') format('woff'),
          url('fonts/lato/Lato-LigIta-webfont.ttf') format('truetype'),
          url('fonts/lato/Lato-LigIta-webfont.svg#LatoLightItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
+    font-weight: 300;
+    font-style: italic;
 
 }
 
 @font-face {
-    font-family: 'LatoRegular';
+    font-family: 'Lato';
     src: url('fonts/lato/Lato-Reg-webfont.eot');
     src: url('fonts/lato/Lato-Reg-webfont.eot?#iefix') format('embedded-opentype'),
          url('fonts/lato/Lato-Reg-webfont.woff') format('woff'),
@@ -207,61 +208,61 @@
 }
 
 @font-face {
-    font-family: 'LatoItalic';
+    font-family: 'Lato';
     src: url('fonts/lato/Lato-RegIta-webfont.eot');
     src: url('fonts/lato/Lato-RegIta-webfont.eot?#iefix') format('embedded-opentype'),
          url('fonts/lato/Lato-RegIta-webfont.woff') format('woff'),
          url('fonts/lato/Lato-RegIta-webfont.ttf') format('truetype'),
          url('fonts/lato/Lato-RegIta-webfont.svg#LatoItalic') format('svg');
     font-weight: normal;
+    font-style: italic;
+
+}
+
+@font-face {
+    font-family: 'Lato';
+    src: url('fonts/lato/Lato-Bol-webfont.eot');
+    src: url('fonts/lato/Lato-Bol-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/lato/Lato-Bol-webfont.woff') format('woff'),
+         url('fonts/lato/Lato-Bol-webfont.ttf') format('truetype'),
+         url('fonts/lato/Lato-Bol-webfont.svg#LatoBold') format('svg');
+    font-weight: bold;
     font-style: normal;
 
 }
 
 @font-face {
     font-family: 'LatoBold';
-    src: url('fonts/lato/Lato-Bol-webfont.eot');
-    src: url('fonts/lato/Lato-Bol-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/lato/Lato-Bol-webfont.woff') format('woff'),
-         url('fonts/lato/Lato-Bol-webfont.ttf') format('truetype'),
-         url('fonts/lato/Lato-Bol-webfont.svg#LatoBold') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'LatoBoldItalic';
     src: url('fonts/lato/Lato-BolIta-webfont.eot');
     src: url('fonts/lato/Lato-BolIta-webfont.eot?#iefix') format('embedded-opentype'),
          url('fonts/lato/Lato-BolIta-webfont.woff') format('woff'),
          url('fonts/lato/Lato-BolIta-webfont.ttf') format('truetype'),
          url('fonts/lato/Lato-BolIta-webfont.svg#LatoBoldItalic') format('svg');
-    font-weight: normal;
+    font-weight: bold;
+    font-style: italic;
+
+}
+
+@font-face {
+    font-family: 'Lato';
+    src: url('fonts/lato/Lato-Bla-webfont.eot');
+    src: url('fonts/lato/Lato-Bla-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/lato/Lato-Bla-webfont.woff') format('woff'),
+         url('fonts/lato/Lato-Bla-webfont.ttf') format('truetype'),
+         url('fonts/lato/Lato-Bla-webfont.svg#LatoBlack') format('svg');
+    font-weight: 900;
     font-style: normal;
 
 }
 
 @font-face {
-    font-family: 'LatoBlack';
-    src: url('fonts/lato/Lato-Bla-webfont.eot');
-    src: url('fonts/lato/Lato-Bla-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/lato/Lato-Bla-webfont.woff') format('woff'),
-         url('fonts/lato/Lato-Bla-webfont.ttf') format('truetype'),
-         url('fonts/lato/Lato-Bla-webfont.svg#LatoBlack') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'LatoBlackItalic';
+    font-family: 'Lato';
     src: url('fonts/lato/Lato-BlaIta-webfont.eot');
     src: url('fonts/lato/Lato-BlaIta-webfont.eot?#iefix') format('embedded-opentype'),
          url('fonts/lato/Lato-BlaIta-webfont.woff') format('woff'),
          url('fonts/lato/Lato-BlaIta-webfont.ttf') format('truetype'),
          url('fonts/lato/Lato-BlaIta-webfont.svg#LatoBlackItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
+    font-weight: 900;
+    font-style: italic;
 
 }
\ No newline at end of file