=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/account.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/account.css	2013-12-30 13:12:08 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/account.css	2014-05-07 14:37:40 +0000
@@ -66,13 +66,28 @@
   color: #333;
 }
 
+/*----------------------------------------------------------------------------*/
+/* @font-face                                                                 */
+/*----------------------------------------------------------------------------*/
+
 @font-face {
-    font-family: 'LiberationSansRegular';
-    src: url('../fonts/LiberationSans-Regular-webfont.eot');
-    src: url('../fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
-         url('../fonts/LiberationSans-Regular-webfont.woff') format('woff'),
-         url('../fonts/LiberationSans-Regular-webfont.ttf') format('truetype'),
-         url('../fonts/LiberationSans-Regular-webfont.svg#webfontc8rbNdBe') format('svg');
+    font-family: 'LiberationSans';
+    src: url('../../fonts/LiberationSans-Regular-webfont.eot');
+    src: url('../../fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
+         url('../../fonts/LiberationSans-Regular-webfont.woff') format('woff'),
+         url('../../fonts/LiberationSans-Regular-webfont.ttf') format('truetype'),
+         url('../../fonts/LiberationSans-Regular-webfont.svg#webfontc8rbNdBe') format('svg');
     font-weight: normal;
     font-style: normal;
 }
+
+@font-face {
+    font-family: 'LiberationSans';
+    src: url('../../fonts/LiberationSans-Bold-webfont.eot');
+    src: url('../../fonts/LiberationSans-Bold-webfont.eot?#iefix') format('eot'),
+         url('../../fonts/LiberationSans-Bold-webfont.woff') format('woff'),
+         url('../../fonts/LiberationSans-Bold-webfont.ttf') format('truetype'),
+         url('../../fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07') format('svg');
+    font-weight: bold;
+    font-style: normal;
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2014-04-29 12:49:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2014-05-07 14:37:40 +0000
@@ -5,7 +5,7 @@
 
 * 
 {
-  font-family: LiberationSansRegular, arial, sans-serif;
+  font-family: LiberationSans, arial, sans-serif;
   line-height: 140%;
 }
 
@@ -76,7 +76,7 @@
   position: absolute;
   top: 12px;
   left: 175px;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   color: #fff;
   font-size: 16px;
 }
@@ -229,7 +229,7 @@
   margin: 16px 20px 1px 20px;
   padding: 8px 0 8px 0;
   font-weight: normal;
-  font-family: LiberationSansBold, arial;
+  font-family: LiberationSan, arial;
 }
 
 #leftBarContents ul
@@ -321,9 +321,8 @@
   text-align: left;
   color: #39547d;
   padding: 3px 0 3px 1px;
-  font-family: LiberationSansBold, arial;
   font-size: 13px;
-  font-weight: normal;
+  font-weight: bold;
   border-collapse: collapse;
   border-bottom: 1px solid #cad5e5;
   min-height: 28px;
@@ -388,12 +387,12 @@
 
 .bold, .bold td
 {
-  font-family: LiberationSansBold, arial, sans-serif;
+  font-weight: bold;
 }
 
 .normal
 {
-  font-family: LiberationSansRegular, arial, sans-serif;
+  font-weight: normal;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -453,7 +452,7 @@
 
 .introItemHeader
 {
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   color: #3F693F;
   font-size: 13px;
 }
@@ -468,7 +467,7 @@
 /*----------------------------------------------------------------------------*/
 
 @font-face {
-    font-family: 'LiberationSansRegular';
+    font-family: 'LiberationSans';
     src: url('../../fonts/LiberationSans-Regular-webfont.eot');
     src: url('../../fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
          url('../../fonts/LiberationSans-Regular-webfont.woff') format('woff'),
@@ -479,12 +478,12 @@
 }
 
 @font-face {
-    font-family: 'LiberationSansBold';
+    font-family: 'LiberationSans';
     src: url('../../fonts/LiberationSans-Bold-webfont.eot');
     src: url('../../fonts/LiberationSans-Bold-webfont.eot?#iefix') format('eot'),
          url('../../fonts/LiberationSans-Bold-webfont.woff') format('woff'),
          url('../../fonts/LiberationSans-Bold-webfont.ttf') format('truetype'),
          url('../../fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07') format('svg');
-    font-weight: normal;
+    font-weight: bold;
     font-style: normal;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2014-03-30 20:47:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2014-05-07 14:37:40 +0000
@@ -5,7 +5,7 @@
 
 * 
 {
-  font-family: LiberationSansRegular, arial, sans-serif;
+  font-family: LiberationSans, arial, sans-serif;
   line-height: 140%;
 }
 
@@ -76,7 +76,7 @@
   position: absolute;
   top: 12px;
   left: 175px;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   color: #fff;
   font-size: 16px;
 }
@@ -227,8 +227,7 @@
   font-size: 9pt;
   margin: 16px 20px 2px 20px;
   padding: 7px 0 7px 0;
-  font-weight: normal;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
 }
 
 #leftBarContents ul
@@ -325,9 +324,8 @@
   border-style: solid;
   border-width: 1px;
   border-color: #c8dbea;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   font-size: 13px;
-  font-weight: normal;
 }
 
 #mainPage 
@@ -381,12 +379,12 @@
 
 .bold, .bold td
 {
-  font-family: LiberationSansBold, arial, sans-serif;
+  font-weight: bold;
 }
 
 .normal
 {
-  font-family: LiberationSansRegular, arial, sans-serif;
+  font-weight: normal;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -446,7 +444,7 @@
 
 .introItemHeader
 {
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   color: #3F693F;
   font-size: 13px;
 }
@@ -461,7 +459,7 @@
 /*----------------------------------------------------------------------------*/
 
 @font-face {
-    font-family: 'LiberationSansRegular';
+    font-family: 'LiberationSans';
     src: url('../../fonts/LiberationSans-Regular-webfont.eot');
     src: url('../../fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
          url('../../fonts/LiberationSans-Regular-webfont.woff') format('woff'),
@@ -472,12 +470,12 @@
 }
 
 @font-face {
-    font-family: 'LiberationSansBold';
+    font-family: 'LiberationSans';
     src: url('../../fonts/LiberationSans-Bold-webfont.eot');
     src: url('../../fonts/LiberationSans-Bold-webfont.eot?#iefix') format('eot'),
          url('../../fonts/LiberationSans-Bold-webfont.woff') format('woff'),
          url('../../fonts/LiberationSans-Bold-webfont.ttf') format('truetype'),
          url('../../fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07') format('svg');
-    font-weight: normal;
+    font-weight: bold;
     font-style: normal;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2014-04-29 12:49:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2014-05-07 14:37:40 +0000
@@ -5,7 +5,7 @@
 
 * 
 {
-  font-family: LiberationSansRegular, arial, sans-serif;
+  font-family: LiberationSans, arial, sans-serif;
   line-height: 140%;
 }
 
@@ -76,7 +76,7 @@
   position: absolute;
   top: 12px;
   left: 175px;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   color: #fff;
   font-size: 16px;
 }
@@ -228,8 +228,7 @@
   font-size: 9pt;
   margin: 16px 20px 1px 20px;
   padding: 8px 0 8px 0;
-  font-weight: normal;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
 }
 
 #leftBarContents ul
@@ -321,9 +320,8 @@
   text-align: left;
   color: #39547d;
   padding: 3px 0 3px 1px;
-  font-family: LiberationSansBold, arial;
   font-size: 13px;
-  font-weight: normal;
+  font-weight: bold;
   border-collapse: collapse;
   border-bottom: 1px solid #cad5e5;
   min-height: 28px;
@@ -383,12 +381,12 @@
 
 .bold, .bold td
 {
-  font-family: LiberationSansBold, arial, sans-serif;
+  font-weight: bold;
 }
 
 .normal
 {
-  font-family: LiberationSansRegular, arial, sans-serif;
+  font-weight: normal;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -448,7 +446,7 @@
 
 .introItemHeader
 {
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   color: #3F693F;
   font-size: 13px;
 }
@@ -463,7 +461,7 @@
 /*----------------------------------------------------------------------------*/
 
 @font-face {
-    font-family: 'LiberationSansRegular';
+    font-family: 'LiberationSans';
     src: url('../../fonts/LiberationSans-Regular-webfont.eot');
     src: url('../../fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
          url('../../fonts/LiberationSans-Regular-webfont.woff') format('woff'),
@@ -474,12 +472,12 @@
 }
 
 @font-face {
-    font-family: 'LiberationSansBold';
+    font-family: 'LiberationSans';
     src: url('../../fonts/LiberationSans-Bold-webfont.eot');
     src: url('../../fonts/LiberationSans-Bold-webfont.eot?#iefix') format('eot'),
          url('../../fonts/LiberationSans-Bold-webfont.woff') format('woff'),
          url('../../fonts/LiberationSans-Bold-webfont.ttf') format('truetype'),
          url('../../fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07') format('svg');
-    font-weight: normal;
+    font-weight: bold;
     font-style: normal;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2014-01-10 08:25:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2014-05-07 14:37:40 +0000
@@ -1,7 +1,7 @@
 
 *
 {
-  font-family: LiberationSansRegular, sans-serif;
+  font-family: LiberationSans, sans-serif;
   line-height: 125%;
   overflow: hidden;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2014-03-30 20:47:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2014-05-07 14:37:40 +0000
@@ -5,7 +5,7 @@
 
 * 
 {
-  font-family: LiberationSansRegular, arial, sans-serif;
+  font-family: LiberationSans, arial, sans-serif;
   line-height: 140%;
 }
 
@@ -76,7 +76,7 @@
   position: absolute;
   top: 12px;
   left: 175px;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   color: #fff;
   font-size: 16px;
 }
@@ -228,7 +228,7 @@
   margin: 16px 20px 2px 20px;
   padding: 7px 0 7px 0;
   font-weight: normal;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
 }
 
 #leftBarContents ul
@@ -325,9 +325,8 @@
   border-style: solid;
   border-width: 1px;
   border-color: #c8dbea;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   font-size: 13px;
-  font-weight: normal;
 }
 
 #mainPage 
@@ -381,12 +380,12 @@
 
 .bold, .bold td
 {
-  font-family: LiberationSansBold, arial, sans-serif;
+  font-weight: bold;
 }
 
 .normal
 {
-  font-family: LiberationSansRegular, arial, sans-serif;
+  font-weight: normal;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -446,7 +445,7 @@
 
 .introItemHeader
 {
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   color: #3F693F;
   font-size: 13px;
 }
@@ -461,7 +460,7 @@
 /*----------------------------------------------------------------------------*/
 
 @font-face {
-    font-family: 'LiberationSansRegular';
+    font-family: 'LiberationSans';
     src: url('../../fonts/LiberationSans-Regular-webfont.eot');
     src: url('../../fonts/LiberationSans-Regular-webfont.eot?#iefix') format('eot'),
          url('../../fonts/LiberationSans-Regular-webfont.woff') format('woff'),
@@ -472,12 +471,12 @@
 }
 
 @font-face {
-    font-family: 'LiberationSansBold';
+    font-family: 'LiberationSans';
     src: url('../../fonts/LiberationSans-Bold-webfont.eot');
     src: url('../../fonts/LiberationSans-Bold-webfont.eot?#iefix') format('eot'),
          url('../../fonts/LiberationSans-Bold-webfont.woff') format('woff'),
          url('../../fonts/LiberationSans-Bold-webfont.ttf') format('truetype'),
          url('../../fonts/LiberationSans-Bold-webfont.svg#webfontHyWb8e07') format('svg');
-    font-weight: normal;
+    font-weight: bold;
     font-style: normal;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2014-04-22 16:55:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2014-05-07 14:37:40 +0000
@@ -104,7 +104,7 @@
 
 #detailsArea label 
 {
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   font-size: 13px;
 }
 
@@ -181,7 +181,7 @@
   position: absolute;
   left: 22px;
   top: 50px;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   font-size: 9pt;
   cursor: pointer;
 }
@@ -190,7 +190,7 @@
 {
   position: absolute;
   right: 2px;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   font-size: 9pt;
   cursor: pointer;
 }
@@ -271,7 +271,7 @@
 div#orgUnitTree a.selected 
 {
   color: #000;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
 }
 
 /*----------------------------------------------------------------------------*/
@@ -604,7 +604,7 @@
 
 div.paging span, div.paging a 
 {
-	font-family: LiberationSansBold, arial;
+    font-weight: bold;
 	padding: 0 5px;
 	font-size: 12px;
 }
@@ -705,7 +705,7 @@
   border: 1px solid #bbb;
   border-radius: 3px;
   margin-right: 4px;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   font-size: 13px;
   background-color: #f3f3f3;
   color: #606060 !important;
@@ -725,7 +725,7 @@
   border: 1px solid #3D77B3;
   border-radius: 3px;
   margin-right: 4px;
-  font-family: LiberationSansBold, arial;
+  font-weight: bold;
   font-size: 13px;
   background-color: #3581CE;
   color: #fff !important;
@@ -778,37 +778,29 @@
 
 .ui-widget, .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button
 {
-  font-family: LiberationSansRegular, arial, sans-serif !important;
+  font-family: LiberationSans, arial, sans-serif !important;
   font-size: 9pt !important;
 }
 
 .ui-datepicker th 
 {
-  font-family: LiberationSansBold, arial, sans-serif !important;
-  font-weight: normal !important;
+  font-family: LiberationSans, arial, sans-serif !important;
   padding: 0.5em 0 !important;
   font-size: 9pt !important;
 }
 
 .ui-widget-header, .ui-widget-header a
 {
-  font-family: LiberationSansBold, arial, sans-serif !important;
-  font-weight: normal !important;
+  font-family: LiberationSans, arial, sans-serif !important;
   font-size: 10pt !important;
 }
 
 .ui-button-text
 {
-  font-family: LiberationSansBold, arial, sans-serif !important;
-  font-weight: normal !important;
+  font-family: LiberationSans, arial, sans-serif !important;
   font-size: 9pt !important;
 }
 
-.ui-state-default
-{
-  font-weight: normal !important;
-}
-
 /*----------------------------------------------------------------------------*/
 /* Messages used for sharing                                                  */
 /*----------------------------------------------------------------------------*/