[meego-commits] 9414: Changes to Trunk:Testing/meegotouch-theme

Fathi Boudra no_reply at build.meego.com
Thu Nov 11 12:34:00 UTC 2010


Hi,
I have made the following changes to meegotouch-theme in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Fathi Boudra

[This message was auto-generated]

---

Request #9414:

  submit:   devel:qt-mtf/meegotouch-theme(r39) -> Trunk:Testing/meegotouch-theme


Message:
    * Thu Nov 04 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.52
- updated to release 0.20.52-1

State:   new          2010-11-11T04:33:58 boudra
Comment: None



changes files:
--------------
--- meegotouch-theme.changes
+++ meegotouch-theme.changes
@@ -1 +1,7 @@
-* Tue Oct 26 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.50-1
+* Thu Nov 04 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.52
+- updated to release 0.20.52-1
+
+* Mon Nov 01 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.51
+- updated to release 0.20.51-1
+
+* Tue Oct 26 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.50
@@ -4 +10 @@
-* Thu Oct 14 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48-1
+* Thu Oct 14 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.48
@@ -7 +13 @@
-* Fri Oct 01 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46-1
+* Fri Oct 01 2010 Miroslav Safr <miroslav.safr at tieto.com.com> 0.20.46
@@ -61 +66,0 @@
-

old:
----
  meegotouch-theme-0.20.50.tar.bz2

new:
----
  meegotouch-theme-0.20.52.tar.bz2

spec files:
-----------
--- meegotouch-theme.spec
+++ meegotouch-theme.spec
@@ -7,7 +7,7 @@
 
 Name:       meegotouch-theme
 Summary:    Theme for Meego Touch based applications
-Version:    0.20.50
+Version:    0.20.52
 Release:    1
 Group:      System/Desktop
 License:    LGPLv2.1
@@ -34,7 +34,7 @@
 
 
 %prep
-%setup -q -n ./%{name}-%{version}
+%setup -q -n %{name}-%{version}
 
 # >> setup
 # << setup

other changes:
--------------

++++++ meegotouch-theme-0.20.50.tar.bz2 -> meegotouch-theme-0.20.52.tar.bz2
--- base/meegotouch/constants.ini
+++ base/meegotouch/constants.ini
@@ -37,8 +37,9 @@
 
 [Fonts]
 
-;This contant defines the font family used in the whole system
-FONT_FAMILY     = "Nokia Sans";
+;This constant defines the font family used in the whole system
+;e.g. Vera Sans
+FONT_FAMILY     = "Put your custom font name here";
 
 ; Default style for the system is LIGHT 
 
@@ -155,4 +156,4 @@
 ;This constants are required for the input method
 
 FONT_KEYBOARD= "Nokia Standard" normal 3.2mm;
-FONT_KEYBOARD_TOOLBAR= "Nokia Standard" bold uppercase 2.0mm;
\ No newline at end of file
+FONT_KEYBOARD_TOOLBAR= "Nokia Standard" bold uppercase 2.0mm;
--- base/meegotouch/icons/icon-m-settings-personalize.svg
+++ base/meegotouch/icons/icon-m-settings-personalize.svg
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="icon-m-startup-personalize-layer"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="48px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<g id="icon-m-startup-personalize_1_">
+	<rect style="fill:none;" width="48" height="48"/>
+	<path style="fill:#333333;" d="M27.848,29.943c-0.104-4.023,2.685-7.451,6.832-8.414l0.007-6.898
+		c-3.729-3.244-9.354-5.311-15.649-5.311c-3.658,0-7.342,0.697-10.672,2.186c-1.791,0.799-3.568,1.727-5.111,2.947
+		c-1.164,0.92-2.779,2.652-2.464,4.288c0.173,0.896,0.581,1.481,1.343,1.941c1.329,0.802,2.818,1.081,4.337,1.31
+		c2.931,0.44,5.885,1.258,6.528,4.607c0.625,3.252-3.923,5.248-2.531,8.548c1.388,3.294,5.466,3.532,8.57,3.532
+		c4.19,0,8.082-0.917,11.317-2.484c-1.234-1.19-2.103-2.741-2.415-4.503C27.839,31.119,27.809,30.545,27.848,29.943z M19.944,12.237
+		c1.863,0.083,3.304,1.659,3.221,3.521c-0.083,1.863-1.66,3.306-3.522,3.223c-1.862-0.082-3.304-1.659-3.221-3.522
+		C16.506,13.596,18.083,12.154,19.944,12.237z M10.504,20.189c-1.716-0.084-3.044-1.66-2.968-3.522
+		c0.076-1.862,1.529-3.304,3.245-3.222c1.716,0.084,3.045,1.66,2.969,3.522C13.672,18.83,12.22,20.271,10.504,20.189z
+		 M20.396,34.324c-2.233,0-4.043-1.809-4.043-4.042s1.81-4.043,4.043-4.043c2.233,0,4.043,1.81,4.043,4.043
+		S22.63,34.324,20.396,34.324z M25.839,18.237c0.083-1.861,1.659-3.305,3.521-3.222c1.863,0.084,3.306,1.66,3.222,3.521
+		c-0.082,1.863-1.658,3.306-3.523,3.223C27.198,21.676,25.756,20.1,25.839,18.237z"/>
+	<path style="fill:#333333;" d="M47.25,18.352v-5.25c-2.543-1.402-4.945-1.921-8.061-1.921l-0.014,14.978
+		c-0.883-0.354-2.091-0.494-3.176-0.307c-2.468,0.433-3.793,2.227-3.644,4.18c-0.034,0.289-0.038,0.581,0.014,0.875
+		c0.364,2.053,2.54,3.65,5.13,3.195c2.461-0.43,3.898-2.551,3.75-4.5c0.016-0.147,0.006-0.6,0-0.75v-12.75
+		C43.564,16.384,45.301,17.274,47.25,18.352z"/>
+</g>
+</svg>
--- base/meegotouch/libmeegotouchcore/style/mpreeditstyle.css
+++ base/meegotouch/libmeegotouchcore/style/mpreeditstyle.css
@@ -1,9 +1,10 @@
 MPreeditStyle {
-    underline: dashunderline;
+    underline: singleunderline;
     font-color: ;
     background-color: ;
 }
 
 MPreeditStyle:no-candidates {
-    underline: dotline;
+    underline: singleunderline;
+    underline-color: #ff0000;
 }
--- base/meegotouch/libmeegotouchviews/style/commonlayouts/commonbuttonstyle.css
+++ base/meegotouch/libmeegotouchviews/style/commonlayouts/commonbuttonstyle.css
@@ -1,12 +1,10 @@
-/* CB reffers to CommonButton */
-/* CSB reffers to CommonSplitButton */
- at const CB_WIDTH:    32.2mm;
+ at const CB_WIDTH:    32.2mm; /* CB reffers to CommonButton */
 @const CB_HEIGHT:   5.1mm;
 @const CB_M_TOP:    1.5mm;
 @const CB_M_BOTTOM: 1.5mm;
 @const CB_M_LEFT:   $INDENT_DEFAULT;
 @const CB_M_RIGHT:  $INDENT_DEFAULT;
- at const CB_FONT:     "Nokia Standard" bold uppercase 22;
+ at const CB_FONT:     $FONT_FAMILY bold uppercase 22;
 @const CB_FONT_COLOR:          #000000;
 /*@const CB_FONT_COLOR_PRESSED:  #797979; */
 /* const CB_FONT_COLOR_SELECTED: #FFFFFF; */
@@ -19,7 +17,7 @@
 @const CB_SPACE_LEFT:   0.3mm;
 @const CB_SPACE_TOP:    0.3mm;
 @const CB_SPACE_BOTTOM: 0.2mm;
- at const CSB_SPACE_RIGHT:  0;
+ at const CSB_SPACE_RIGHT:  0; /* CSB reffers to CommonSplitButton */
 @const CSB_SPACE_LEFT:   0;
 @const CSB_SPACE_TOP:    0;
 @const CSB_SPACE_BOTTOM: 0;
@@ -32,6 +30,18 @@
 @const CB_BG_NEGATIVE:          meegotouch-button-negative-background;
 @const CB_BG_NEGATIVE_PRESSED:  meegotouch-button-negative-background-pressed;
 @const CB_BG_NEGATIVE_SELECTED: meegotouch-button-negative-background-selected;
+ at const CB_BG_POSITIVE_INVERTED:          meegotouch-button-positive-inverted-background;
+ at const CB_BG_POSITIVE_INVERTED_PRESSED:  meegotouch-button-positive-inverted-background-pressed;
+ at const CB_BG_POSITIVE_INVERTED_SELECTED: meegotouch-button-positive-inverted-background-selected;
+ at const CB_BG_NEGATIVE_INVERTED:          meegotouch-button-negative-inverted-background;
+ at const CB_BG_NEGATIVE_INVERTED_PRESSED:  meegotouch-button-negative-inverted-background-pressed;
+ at const CB_BG_NEGATIVE_INVERTED_SELECTED: meegotouch-button-negative-inverted-background-selected;
+ at const TBB_CORNERS: 20px 20px 20px 20px; /* Toolbar buttons */
+ at const TBB_WIDTH:    18.6mm;
+ at const TBB_HEIGHT:   4.2mm;
+ at const TBSB_CORNERS: 24px 24px 24px 24px; /* Toolbar split-buttons */
+ at const TBSB_WIDTH:    18.6mm;
+ at const TBSB_HEIGHT:   5mm;
 
 /* buttons for default application background color */
 
@@ -123,28 +133,6 @@
 background-image:$CB_BG_INVERTED_SELECTED $CORNER_MARGINS;
 text-color:      $CB_FONT_COLOR_INVERTED_SELECTED;
 }
-/***********/
-#CommonQueryButton {
-margin-top:      $CB_M_TOP;
-margin-bottom:   $CB_M_BOTTOM;
-margin-left:     0.3mm;
-margin-right:    0.3mm;
-
-minimum-size: 20.6mm 5.1mm;
-maximum-size:20.6mm 5.1mm;
-preferred-size:20.6mm 5.1mm;
-
-text-color:      $CB_FONT_COLOR_INVERTED;
-background-image:$CB_BG_INVERTED $CORNER_MARGINS;
-}
-#CommonQueryButton:pressed {
-background-image:$CB_BG_INVERTED_PRESSED $CORNER_MARGINS;
-text-color:      $CB_FONT_COLOR_INVERTED_PRESSED;
-}
-#CommonQueryButton:selected {
-background-image:$CB_BG_INVERTED_SELECTED $CORNER_MARGINS;
-text-color:      $CB_FONT_COLOR_INVERTED_SELECTED;
-}
 
 #CommonLeftButtonInverted {
 margin-top:      $CB_M_TOP;
@@ -570,6 +558,257 @@
 background-image:$CB_BG_NEGATIVE_SELECTED $CORNER_MARGINS;
 }
 
+/* positive inverted buttons */
+
+#CommonSingleButtonPositiveInverted {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     $CB_M_LEFT;
+margin-right:    $CB_M_RIGHT;
+
+text-color:      $CB_FONT_COLOR_POSITIVE;
+background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonSingleButtonPositiveInverted:pressed {
+background-image:$CB_BG_POSITIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonSingleButtonPositiveInverted:selected {
+background-image:$CB_BG_POSITIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+#CommonLeftButtonPositiveInverted {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     $CB_M_LEFT;
+margin-right:    $CB_SPACE_RIGHT;
+
+text-color:      $CB_FONT_COLOR_POSITIVE;
+background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonLeftButtonPositiveInverted:pressed {
+background-image:$CB_BG_POSITIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonLeftButtonPositiveInverted:selected {
+background-image:$CB_BG_POSITIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+#CommonHorizontalCenterButtonPositiveInverted {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     $CB_SPACE_LEFT;
+margin-right:    $CB_SPACE_RIGHT;
+
+text-color:      $CB_FONT_COLOR_POSITIVE;
+background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS;
+}
+
+#CommonRightButtonPositiveInverted {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     $CB_SPACE_LEFT;
+margin-right:    $CB_M_RIGHT;
+
+text-color:      $CB_FONT_COLOR_POSITIVE;
+background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonRightButtonPositiveInverted:pressed {
+background-image:$CB_BG_POSITIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonRightButtonPositiveInverted:selected {
+background-image:$CB_BG_POSITIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+#CommonTopButtonPositiveInverted {
+margin-top:      $CB_M_TOP;
+margin-left:     $CB_M_LEFT;
+text-color:      $CB_FONT_COLOR_POSITIVE;
+background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonTopButtonPositiveInverted.Portrait {
+margin-bottom:   $CB_SPACE_BOTTOM;
+margin-right:    $CB_M_RIGHT;
+}
+#CommonTopButtonPositiveInverted.Landscape {
+margin-bottom:   $CB_M_BOTTOM;
+margin-right:    $CB_SPACE_RIGHT;
+}
+#CommonTopButtonPositiveInverted:pressed {
+background-image:$CB_BG_POSITIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonTopButtonPositiveInverted:selected {
+background-image:$CB_BG_POSITIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+#CommonVerticalCenterButtonPositiveInverted {
+text-color:      $CB_FONT_COLOR_POSITIVE;
+background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonVerticalCenterButtonPositiveInverted.Portrait {
+margin-top:      $CB_SPACE_TOP;
+margin-bottom:   $CB_SPACE_BOTTOM;
+margin-left:     $CB_M_LEFT;
+margin-right:    $CB_M_RIGHT;
+}
+#CommonVerticalCenterButtonPositiveInverted.Landscape {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     $CB_SPACE_LEFT;
+margin-right:    $CB_SPACE_RIGHT;
+}
+#CommonVerticalCenterButtonPositiveInverted:pressed {
+background-image:$CB_BG_POSITIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonVerticalCenterButtonPositiveInverted:selected {
+background-image:$CB_BG_POSITIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+#CommonBottomButtonPositiveInverted {
+margin-bottom:   $CB_M_BOTTOM;
+margin-right:    $CB_M_RIGHT;
+
+text-color:      $CB_FONT_COLOR_POSITIVE;
+background-image:$CB_BG_POSITIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonBottomButtonPositiveInverted.Portrait {
+margin-top:      $CB_SPACE_TOP;
+margin-left:     $CB_M_LEFT;
+}
+#CommonBottomButtonPositiveInverted.Landscape {
+margin-top:      $CB_M_TOP;
+margin-left:     $CB_SPACE_LEFT;
+}
+#CommonBottomButtonPositiveInverted:pressed {
+background-image:$CB_BG_POSITIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonBottomButtonPositiveInverted:selected {
+background-image:$CB_BG_POSITIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+/* negative inverted buttons */
+
+#CommonSingleButtonNegativeInverted {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     $CB_M_LEFT;
+margin-right:    $CB_M_RIGHT;
+text-color:      $CB_FONT_COLOR_NEGATIVE;
+background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonSingleButtonNegativeInverted:pressed {
+background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonSingleButtonNegativeInverted:selected {
+background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+#CommonLeftButtonNegativeInverted {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     $CB_M_LEFT;
+margin-right:    $CB_SPACE_RIGHT;
+
+text-color:      $CB_FONT_COLOR_NEGATIVE;
+background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonLeftButtonNegativeInverted:pressed {
+background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonLeftButtonNegativeInverted:selected {
+background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+#CommonHorizontalCenterButtonNegativeInverted {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     $CB_SPACE_LEFT;
+margin-right:    $CB_SPACE_RIGHT;
+text-color:      $CB_FONT_COLOR_NEGATIVE;
+background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS;
+}
+
+#CommonRightButtonNegativeInverted {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     $CB_SPACE_LEFT;
+margin-right:    $CB_M_RIGHT;
+text-color:      $CB_FONT_COLOR_NEGATIVE;
+background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonRightButtonNegativeInverted:pressed {
+background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonRightButtonNegativeInverted:selected {
+background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+#CommonTopButtonNegativeInverted {
+margin-top:      $CB_M_TOP;
+margin-left:     $CB_M_LEFT;
+
+text-color:      $CB_FONT_COLOR_NEGATIVE;
+background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonTopButtonNegativeInverted.Portrait {
+margin-bottom:   $CB_SPACE_BOTTOM;
+margin-right:    $CB_M_RIGHT;
+}
+#CommonTopButtonNegativeInverted.Landscape {
+margin-bottom:   $CB_M_BOTTOM;
+margin-right:    $CB_SPACE_RIGHT;
+}
+#CommonTopButtonNegativeInverted:pressed {
+background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonTopButtonNegativeInverted:selected {
+background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+#CommonVerticalCenterButtonNegativeInverted {
+text-color:      $CB_FONT_COLOR_NEGATIVE;
+background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonVerticalCenterButtonNegativeInverted.Portrait {
+margin-top:      $CB_SPACE_TOP;
+margin-bottom:   $CB_SPACE_BOTTOM;
+margin-left:     $CB_M_LEFT;
+margin-right:    $CB_M_RIGHT;
+}
+#CommonVerticalCenterButtonNegativeInverted.Landscape {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     $CB_SPACE_LEFT;
+margin-right:    $CB_SPACE_RIGHT;
+}
+#CommonVerticalCenterButtonNegativeInverted:pressed {
+background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonVerticalCenterButtonNegativeInverted:selected {
+background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+#CommonBottomButtonNegativeInverted {
+margin-bottom:   $CB_M_BOTTOM;
+margin-right:    $CB_M_RIGHT;
+
+text-color:      $CB_FONT_COLOR_NEGATIVE;
+background-image:$CB_BG_NEGATIVE_INVERTED $CORNER_MARGINS;
+}
+#CommonBottomButtonNegativeInverted.Portrait {
+margin-top:      $CB_SPACE_TOP;
+margin-left:     $CB_M_LEFT;
+}
+#CommonBottomButtonNegativeInverted.Landscape {
+margin-top:      $CB_M_TOP;
+margin-left:     $CB_SPACE_LEFT;
+}
+#CommonBottomButtonNegativeInverted:pressed {
+background-image:$CB_BG_NEGATIVE_INVERTED_PRESSED $CORNER_MARGINS;
+}
+#CommonBottomButtonNegativeInverted:selected {
+background-image:$CB_BG_NEGATIVE_INVERTED_SELECTED $CORNER_MARGINS;
+}
+
+
 /* split-buttons for default application background color */
 
 #CommonLeftSplitButton {
@@ -860,6 +1099,252 @@
 background-image:meegotouch-button-inverted-background-selected-horizontal-right $CORNER_MARGINS;
 text-color:      $CB_FONT_COLOR_INVERTED_SELECTED;
 }
+
+/* special buttons */
+
+#CommonQueryButton {
+margin-top:      $CB_M_TOP;
+margin-bottom:   $CB_M_BOTTOM;
+margin-left:     0.3mm;
+margin-right:    0.3mm;
+
+minimum-size: 20.6mm 5.1mm;
+maximum-size:20.6mm 5.1mm;
+preferred-size:20.6mm 5.1mm;
+
+text-color:      $CB_FONT_COLOR_INVERTED;
+background-image:$CB_BG_INVERTED $CORNER_MARGINS;
+}
+#CommonQueryButton:pressed {
+background-image:$CB_BG_INVERTED_PRESSED $CORNER_MARGINS;
+text-color:      $CB_FONT_COLOR_INVERTED_PRESSED;
+}
+#CommonQueryButton:selected {
+background-image:$CB_BG_INVERTED_SELECTED $CORNER_MARGINS;
+text-color:      $CB_FONT_COLOR_INVERTED_SELECTED;
+}
+
+#CommonListIconButton {
+margin-right: $INDENT_DEFAULT;
+}
+#CommonListIconButtonInverted {
+margin-right: $INDENT_DEFAULT;
+}
+
+#CommonListButton {
+background-image: 'meegotouch-textedit-button-background' 20px 20px 20px 20px;
+minimum-size:     4.2mm 4.3mm;
+preferred-size:   4.2mm 4.3mm;
+maximum-size:     12.2mm 4.3mm;
+margin-left:      0;
+margin-right:     $INDENT_DEFAULT;
+}
+#CommonListButton:pressed {
+background-image: 'meegotouch-textedit-button-background-pressed' 20px 20px 20px 20px;
+}
+#CommonListButton:selected {
+background-image: 'meegotouch-textedit-button-background-selected' 20px 20px 20px 20px;
+}
+
+#CommonListButtonInverted {
+background-image: 'meegotouch-textedit-button-inverted-background' 20px 20px 20px 20px;
+minimum-size:     4.2mm 4.3mm;
+preferred-size:   4.2mm 4.3mm;
+maximum-size:     12.2mm 4.3mm;
+margin-left:      0;
+margin-right:     $INDENT_DEFAULT;
+}
+#CommonListButtonInverted:pressed {
+background-image: 'meegotouch-textedit-button-inverted-background-pressed' 20px 20px 20px 20px;
+}
+#CommonListButtonInverted:selected {
+background-image: 'meegotouch-textedit-button-inverted-background-selected' 20px 20px 20px 20px;
+}
+
+#CommonHeaderButton {
+background-image: 'meegotouch-textedit-button-background' 20px 20px 20px 20px;
+minimum-size:     4.2mm 4.3mm;
+preferred-size:   4.2mm 4.3mm;
+maximum-size:     12.2mm 4.3mm;
+margin-left:      0;
+margin-right:     $INDENT_DEFAULT;
+}
+#CommonHeaderButton:pressed {
+background-image: 'meegotouch-textedit-button-background-pressed' 20px 20px 20px 20px;
+}
+#CommonHeaderButton:selected {
+background-image: 'meegotouch-textedit-button-background-selected' 20px 20px 20px 20px;
+}
+
+#CommonHeaderButtonInverted {
+background-image: 'meegotouch-textedit-button-inverted-background' 20px 20px 20px 20px;
+minimum-size:     4.2mm 4.3mm;
+preferred-size:   4.2mm 4.3mm;
+maximum-size:     12.2mm 4.3mm;
+margin-left:      0;
+margin-right:     $INDENT_DEFAULT;
+}
+#CommonHeaderButtonInverted:pressed {
+background-image: 'meegotouch-textedit-button-inverted-background-pressed' 20px 20px 20px 20px;
+}
+#CommonHeaderButtonInverted:selected {
+background-image: 'meegotouch-textedit-button-inverted-background-selected' 20px 20px 20px 20px;
+}
+
+/* Toolbar buttons */
+
+#CommonToolbarButton {
+background-image: 'meegotouch-button-navigationbar-tab-button-background' $TBB_CORNERS;
+minimum-size:     $TBB_HEIGHT $TBB_HEIGHT;
+preferred-size:   $TBB_WIDTH $TBB_HEIGHT;
+maximum-size:     $TBB_WIDTH $TBB_HEIGHT;
+margin-left:      $MARGIN_SMALL;
+margin-right:     $MARGIN_SMALL;
+}
+#CommonToolbarButton:pressed {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-pressed' $TBB_CORNERS;
+}
+#CommonToolbarButton:selected {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-selected' $TBB_CORNERS;
+}
+#CommonToolbarLeftSplitButton {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-horizontal-left' $TBSB_CORNERS;
+minimum-size:     $TBSB_HEIGHT $TBSB_HEIGHT;
+preferred-size:   $TBSB_WIDTH $TBSB_HEIGHT;
+maximum-size:     $TBSB_WIDTH $TBSB_HEIGHT;
+margin-left:      $MARGIN_SMALL;
+margin-right:     0;
+}
+#CommonToolbarLeftSplitButton:pressed {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-pressed-horizontal-left' $TBSB_CORNERS;
+}
+#CommonToolbarLeftSplitButton:selected {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-selected-horizontal-left' $TBSB_CORNERS;
+}
+#CommonToolbarCenterSplitButton {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-horizontal-center' $TBSB_CORNERS;
+minimum-size:     $TBSB_HEIGHT $TBSB_HEIGHT;
+preferred-size:   $TBSB_WIDTH $TBSB_HEIGHT;
+maximum-size:     $TBSB_WIDTH $TBSB_HEIGHT;
+margin-left:      0;
+margin-right:     0;
+}
+#CommonToolbarCenterSplitButton:pressed {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-pressed-horizontal-center' $TBSB_CORNERS;
+}
+#CommonToolbarCenterSplitButton:selected {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-selected-horizontal-center' $TBSB_CORNERS;
+}
+#CommonToolbarRightSplitButton {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-horizontal-right' $TBSB_CORNERS;
+minimum-size:     $TBSB_HEIGHT $TBSB_HEIGHT;
+preferred-size:   $TBSB_WIDTH $TBSB_HEIGHT;
+maximum-size:     $TBSB_WIDTH $TBSB_HEIGHT;
+margin-left:      0;
+margin-right:     $MARGIN_SMALL;
+}
+#CommonToolbarRightSplitButton:pressed {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-pressed-horizontal-right' $TBSB_CORNERS;
+}
+#CommonToolbarRightSplitButton:selected {
+background-image: 'meegotouch-button-navigationbar-tab-button-background-selected-horizontal-right' $TBSB_CORNERS;
+}
+#CommonOverlayToolbarButton {
+/* TBD */
+}
+
+/* Input Field Buttons */
+
+#CommonRightInputFieldButton {
+background-image: 'meegotouch-textedit-button-background' 20px 20px 20px 20px;
+minimum-size:     4.2mm 4.3mm;
+preferred-size:   4.2mm 4.3mm;
+maximum-size:     12.2mm 4.3mm;
+margin-left:      0;
+margin-right:     $INDENT_DEFAULT;
+}
+#CommonRightInputFieldButton:pressed {
+background-image: 'meegotouch-textedit-button-background-pressed' 20px 20px 20px 20px;
+}
+#CommonRightInputFieldButton:selected {
+background-image: 'meegotouch-textedit-button-background-selected' 20px 20px 20px 20px;
+}
+#CommonLeftInputFieldButton {
+background-image: 'meegotouch-textedit-button-background' 20px 20px 20px 20px;
+minimum-size:     4.2mm 4.3mm;
+preferred-size:   4.2mm 4.3mm;
+maximum-size:     12.2mm 4.3mm;
+margin-left:      $INDENT_DEFAULT;
+margin-right:     0;
+}
+#CommonLeftInputFieldButton:pressed {
+background-image: 'meegotouch-textedit-button-background-pressed' 20px 20px 20px 20px;
+}
+#CommonLeftInputFieldButton:selected {
+background-image: 'meegotouch-textedit-button-background-selected' 20px 20px 20px 20px;
+}
+
+#CommonRightInputFieldButtonInverted {
+background-image: 'meegotouch-textedit-button-inverted-background' 20px 20px 20px 20px;
+minimum-size:     4.2mm 4.3mm;
+preferred-size:   4.2mm 4.3mm;
+maximum-size:     12.2mm 4.3mm;
+margin-left:      0;
+margin-right:     $INDENT_DEFAULT;
+}
+#CommonRightInputFieldButtonInverted:pressed {
+background-image: 'meegotouch-textedit-button-inverted-background-pressed' 20px 20px 20px 20px;
+}
+#CommonRightInputFieldButtonInverted:selected {
+background-image: 'meegotouch-textedit-button-inverted-background-selected' 20px 20px 20px 20px;
+}
+#CommonLeftInputFieldButtonInverted {
+background-image: 'meegotouch-textedit-button-inverted-background' 20px 20px 20px 20px;
+minimum-size:     4.2mm 4.3mm;
+preferred-size:   4.2mm 4.3mm;
+maximum-size:     12.2mm 4.3mm;
+margin-left:      $INDENT_DEFAULT;
+margin-right:     0;
+}
+#CommonLeftInputFieldButtonInverted:pressed {
+background-image: 'meegotouch-textedit-button-inverted-background-pressed' 20px 20px 20px 20px;
+}
+#CommonLeftInputFieldButtonInverted:selected {
+background-image: 'meegotouch-textedit-button-inverted-background-selected' 20px 20px 20px 20px;
+}
+
+/* Very small Icon button */
+
+#CommonSmallIconButton {
+background-image: 'meegotouch-textedit-button-background' 20px 20px 20px 20px;
+minimum-size:     4.2mm 4.3mm;
+preferred-size:   4.2mm 4.3mm;
+maximum-size:     12.2mm 4.3mm;
+margin-left:      0;
+margin-right:     0;
+}
+#CommonSmallIconButton:pressed {
+background-image: 'meegotouch-textedit-button-background-pressed' 20px 20px 20px 20px;
+}
+#CommonSmallIconButton:selected {
+background-image: 'meegotouch-textedit-button-background-selected' 20px 20px 20px 20px;
+}
+
+#CommonSmallIconButtonInverted {
+background-image: 'meegotouch-textedit-button-inverted-background' 20px 20px 20px 20px;
+minimum-size:     4.2mm 4.3mm;
+preferred-size:   4.2mm 4.3mm;
+maximum-size:     12.2mm 4.3mm;
+margin-left:      0;
+margin-right:     0;
+}
+#CommonSmallIconButtonInverted:pressed {
+background-image: 'meegotouch-textedit-button-inverted-background-pressed' 20px 20px 20px 20px;
+}
+#CommonSmallIconButtonInverted:selected {
+background-image: 'meegotouch-textedit-button-inverted-background-selected' 20px 20px 20px 20px;
+}
+
 /* Temp for camera, needs to become moved */
 
 #CommonIconButton {
--- base/meegotouch/libmeegotouchviews/style/commonlayouts/commoniconstyle.css
+++ base/meegotouch/libmeegotouchviews/style/commonlayouts/commoniconstyle.css
@@ -8,10 +8,30 @@
 maximum-size:   $ICON64;
 minimum-size:   $ICON64;
 preferred-size: $ICON64;
-margin-left:    $MARGIN_DOUBLE;
-margin-right:   $MARGIN_DOUBLE;
-margin-top:     $MARGIN_DOUBLE;
-margin-bottom:  $MARGIN_DOUBLE;
+margin-left:    $INDENT_DEFAULT;
+margin-right:   0;
+margin-top:     $MARGIN_LARGE;
+margin-bottom:  $MARGIN_LARGE;
+}
+
+#CommonRightMainIcon {
+maximum-size:   $ICON64;
+minimum-size:   $ICON64;
+preferred-size: $ICON64;
+margin-left:    0;
+margin-right:   $INDENT_DEFAULT;
+margin-top:     $MARGIN_LARGE;
+margin-bottom:  $MARGIN_LARGE;
+}
+
+#CommonRightIcon {
+maximum-size:   $ICON32;
+minimum-size:   $ICON32;
+preferred-size: $ICON32;
+margin-left:    0;
+margin-right:   $INDENT_DEFAULT;
+margin-top:     0;
+margin-bottom:  0;
 }
 
 #CommonTitleIcon {
@@ -24,6 +44,26 @@
 margin-bottom:  0;
 }
 
+#CommonDrillDownIcon {
+maximum-size:   $ICON32;
+minimum-size:   $ICON32;
+preferred-size: $ICON32;
+margin-left:    0;
+margin-right:   $INDENT_DEFAULT;
+margin-top:     0;
+margin-bottom:  0;
+}
+
+#CommonComboBoxIcon {
+maximum-size:   $ICON32;
+minimum-size:   $ICON32;
+preferred-size: $ICON32;
+margin-left:    0;
+margin-right:   $INDENT_DEFAULT;
+margin-top:     0;
+margin-bottom:  0;
+}
+
 #CommonSettingsIcon {
 maximum-size:   $ICON64;
 minimum-size:   $ICON64;
@@ -45,6 +85,16 @@
 margin-left:    $INDENT_DEFAULT;
 }
 
+#CommonViewHeaderIcon {
+maximum-size:   $ICON24;
+minimum-size:   $ICON24;
+preferred-size: $ICON24;
+margin-left:    $INDENT_DEFAULT;
+margin-right:   0;
+margin-top:     0;
+margin-bottom:  0;
+}
+
 #CommonSubIcon {
 maximum-size:   $ICON24;
 minimum-size:   $ICON24;
@@ -103,16 +153,48 @@
 }
 
 #CommonThumbnail {
+maximum-size:   $ICON64;
+minimum-size:   $ICON64;
+preferred-size: $ICON64;
+margin-left:    $INDENT_DEFAULT;
+margin-right:   0;
+margin-top:     $MARGIN_LARGE;
+margin-bottom:  $MARGIN_LARGE;
+}
+
+#CommonRightThumbnail {
+maximum-size:   $ICON64;
+minimum-size:   $ICON64;
+preferred-size: $ICON64;
+margin-left:    0;
+margin-right:   $INDENT_DEFAULT;
+margin-top:     $MARGIN_LARGE;
+margin-bottom:  $MARGIN_LARGE;
+}
+
+#CommonLargeThumbnail {
 maximum-size:   $ICON80;
 minimum-size:   $ICON80;
 preferred-size: $ICON80;
-margin-left:    0.8mm;
+margin-left:    $INDENT_DEFAULT;
 margin-right:   0;
-margin-top:     0.4mm;
-margin-bottom:  0.4mm;
+margin-top:     $MARGIN_SMALL;
+margin-bottom:  $MARGIN_SMALL;
 }
 
 #CommonAvatarPlaceholder {
+maximum-size:   $ICON64;
+minimum-size:   $ICON64;
+preferred-size: $ICON64;
+margin-left:    $MARGIN_LARGE;
+margin-right:   0;
+margin-top:     $MARGIN_LARGE;
+margin-bottom:  $MARGIN_LARGE;
+/* The image is temporary and will be replaced with a dedicated placeholder graphic */
+avatarBackgroundImage: 'meegotouch-panel-background-selected';
+}
+
+#CommonLargeAvatarPlaceholder {
 maximum-size:   $ICON80;
 minimum-size:   $ICON80;
 preferred-size: $ICON80;
--- base/meegotouch/libmeegotouchviews/style/commonlayouts/commonlabelstyle.css
+++ base/meegotouch/libmeegotouchviews/style/commonlayouts/commonlabelstyle.css
@@ -1,5 +1,5 @@
- at const CTITLE_FONT:    "Nokia Standard" bold 26;
- at const CSUBTITLE_FONT: "Nokia Standard" light 22;
+ at const CTITLE_FONT:    $FONT_FAMILY bold 26;
+ at const CSUBTITLE_FONT: $FONT_FAMILY light 22;
 @const CTITLE_M_TOP:    1.5mm;
 @const CSUBTITLE_M_TOP: 0.2mm;
 @const CTITLE_COLOR:          $COLOR_FOREGROUND;
@@ -185,7 +185,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonBodyText {
-font:          "Nokia Standard" light 24;
+font:          $FONT_FAMILY light 24;
 color:         $COLOR_FOREGROUND;
 margin-top:    2.4mm;
 margin-bottom: 2.4mm;
@@ -193,7 +193,7 @@
 margin-right:  2.4mm;
 }
 #CommonBodyTextLight {
-font:          "Nokia Standard" light 24;
+font:          $FONT_FAMILY light 24;
 color:         $COLOR_SECONDARY_FOREGROUND;
 margin-top:    2.4mm;
 margin-bottom: 2.4mm;
@@ -201,7 +201,7 @@
 margin-right:  2.4mm;
 }
 #CommonXLargeGroupHeader {
-font:          "Nokia Standard" light 56;
+font:          $FONT_FAMILY light 56;
 color:         $COLOR_FOREGROUND;
 margin-top:    0.8mm;
 margin-bottom: 0;
@@ -209,15 +209,23 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonLargeGroupHeader {
-font:          "Nokia Standard" light 40;
+font:          $FONT_FAMILY light 40;
 color:         $COLOR_FOREGROUND;
 margin-top:    0.6mm;
 margin-bottom: 0;
 margin-left:   $INDENT_DEFAULT;
 margin-right:  $INDENT_DEFAULT;
 }
+#CommonHeader {
+font:          $FONT_FAMILY bold 22;
+color:         $COLOR_FOREGROUND;
+margin-top:    0.5mm;
+margin-bottom: 0;
+margin-left:   $INDENT_DEFAULT;
+margin-right:  $INDENT_DEFAULT;
+}
 #CommonGroupHeader {
-font:          "Nokia Standard" light 32;
+font:          $FONT_FAMILY light 32;
 color:         $COLOR_FOREGROUND;
 margin-top:    0.8mm;
 margin-bottom: 0;
@@ -225,7 +233,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonSmallGroupHeader {
-font:          "Nokia Standard" bold 22;
+font:          $FONT_FAMILY bold 22;
 color:         $COLOR_FOREGROUND;
 margin-top:    0.5mm;
 margin-bottom: 0;
@@ -233,7 +241,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonSmallGroupHeaderLight {
-font:          "Nokia Standard" light 22;
+font:          $FONT_FAMILY light 22;
 color:         $COLOR_FOREGROUND;
 margin-top:    0.5mm;
 margin-bottom: 0;
@@ -241,15 +249,23 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonViewHeader {
-font:          "Nokia Standard" bold 22;
+font:          $FONT_FAMILY bold 22;
 color:         $COLOR_FOREGROUND;
 margin-top:    0.9mm;
 margin-bottom: 0;
 margin-left:   $INDENT_DEFAULT;
 margin-right:  $INDENT_DEFAULT;
 }
+#CommonLargeViewHeader {
+font:          $FONT_FAMILY bold 26;
+color:         $COLOR_FOREGROUND;
+margin-top:    0;
+margin-bottom: 0;
+margin-left:   $INDENT_DEFAULT;
+margin-right:  $INDENT_DEFAULT;
+}
 #CommonViewHeaderWithIcon {
-font:          "Nokia Standard" bold 22;
+font:          $FONT_FAMILY bold 22;
 color:         $COLOR_FOREGROUND;
 margin-top:    0.9mm;
 margin-bottom: 0;
@@ -257,7 +273,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonOverlayViewHeader {
-font:          "Nokia Standard" bold 22;
+font:          $FONT_FAMILY bold 22;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0.9mm;
 margin-bottom: 0;
@@ -289,7 +305,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonInputFieldText {
-font:          "Nokia Standard" light 24;
+font:          $FONT_FAMILY light 24;
 color:         $COLOR_FOREGROUND;
 margin-top:    0;
 margin-bottom: 0;
@@ -297,7 +313,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonInputFieldTextActive {
-font:          "Nokia Standard" light 24;
+font:          $FONT_FAMILY light 24;
 color:         $COLOR_FOREGROUND;
 margin-top:    0;
 margin-bottom: 0;
@@ -305,7 +321,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonInputFieldTextHint {
-font:          "Nokia Standard" light 24;
+font:          $FONT_FAMILY light 24;
 color:         #C0C0C0;
 margin-top:    0;
 margin-bottom: 0;
@@ -313,7 +329,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonFieldLabel { /* same as field header, needs update */
-font:          "Nokia Standard" light 22;
+font:          $FONT_FAMILY light 22;
 color:         $COLOR_FOREGROUND;
 margin-top:    0.8mm;
 margin-bottom: 0;
@@ -325,7 +341,7 @@
 color:         $CB_FONT_COLOR;
 }
 #CommonQueryTitle {
-font:          "Nokia Standard" bold 32;
+font:          $FONT_FAMILY bold 32;
 color:         $COLOR_ACCENT1;
 margin-top:    2.8mm;
 margin-bottom: 0;
@@ -333,7 +349,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonQueryText {
-font:          "Nokia Standard" light 22;
+font:          $FONT_FAMILY light 22;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    1mm;
 margin-bottom: 0;
@@ -483,7 +499,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonBodyTextInverted {
-font:          "Nokia Standard" light 24;
+font:          $FONT_FAMILY light 24;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    2.4mm;
 margin-bottom: 2.4mm;
@@ -491,7 +507,7 @@
 margin-right:  2.4mm;
 }
 #CommonBodyTextLightInverted {
-font:          "Nokia Standard" light 24;
+font:          $FONT_FAMILY light 24;
 color:         $COLOR_INVERTED_SECONDARY_FOREGROUND;
 margin-top:    2.4mm;
 margin-bottom: 2.4mm;
@@ -499,7 +515,7 @@
 margin-right:  2.4mm;
 }
 #CommonXLargeGroupHeaderInverted {
-font:          "Nokia Standard" light 56;
+font:          $FONT_FAMILY light 56;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0.8mm;
 margin-bottom: 0;
@@ -507,15 +523,23 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonLargeGroupHeaderInverted {
-font:          "Nokia Standard" light 40;
+font:          $FONT_FAMILY light 40;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0.6mm;
 margin-bottom: 0;
 margin-left:   $INDENT_DEFAULT;
 margin-right:  $INDENT_DEFAULT;
 }
+#CommonHeaderInverted {
+font:          $FONT_FAMILY bold 22;
+color:         $COLOR_INVERTED_FOREGROUND;
+margin-top:    0.5mm;
+margin-bottom: 0;
+margin-left:   $INDENT_DEFAULT;
+margin-right:  $INDENT_DEFAULT;
+}
 #CommonGroupHeaderInverted {
-font:          "Nokia Standard" light 32;
+font:          $FONT_FAMILY light 32;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0.8mm;
 margin-bottom: 0;
@@ -523,7 +547,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonSmallGroupHeaderInverted {
-font:          "Nokia Standard" bold 22;
+font:          $FONT_FAMILY bold 22;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0.5mm;
 margin-bottom: 0;
@@ -531,7 +555,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonSmallGroupHeaderLightInverted {
-font:          "Nokia Standard" light 22;
+font:          $FONT_FAMILY light 22;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0.5mm;
 margin-bottom: 0;
@@ -539,15 +563,23 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonViewHeaderInverted {
-font:          "Nokia Standard" bold 22;
+font:          $FONT_FAMILY bold 22;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0.9mm;
 margin-bottom: 0;
 margin-left:   $INDENT_DEFAULT;
 margin-right:  $INDENT_DEFAULT;
 }
+#CommonLargeViewHeaderInverted {
+font:          $FONT_FAMILY bold 26;
+color:         $COLOR_INVERTED_FOREGROUND;
+margin-top:    0;
+margin-bottom: 0;
+margin-left:   $INDENT_DEFAULT;
+margin-right:  $INDENT_DEFAULT;
+}
 #CommonViewHeaderWithIconInverted {
-font:          "Nokia Standard" bold 22;
+font:          $FONT_FAMILY bold 22;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0.9mm;
 margin-bottom: 0;
@@ -555,7 +587,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonOverlayViewHeaderInverted {
-font:          "Nokia Standard" bold 22;
+font:          $FONT_FAMILY bold 22;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0.9mm;
 margin-bottom: 0;
@@ -587,7 +619,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonInputFieldTextInverted {
-font:          "Nokia Standard" light 24;
+font:          $FONT_FAMILY light 24;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0;
 margin-bottom: 0;
@@ -595,7 +627,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonInputFieldTextActiveInverted {
-font:          "Nokia Standard" light 24;
+font:          $FONT_FAMILY light 24;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0;
 margin-bottom: 0;
@@ -603,7 +635,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonInputFieldTextHintInverted {
-font:          "Nokia Standard" light 24;
+font:          $FONT_FAMILY light 24;
 color:         #C0C0C0;
 margin-top:    0;
 margin-bottom: 0;
@@ -611,7 +643,7 @@
 margin-right:  $INDENT_DEFAULT;
 }
 #CommonFieldLabelInverted { /* same as field header, needs update */
-font:          "Nokia Standard" light 22;
+font:          $FONT_FAMILY light 22;
 color:         $COLOR_INVERTED_FOREGROUND;
 margin-top:    0.8mm;
 margin-bottom: 0;
@@ -637,6 +669,12 @@
     color: $COLOR_INVERTED_FOREGROUND;
 } /* move this to contacts? */
 
+#CommonLargeAvatarInitials {
+    font: $FONT_FAMILY bold 4.0mm;
+    color: $COLOR_INVERTED_FOREGROUND;
+} /* move this to contacts? */
+
+
 /* temporary styles */
 
 #CommonTitleLeftMargin {
@@ -708,4 +746,5 @@
 #CommonAvatarInitials {
     font: $FONT_XLARGE_BOLD;
     color: $COLOR_INVERTED_FOREGROUND;
-} /* move this to contacts? */
\ No newline at end of file
+} /* move this to contacts? */
+
--- base/meegotouch/libmeegotouchviews/style/commonlayouts/commonlayoutstyle.css
+++ base/meegotouch/libmeegotouchviews/style/commonlayouts/commonlayoutstyle.css
@@ -1,6 +1,35 @@
+/* Divider */
 
+#CommonItemDivider {
+background-image: 'meegotouch-separator-background-horizontal' 4px 4px 2px 2px;
+span:			0.9mm;
+margin-top:     0;
+margin-bottom:  0;
+margin-left:    0;
+margin-right:   0;
+}
+
+#CommonGroupDivider {
+background-image: 'meegotouch-groupseparator-background-horizontal' 4px 4px 2px 2px;
+span:			0.9mm;
+margin-top:     0;
+margin-bottom:  0;
+margin-left:    0;
+margin-right:   0;
+}
+
+#CommonGroupHeaderDivider {
+background-image: 'meegotouch-groupseparator-header-background-horizontal' 4px 4px 2px 2px;
+span:			0.9mm;
+margin-top:     0;
+margin-bottom:  0;
+margin-left:    0;
+margin-right:   0;
+}
 
 #CommonHorizontalSeparator {
+background-image: 'meegotouch-separator-background-horizontal' 4px 4px 2px 2px;
+span:			0.1mm;
 margin-top:     0;
 margin-bottom:  0;
 margin-left:    0;
@@ -8,36 +37,65 @@
 }
 
 #CommonVerticalSeparator {
+background-image: 'meegotouch-separator-background-vertical' 4px 4px 2px 2px;
 margin-right:   0;
 margin-left:    0;
 margin-bottom:  0;
 margin-top:     0;
 }
 
-#CommonDivider {
+
+#CommonItemDividerInverted {
+background-image: 'meegotouch-separator-inverted-background-horizontal' 4px 4px 2px 2px;
+span:			0.9mm;
 margin-top:     0;
 margin-bottom:  0;
 margin-left:    0;
 margin-right:   0;
 }
-#CommonItemDivider {
+
+#CommonGroupDividerInverted {
+background-image: 'meegotouch-groupseparator-inverted-background-horizontal' 4px 4px 2px 2px;
+span:			0.9mm;
 margin-top:     0;
 margin-bottom:  0;
 margin-left:    0;
 margin-right:   0;
 }
-#CommonGroupDivider {
+
+#CommonGroupHeaderDividerInverted {
+background-image: 'meegotouch-groupseparator-header-inverted-background-horizontal' 4px 4px 2px 2px;
+span:			0.9mm;
+margin-top:     0;
+margin-bottom:  0;
+margin-left:    0;
+margin-right:   0;
+}
+
+#CommonHorizontalSeparatorInverted {
+background-image: 'meegotouch-separator-inverted-background-horizontal' 4px 4px 2px 2px;
+span:			0.1mm;
 margin-top:     0;
 margin-bottom:  0;
 margin-left:    0;
 margin-right:   0;
 }
 
+#CommonVerticalSeparatorInverted {
+background-image: 'meegotouch-separator-inverted-background-vertical' 4px 4px 2px 2px;
+margin-right:   0;
+margin-left:    0;
+margin-bottom:  0;
+margin-top:     0;
+}
+
+/* Spacer */
+
 #CommonSpacer {
 minimum-size:   0 0;
-preferred-size: 100.0mm 0;
-maximum-size:   100.0mm 0;
-margin-top:     $MARGIN_DOUBLE;
+preferred-size: 100% 0;
+maximum-size:   100% 0;
+margin-top:     $MARGIN_LARGE;
 margin-bottom:  0;
 margin-left:    0;
 margin-right:   0;
@@ -45,14 +103,36 @@
 
 #CommonSmallSpacer {
 minimum-size:   0 0;
-preferred-size: 100.0mm 0;
-maximum-size:   100.0mm 0;
+preferred-size: 100% 0;
+maximum-size:   100% 0;
 margin-top:     $MARGIN_SMALL;
 margin-bottom:  0;
 margin-left:    0;
 margin-right:   0;
 }
 
+#CommonLargeSpacer {
+minimum-size:   0 0;
+preferred-size: 100% 0;
+maximum-size:   100% 0;
+margin-top:     $MARGIN_XLARGE;
+margin-bottom:  0;
+margin-left:    0;
+margin-right:   0;
+}
+
+#CommonXLargeSpacer {
+minimum-size:   0 0;
+preferred-size: 100% 0;
+maximum-size:   100% 0;
+margin-top:     $MARGIN_XXLARGE;
+margin-bottom:  0;
+margin-left:    0;
+margin-right:   0;
+}
+
+/* Groups */
+
 #CommonTitleIconGroup {
 margin-left:    $INDENT_DEFAULT;
 }
--- base/meegotouch/libmeegotouchviews/style/commonlayouts/commonpanelstyle.css
+++ base/meegotouch/libmeegotouchviews/style/commonlayouts/commonpanelstyle.css
@@ -54,6 +54,47 @@
 background-image:  $CP_INVERTED_BG_SELECTED;
 }
 
+#CommonPanelNoFeedback {
+minimum-size:      $SIZE_LIST $SIZE_LIST;
+preferred-size:    -1 $SIZE_LIST;
+maximum-size:      -1 $SIZE_LIST;
+background-tiles:  ;
+background-image:  $CP_BG;
+margin-top:        0;
+margin-bottom:     0;
+margin-left:       0;
+margin-right:      0;
+}
+#CommonPanelNoFeedback:pressed {
+background-tiles:  ;
+background-image:  $CP_BG;
+}
+#CommonPanelNoFeedback:selected {
+background-tiles:  ;
+background-image:  $CP_BG;
+
+}
+
+#CommonPanelNoFeedbackInverted {
+minimum-size:      $SIZE_LIST $SIZE_LIST;
+preferred-size:    -1 $SIZE_LIST;
+maximum-size:      -1 $SIZE_LIST;
+background-tiles:  ;
+background-image:  $CP_INVERTED_BG;
+margin-top:        0;
+margin-bottom:     0;
+margin-left:       0;
+margin-right:      0;
+}
+#CommonPanelNoFeedbackInverted:pressed {
+background-tiles:  ;
+background-image:  $CP_INVERTED_BG;
+}
+#CommonPanelNoFeedbackInverted:selected {
+background-tiles:  ;
+background-image:  $CP_INVERTED_BG;
+}
+
 #CommonUnreadPanel {
 minimum-size:      $SIZE_LIST $SIZE_LIST;    
 preferred-size:    -1 $SIZE_LIST;
@@ -174,7 +215,9 @@
 background-image:  $CP_INVERTED_BG_SELECTED;
 }
 
-#CommonXLargeGroupHeaderPanel {
+/* Header panels */
+
+#CommonXLargeHeaderPanel {
 minimum-size:      72 72;   
 preferred-size:    -1 72;   
 maximum-size:      -1 -1; 
@@ -185,7 +228,7 @@
 margin-left:       0;
 margin-right:      0;
 }
-#CommonXLargeGroupHeaderPanelInverted {
+#CommonXLargeHeaderPanelInverted {
 minimum-size:      72 72;   
 preferred-size:    -1 72;   
 maximum-size:      -1 -1; 
@@ -196,7 +239,7 @@
 margin-left:       0;
 margin-right:      0;
 }
-#CommonLargeGroupHeaderPanel {
+#CommonLargeHeaderPanel {
 minimum-size:      56 56;
 preferred-size:    -1 56;   
 maximum-size:      -1 -1; 
@@ -207,7 +250,7 @@
 margin-left:       0;
 margin-right:      0;
 }
-#CommonLargeGroupHeaderPanelInverted {
+#CommonLargeHeaderPanelInverted {
 minimum-size:      56 56;
 preferred-size:    -1 56;   
 maximum-size:      -1 -1; 
@@ -218,8 +261,8 @@
 margin-left:       0;
 margin-right:      0;
 }
-#CommonGroupHeaderPanel {
-minimum-size:      48 48; 
+#CommonHeaderPanel {
+minimum-size:      32 32; 
 preferred-size:    -1 48;   
 maximum-size:      -1 -1; 
 background-tiles:  ;
@@ -229,8 +272,8 @@
 margin-left:       0;
 margin-right:      0;
 }
-#CommonGroupHeaderPanelInverted {
-minimum-size:      48 48; 
+#CommonHeaderPanelInverted {
+minimum-size:      32 32; 
 preferred-size:    -1 48;   
 maximum-size:      -1 -1; 
 background-tiles:  ;
@@ -240,25 +283,88 @@
 margin-left:       0;
 margin-right:      0;
 }
-#CommonSmallGroupHeaderPanel {
+#CommonGroupHeaderPanel {
 minimum-size:      32 32;   
 preferred-size:    -1 32;   
 maximum-size:      -1 -1; 
 background-tiles:  ;
-background-image:  $CP_BG;
+background-image:  $CP_BG; /* Needs asset */
 margin-top:        0;
 margin-bottom:     0;
 margin-left:       0;
 margin-right:      0;
 }
-#CommonSmallGroupHeaderPanelInverted {
+#CommonGroupHeaderPanelInverted {
 minimum-size:      32 32;   
 preferred-size:    -1 32;   
 maximum-size:      -1 -1; 
 background-tiles:  ;
-background-image:  $CP_INVERTED_BG;
+background-image:  $CP_INVERTED_BG; /* Needs asset */
+margin-top:        0;
+margin-bottom:     0;
+margin-left:       0;
+margin-right:      0;
+}
+
+/* View Header panels */
+
+#CommonViewHeaderPanel {
+minimum-size:      40 40; 
+preferred-size:    100% 40;   
+maximum-size:      100% -1; 
+background-tiles:  ;
+background-image:  'meegotouch-view-header' 15px 15px 15px 15px;
+margin-top:        0;
+margin-bottom:     0;
+margin-left:       0;
+margin-right:      0;
+}
+
+#CommonViewHeaderPanelInverted {
+minimum-size:      40 40; 
+preferred-size:    100% 40;   
+maximum-size:      100% -1; 
+background-tiles:  ;
+background-image:  'meegotouch-view-header-inverted' 15px 15px 15px 15px;
+margin-top:        0;
+margin-bottom:     0;
+margin-left:       0;
+margin-right:      0;
+}
+
+#CommonViewHeaderPanelColored {
+minimum-size:      40 40; 
+preferred-size:    100% 40;   
+maximum-size:      100% -1; 
+background-tiles:  ;
+background-image:  'meegotouch-view-header-colored' 15px 15px 15px 15px;
 margin-top:        0;
 margin-bottom:     0;
 margin-left:       0;
 margin-right:      0;
 }
+
+#CommonViewHeaderPanelColoredInverted {
+minimum-size:      40 40; 
+preferred-size:    100% 40;   
+maximum-size:      100% -1; 
+background-tiles:  ;
+background-image:  'meegotouch-view-header-colored-inverted' 15px 15px 15px 15px;
+margin-top:        0;
+margin-bottom:     0;
+margin-left:       0;
+margin-right:      0;
+}
+
+#CommonOverlayViewHeaderPanel {
+minimum-size:      40 40; 
+preferred-size:    100% -1;   
+maximum-size:      100% -1; 
+background-tiles:  ;
+background-image:  'meegotouch-view-header-overlay' 15px 15px 15px 15px;
+margin-top:        0;
+margin-bottom:     0;
+margin-left:       0;
+margin-right:      0;
+}
+
--- base/meegotouch/libmeegotouchviews/style/commonlayouts/commonuicontrolstyle.css
+++ base/meegotouch/libmeegotouchviews/style/commonlayouts/commonuicontrolstyle.css
@@ -2,7 +2,9 @@
 @const C_INPUT_BG_SELECTED: meegotouch-textedit-background-selected $CORNER_MARGINS;
 @const C_INPUT_BG_INVERTED: meegotouch-textedit-background $CORNER_MARGINS;
 @const C_INPUT_BG_SELECTED_INVERTED: meegotouch-textedit-background-selected $CORNER_MARGINS;
+ at const CHECKBOX_SIZE:       4.2mm 4.2mm;
 
+/* switch */
 
 #CommonSwitch {
 margin-left:     $INDENT_DEFAULT;
@@ -16,32 +18,198 @@
 margin-left:     0;
 margin-right:    $INDENT_DEFAULT;
 }
-
-#CommonCheckBox {
+#CommonSwitchInverted {
 margin-left:     $INDENT_DEFAULT;
 margin-right:    $INDENT_DEFAULT;
 }
+#CommonLeftSwitchInverted {
+margin-left:     $INDENT_DEFAULT;
+margin-right:    0;
+}
+#CommonRightSwitchInverted {
+margin-left:     0;
+margin-right:    $INDENT_DEFAULT;
+}
+
+/* Checkbox */
+
+#CommonCheckBox {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-checkbox-background' 0px 0px 0px 0px;
+margin-left:     1.5mm;
+margin-right:    1.5mm;
+}
+#CommonCheckBox:pressed {
+background-image:'meegotouch-button-checkbox-background-pressed' 0px 0px 0px 0px;
+}
+#CommonCheckBox:selected {
+background-image:'meegotouch-button-checkbox-background-selected' 0px 0px 0px 0px;
+}
 #CommonLeftCheckBox {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-checkbox-background' 0px 0px 0px 0px;
 margin-left:     $INDENT_DEFAULT;
 margin-right:    0;
 }
+#CommonLeftCheckBox:pressed {
+background-image:'meegotouch-button-checkbox-background-pressed' 0px 0px 0px 0px;
+}
+#CommonLeftCheckBox:selected {
+background-image:'meegotouch-button-checkbox-background-selected' 0px 0px 0px 0px;
+}
 #CommonRightCheckBox {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-checkbox-background' 0px 0px 0px 0px;
 margin-left:     0;
 margin-right:    $INDENT_DEFAULT;
 }
+#CommonRightCheckBox:pressed {
+background-image:'meegotouch-button-checkbox-background-pressed' 0px 0px 0px 0px;
+}
+#CommonRightCheckBox:selected {
+background-image:'meegotouch-button-checkbox-background-selected' 0px 0px 0px 0px;
+}
+
+#CommonCheckBoxInverted {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-checkbox-inverted-background' 0px 0px 0px 0px;
+margin-left:     $INDENT_DEFAULT;
+margin-right:    $INDENT_DEFAULT;
+}
+#CommonCheckBoxInverted:pressed {
+background-image:'meegotouch-button-checkbox-inverted-background-pressed' 0px 0px 0px 0px;
+}
+#CommonCheckBoxInverted:selected {
+background-image:'meegotouch-button-checkbox-inverted-background-selected' 0px 0px 0px 0px;
+}
+#CommonLeftCheckBoxInverted {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-checkbox-inverted-background' 0px 0px 0px 0px;
+margin-left:     $INDENT_DEFAULT;
+margin-right:    0;
+}
+#CommonLeftCheckBoxInverted:pressed {
+background-image:'meegotouch-button-checkbox-inverted-background-pressed' 0px 0px 0px 0px;
+}
+#CommonLeftCheckBoxInverted:selected {
+background-image:'meegotouch-button-checkbox-inverted-background-selected' 0px 0px 0px 0px;
+}
+#CommonRightCheckBoxInverted {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-checkbox-inverted-background' 0px 0px 0px 0px;
+margin-left:     0;
+margin-right:    $INDENT_DEFAULT;
+}
+#CommonRightCheckBoxInverted:pressed {
+background-image:'meegotouch-button-checkbox-inverted-background-pressed' 0px 0px 0px 0px;
+}
+#CommonRightCheckBoxInverted:selected {
+background-image:'meegotouch-button-checkbox-inverted-background-selected' 0px 0px 0px 0px;
+}
+
+/* Radio Button */
 
 #CommonRadioButton {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-radiobutton-background' 0px 0px 0px 0px;
 margin-left:     $INDENT_DEFAULT;
 margin-right:    $INDENT_DEFAULT;
 }
+#CommonRadioButton:pressed {
+background-image:'meegotouch-button-radiobutton-background-pressed' 0px 0px 0px 0px;
+}
+#CommonRadioButton:selected {
+background-image:'meegotouch-button-radiobutton-background-selected' 0px 0px 0px 0px;
+}
 #CommonLeftRadioButton {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-radiobutton-background' 0px 0px 0px 0px;
 margin-left:     $INDENT_DEFAULT;
 margin-right:    0;
 }
+#CommonLeftRadioButton:pressed {
+background-image:'meegotouch-button-radiobutton-background-pressed' 0px 0px 0px 0px;
+}
+#CommonLeftRadioButton:selected {
+background-image:'meegotouch-button-radiobutton-background-selected' 0px 0px 0px 0px;
+}
 #CommonRightRadioButton {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-radiobutton-background' 0px 0px 0px 0px;
+margin-left:     0;
+margin-right:    $INDENT_DEFAULT;
+}
+#CommonRightRadioButton:pressed {
+background-image:'meegotouch-button-radiobutton-background-pressed' 0px 0px 0px 0px;
+}
+#CommonRightRadioButton:selected {
+background-image:'meegotouch-button-radiobutton-background-selected' 0px 0px 0px 0px;
+}
+
+#CommonRadioButtonInverted {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-radiobutton-inverted-background' 0px 0px 0px 0px;
+margin-left:     $INDENT_DEFAULT;
+margin-right:    $INDENT_DEFAULT;
+}
+#CommonRadioButtonInverted:pressed {
+background-image:'meegotouch-button-radiobutton-inverted-background-pressed' 0px 0px 0px 0px;
+}
+#CommonRadioButtonInverted:selected {
+background-image:'meegotouch-button-radiobutton-inverted-background-selected' 0px 0px 0px 0px;
+}
+
+#CommonLeftRadioButtonInverted {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-radiobutton-inverted-background' 0px 0px 0px 0px;
+margin-left:     $INDENT_DEFAULT;
+margin-right:    0;
+}
+#CommonLeftRadioButtonInverted:pressed {
+background-image:'meegotouch-button-radiobutton-inverted-background-pressed' 0px 0px 0px 0px;
+}
+#CommonLeftRadioButtonInverted:selected {
+background-image:'meegotouch-button-radiobutton-inverted-background-selected' 0px 0px 0px 0px;
+}
+
+#CommonRightRadioButtonInverted {
+minimum-size:    $CHECKBOX_SIZE;
+preferred-size:  $CHECKBOX_SIZE;
+maximum-size:    $CHECKBOX_SIZE;
+background-image:'meegotouch-button-radiobutton-inverted-background' 0px 0px 0px 0px;
 margin-left:     0;
 margin-right:    $INDENT_DEFAULT;
 }
+#CommonLeftRadioButtonInverted:pressed {
+background-image:'meegotouch-button-radiobutton-inverted-background-pressed' 0px 0px 0px 0px;
+}
+#CommonLeftRadioButtonInverted:selected {
+background-image:'meegotouch-button-radiobutton-inverted-background-selected' 0px 0px 0px 0px;
+}
+
+/* Slider */
 
 #CommonSlider {
 margin-top:      $MARGIN_DOUBLE;
@@ -53,6 +221,40 @@
 maximum-size:    44.8mm -1;
 }
 
+#CommonSliderInverted {
+margin-top:      $MARGIN_DOUBLE;
+margin-bottom:   $MARGIN_DOUBLE;
+margin-left:     $INDENT_DEFAULT;
+margin-right:    $INDENT_DEFAULT;
+minimum-size:    32.2mm -1;
+preferred-size:  44.8mm -1;
+maximum-size:    44.8mm -1;
+}
+
+/* Seeker */
+
+#CommonSeeker {
+margin-top:      $MARGIN_DOUBLE;
+margin-bottom:   $MARGIN_DOUBLE;
+margin-left:     $INDENT_DEFAULT;
+margin-right:    $INDENT_DEFAULT;
+minimum-size:    32.2mm -1;
+preferred-size:  44.8mm -1;
+maximum-size:    44.8mm -1;
+}
+
+#CommonSeekerInverted {
+margin-top:      $MARGIN_DOUBLE;
+margin-bottom:   $MARGIN_DOUBLE;
+margin-left:     $INDENT_DEFAULT;
+margin-right:    $INDENT_DEFAULT;
+minimum-size:    32.2mm -1;
+preferred-size:  44.8mm -1;
+maximum-size:    44.8mm -1;
+}
+
+/* Spinner */
+
 #CommonViewHeaderSpinner {
 margin-top:      $MARGIN_LARGE;
 margin-bottom:   $MARGIN_LARGE;
@@ -81,6 +283,36 @@
 maximum-size:    9.6mm 9.6mm;
 }
 
+#CommonViewHeaderSpinnerInverted {
+margin-top:      $MARGIN_LARGE;
+margin-bottom:   $MARGIN_LARGE;
+margin-left:     0;
+margin-right:    $INDENT_DEFAULT;
+minimum-size:    2.4mm 2.4mm;
+preferred-size:  2.4mm 2.4mm;
+maximum-size:    2.4mm 2.4mm;
+}
+#CommonListItemSpinnerInverted {
+margin-top:      0;
+margin-bottom:   0;
+margin-left:     0;
+margin-right:    $INDENT_DEFAULT;
+minimum-size:    3.2mm 3.2mm;
+preferred-size:  3.2mm 3.2mm;
+maximum-size:    3.2mm 3.2mm;
+}
+#CommonViewHeaderSpinnerInverted {
+margin-top:      0;
+margin-bottom:   0;
+margin-left:     0;
+margin-right:    0;
+minimum-size:    9.6mm 9.6mm;
+preferred-size:  9.6mm 9.6mm;
+maximum-size:    9.6mm 9.6mm;
+}
+
+/* Progress bar */
+
 #CommonProgressBar {
 margin-top:      $MARGIN_DOUBLE;
 margin-bottom:   $MARGIN_DOUBLE;
@@ -91,6 +323,16 @@
 preferred-size:  44.8mm -1;
 maximum-size:    44.8mm -1; */
 }
+#CommonProgressBarInverted {
+margin-top:      $MARGIN_DOUBLE;
+margin-bottom:   $MARGIN_DOUBLE;
+margin-left:     $INDENT_DEFAULT;
+margin-right:    $INDENT_DEFAULT;
+/* This is causing problems at MAdvanceListItem Fix me
+minimum-size:    32.2mm -1;
+preferred-size:  44.8mm -1;
+maximum-size:    44.8mm -1; */
+}
 
 /* Input Fields */
 
@@ -179,6 +421,11 @@
 margin-right:    $INDENT_DEFAULT;
 }
 
+#CommonToolbarInputField {
+margin-left:     $INDENT_DEFAULT;
+margin-right:    $INDENT_DEFAULT;
+}
+
 /* Inverted Input Fields */
 
 #CommonSingleInputFieldInverted {
@@ -271,6 +518,10 @@
 
 /* Special items */
 
+#CommonOverlayComboBox {
+/* TBD */
+}
+
 #CommonCountBubble {
 margin-right:    $INDENT_DEFAULT;
 }
--- base/meegotouch/libmeegotouchviews/style/mbannerstyle.css
+++ base/meegotouch/libmeegotouchviews/style/mbannerstyle.css
@@ -1,70 +1,255 @@
 /* MBannerStyle : MWidgetStyle */
 MBannerStyle {
-    icon-size: $SIZE_ICON_LARGE $SIZE_ICON_LARGE;
-    maximum-size: 100% 6.4mm;
-    padding-left: $MARGIN_XLARGE;
-    padding-right: $MARGIN_XLARGE;
+    icon-size: 0 0;
+    padding-top: 0;
+    padding-bottom:0;
+    padding-right: 0;
+    padding-left: 0;
+
     disappear-timeout: 3000;
-    /* MBanner without styleName will use by default event background*/
+}
+
+MBanner MLabelStyle {
+    margin-top:0;
+    margin-bottom:0;
+    margin-left:0;
+    margin-right:0;
+
+    padding-top:0;
+    padding-bottom:0;
+    padding-right:0;
+    padding-left:0;
+}
+
+/* Event Banner */
+
+MBannerStyle #EventBanner {
+    icon-size: 1.5mm 1.5mm;
+    minimum-size: 100% 3.6mm;
+    maximum-size: 100% 3.6mm;
+    preferred-size: 100% 3.6mm;
     background-image: "meegotouch-notification-event-background" 10px 10px 10px 10px;
-    color: $COLOR_FOREGROUND; /* To avoid white over white */
+    margin-bottom:2.0mm;
 }
 
-MBannerStyle.Portrait {
-    icon-size: $SIZE_ICON_LARGE $SIZE_ICON_LARGE;
-    maximum-size: 100% 6.4mm;
-    padding-left: $MARGIN_XLARGE;
-    padding-right: $MARGIN_XLARGE;
-    disappear-timeout: 3000;
+MBannerStyle #EventBanner:pressed {
+    background-image: "meegotouch-notification-event-background-pressed" 10px 10px 10px 10px;
 }
 
-#MBannerTitle{
-    font: $FONT_DEFAULT_BOLD;
+#MBannerTitleEvent {
+    font: $FONT_XSMALL_BOLD;
     color: $COLOR_INVERTED_FOREGROUND;
-    margin-right: $MARGIN_XXLARGE;
-    margin-bottom:-3;
+    margin-right: $MARGIN_LARGE;
+    margin-left: $MARGIN_LARGE;
 }
 
-#MBannerSubtitle{
-    font: $FONT_XSMALL;
+#MBannerSubtitleEvent{
+    font: $FONT_XSMALL_REGULAR;
     color: $COLOR_INVERTED_FOREGROUND;
-    margin-top:-3;
 }
 
-#MBannerSubtitleSingle{
-    font: $FONT_XSMALL;
-    color: $COLOR_INVERTED_FOREGROUND;
+#MBannerIconEvent{
+     margin-left:0.1mm;
 }
+/* Event banner at event screen */
 
-#MBannerIcon{
-    maximum-size: 4.8mm 4.8mm;
-    minimum-size: 4.8mm 4.8mm;
-    preferred-size: 4.8mm 4.8mm;
-    margin-right: $MARGIN_XLARGE;
+MBannerStyle #EventScreen {
+    minimum-size: 40mm 13.5mm;
+    maximum-size: 40mm 13.5mm;
+    preferred-size: 40mm 13.5mm;
+    icon-size: 5mm 5mm;
+    background-image: "meegotouch-notification-lockscreen-background" 10px 10px 10px 10px;
+}
+
+#HeadLine {
+    font: $FONT_XSMALL_BOLD;
+    margin-top: 3mm;
+    color:$COLOR_INVERTED_FOREGROUND;
+}
+#IconScreen {
+    maximum-size: 5mm 5mm;
+    minimum-size: 5mm 5mm;
+    preferred-size: 5mm 5mm;
+
+    margin-right: 2mm;
+    margin-top:3mm;
+    margin-left:3mm;
+    margin-bottom:5.5mm;
+}
+#Body {    
+   /*font: $FONT_DEFAULT_LIGHT; */
+   /* opacity: 0.5; */
+    color:$COLOR_INVERTED_FOREGROUND;
+  /*margin-bottom:5.5mm; */
+    margin-top:0.6mm;
+}
+
+#TimeStamp { 
+    font: $FONT_XSMALL_BOLD;
+    color:$COLOR_INVERTED_FOREGROUND;
+    margin-bottom:0.3mm;
+}
+
+/* Event banner at lock screen */
+
+MBannerStyle #LockScreen {
+    minimum-size: 40mm 13.5mm;
+    maximum-size: 40mm 13.5mm;
+    preferred-size: 40mm 13.5mm;
+    icon-size: 5mm 5mm;
+    background-image: "meegotouch-notification-lockscreen-background" 10px 10px 10px 10px;
+}
+
+#HeadLine {
+    font: $FONT_XSMALL_BOLD;
+    margin-top: 3mm;
+    color:$COLOR_INVERTED_FOREGROUND;
+}
+#IconScreen {
+    maximum-size: 5mm 5mm;
+    minimum-size: 5mm 5mm;
+    preferred-size: 5mm 5mm;
+
+    margin-right: 2mm;
+    margin-top:3mm;
+    margin-left:3mm;
+    margin-bottom:5.5mm;
+}
+#Body {    
+   /*font: $FONT_DEFAULT_LIGHT; */
+   /* opacity: 0.5; */
+    color:$COLOR_INVERTED_FOREGROUND;
+  /*margin-bottom:5.5mm; */
+    margin-top:0.6mm;
+}
+
+#TimeStamp { 
+    font: $FONT_XSMALL_BOLD;
+    color:$COLOR_INVERTED_FOREGROUND;
+    margin-bottom:0.3mm;
+}
+
+MBannerStyle #SystemBanner {
+    /*System banners hasn't icon*/
+    icon-size: 0 0;
+    margin-right: $MARGIN_LARGE;
+    margin-top:$MARGIN_LARGE;
+    margin-left:$MARGIN_LARGE;
+    margin-bottom:$MARGIN_LARGE;
+    background-image: "meegotouch-notification-system-background" 10px 10px 10px 10px;
 }
 
-/* Use styleName to setup one of this MBanner: EventBanner, InformationBanner, SystemBanner */
+MBannerStyle #SystemBanner:pressed {
+    background-image: "meegotouch-notification-system-background-pressed" 10px 10px 10px 10px;
+}
 
-MBannerStyle#EventBanner {
-    background-image: "meegotouch-notification-event-background" 10px 10px 10px 10px;
+MBannerStyle #SystemBanner.Landscape {
+    maximum-size: 83.8mm 8mm;
+    minimum-size: 46.6mm 6.4mm;
+    preferred-size: 83.8mm -1;
 }
 
-MBannerStyle#EventBanner:pressed {
-    background-image: "meegotouch-notification-event-background-pressed" 10px 10px 10px 10px;
+MBannerStyle #SystemBanner.Portrait {
+    maximum-size: 46.4mm 10.6mm;
+    minimum-size: 46.4mm 6.4mm;
+    preferred-size: 46.4mm -1;
+}
+
+#MBannerTitleSystem {
+    color:$COLOR_INVERTED_FOREGROUND;
+    font: $FONT_DEFAULT;
+    margin-left: $INDENT_DEFAULT;
+    margin-right: $INDENT_DEFAULT;
 }
+/* Information Banner */
 
-MBannerStyle#InformationBanner {
+MBannerStyle #InformationBanner {
+    icon-size: $SIZE_ICON_LARGE $SIZE_ICON_LARGE;
+    margin-right: 1mm;
+    margin-top:1mm;
+    margin-left:1mm;
+    margin-bottom:1mm;
     background-image: "meegotouch-notification-information-background" 10px 10px 10px 10px;
 }
 
-MBannerStyle#InformationBanner:pressed {
+MBannerStyle #Information:pressed {
     background-image: "meegotouch-notification-information-background-pressed" 10px 10px 10px 10px;
 }
 
-MBannerStyle#SystemBanner {
+MBannerStyle #InformationBanner.Landscape {
+    maximum-size: 83.4mm 8mm;
+    minimum-size: 46mm 8mm;
+    preferred-size: 83.4mm -1;
+}
+
+MBannerStyle #InformationBanner.Portrait {
+    maximum-size: 46.4mm 10.6mm;
+    minimum-size: 46.4mm 8mm;
+    preferred-size: 46.4mm -1;
+}
+
+#MBannerTitleInformation{
+    color:$COLOR_INVERTED_FOREGROUND;
+    font: $FONT_DEFAULT;
+    margin-left: $INDENT_DEFAULT;
+    margin-right: $INDENT_DEFAULT;
+}
+
+#MBannerIconInformation{
+    margin-right: 0;
+    margin-left: $INDENT_DEFAULT;
+    margin-top: $INDENT_DEFAULT;
+    margin-bottom: $INDENT_DEFAULT;
+}
+
+/*Generic MBanner it can contain anything*/
+
+MBannerStyle #GenericBanner {
+    icon-size: $SIZE_ICON_LARGE $SIZE_ICON_LARGE;
+    margin-right: $MARGIN_LARGE;
+    margin-top:$MARGIN_LARGE;
+    margin-left:$MARGIN_LARGE;
+    margin-bottom:$MARGIN_LARGE;
     background-image: "meegotouch-notification-system-background" 10px 10px 10px 10px;
 }
 
-MBannerStyle#SystemBanner:pressed {
+MBannerStyle #GenericBanner:pressed {
     background-image: "meegotouch-notification-system-background-pressed" 10px 10px 10px 10px;
 }
+
+MBannerStyle #GenericBanner.Landscape {
+    maximum-size: 83.4mm 10.6mm;
+    minimum-size: 46.6mm 6.4mm;
+    preferred-size: 83.4mm -1;
+}
+
+MBannerStyle #GenericBanner.Portrait {
+    maximum-size: 46.4mm 10.6mm;
+    minimum-size: 46.4mm 6.4mm;
+    preferred-size: 46.4mm -1;
+}
+
+#MBannerTitleGeneric {
+    color:$COLOR_INVERTED_FOREGROUND;
+    font: $FONT_DEFAULT;
+    margin-left: $INDENT_DEFAULT;
+}
+
+#MBannerSubTitleGeneric {
+    color:$COLOR_INVERTED_FOREGROUND;
+    font: $FONT_SMALL;
+    margin-left: $INDENT_DEFAULT;
+    margin-right: $INDENT_DEFAULT;
+}
+
+#MBannerIconGeneric {
+    margin-right: 0;
+    margin-left: $INDENT_DEFAULT;
+    margin-top: $INDENT_DEFAULT;
+    margin-bottom: $INDENT_DEFAULT;
+}
+
+#MBannerTimeStampGeneric{
+    color:$COLOR_INVERTED_FOREGROUND;
+    font: $FONT_SMALL;
+} 
--- base/meegotouch/libmeegotouchviews/style/mdialogstyle.css
+++ base/meegotouch/libmeegotouchviews/style/mdialogstyle.css
@@ -119,12 +119,6 @@
     maximum-size: -1 5.2mm;
 }
 
-#MDialogProgressIndicator {                                                    
-    margin-left: $MARGIN_DOUBLE;
-    margin-right: $MARGIN_XLARGE;
-    margin-top: $MARGIN_LARGE;
-}
-
 #MDialogButtonBox {
     background-image: meegotouch-dialog-button-area-background 10px 10px 10px 10px;
     margin-left: 0;
@@ -139,76 +133,13 @@
     minimum-size: -1 $SIZE_BUTTON;
 }
 
+#MDialogProgressIndicator {
+    maximum-size: 3.2mm 3.2mm;
+    minimum-size: 3.2mm 3.2mm;
+    preferred-size: 3.2mm 3.2mm; 
 
-/* Dialog buttons */
-MButtonStyle[first].Landscape {
-    margin-right: 0;
-    background-image: "meegotouch-button-dialog-background-horizontal-left" 12px 12px 12px 12px;
-}
-MButtonStyle[first].Landscape:pressed {
-    background-image: "meegotouch-button-dialog-background-pressed-horizontal-left" 12px 12px 12px 12px;
-}
-
-MButtonStyle[middle].Landscape {
-   margin-left: 0;
-   margin-right: 0;
-   background-image: "meegotouch-button-dialog-background-horizontal-center" 12px 12px 12px 12px;
-}
-MButtonStyle[middle].Landscape:pressed {
-   background-image: "meegotouch-button-dialog-background-pressed-horizontal-center" 12px 12px 12px 12px;
-}
-
-MButtonStyle[last].Landscape {
-   margin-left: 0;
-   background-image: "meegotouch-button-dialog-background-horizontal-right" 12px 12px 12px 12px;
-}
-MButtonStyle[last].Landscape:pressed {
-   background-image: "meegotouch-button-dialog-background-pressed-horizontal-right" 12px 12px 12px 12px;
-}
-
-MButtonStyle[single].Landscape {
-   preferred-size: -1 $SIZE_BUTTON;
-   minimum-size: -1 $SIZE_BUTTON;
-   maximum-size: -1 $SIZE_BUTTON;
-   background-image: "meegotouch-button-dialog-background" 12px 12px 12px 12px;
-}
-MButtonStyle[single].Landscape:pressed {
-   background-image: "meegotouch-button-dialog-background-pressed" 12px 12px 12px 12px;
-}
-
-MButtonStyle[first].Portrait {
-   margin-bottom: 0;
-   background-image: "meegotouch-button-dialog-background-vertical-top" 12px 12px 12px 12px;
-}
-MButtonStyle[first].Portrait:pressed {
-   background-image: "meegotouch-button-dialog-background-pressed-vertical-top" 12px 12px 12px 12px;
-}
-
-MButtonStyle[middle].Portrait {
-   margin-top: 0;
-   margin-bottom: 0;
-   background-image: "meegotouch-button-dialog-background-vertical-center" 12px 12px 12px 12px;
-}
-MButtonStyle[middle].Portrait:pressed {
-   background-image: "meegotouch-button-dialog-background-pressed-vertical-center" 12px 12px 12px 12px;
-}
-
-MButtonStyle[last].Portrait {
-   margin-top: 0;
-   background-image: "meegotouch-button-dialog-background-vertical-bottom" 12px 12px 12px 12px;
-}
-MButtonStyle[last].Portrait:pressed {
-   background-image: "meegotouch-button-dialog-background-pressed-vertical-bottom" 12px 12px 12px 12px;
-}
-
-MButtonStyle[single].Portrait {
-   preferred-size: -1 $SIZE_BUTTON;
-   minimum-size: -1 $SIZE_BUTTON;
-   maximum-size: -1 $SIZE_BUTTON;
-   background-image: "meegotouch-button-dialog-background" 12px 12px 12px 12px;
-}
-MButtonStyle[single].Portrait:pressed {
-   background-image: "meegotouch-button-dialog-background-pressed" 12px 12px 12px 12px;
+    margin-top: $MARGIN_LARGE;
+    bg-pixmap: "meegotouch-progressindicator-spinner-background" 32px 32px;
+    progress-pixmap: "meegotouch-progressindicator-spinner-progress" 32px 32px;
 }
 
-
--- base/meegotouch/libmeegotouchviews/style/mgraphicshighlighteffectstyle.css
+++ base/meegotouch/libmeegotouchviews/style/mgraphicshighlighteffectstyle.css
@@ -3,6 +3,6 @@
 
     start-strength: 0.2;
     end-strength: 0.9;
-    duration: 500;
-    delay: 100;
+    duration: 250;
+    delay: 0;
 }
--- base/meegotouch/libmeegotouchviews/style/mlistitemstyle.css
+++ base/meegotouch/libmeegotouchviews/style/mlistitemstyle.css
@@ -31,3 +31,5 @@
     background-color: $COLOR_INVERTED_FOREGROUND;
     background-opacity: 1.0;
 }
+
+
--- base/meegotouch/libmeegotouchviews/style/mpositionindicatorstyle.css
+++ base/meegotouch/libmeegotouchviews/style/mpositionindicatorstyle.css
@@ -1,7 +1,7 @@
 /* MPositionIndicatorStyle : MWidgetStyle */
 MPositionIndicatorStyle {
-    indicator-image: "meegotouch-positionindicator-indicator" 4px 4px 4px 4px;
-    background-image: "meegotouch-positionindicator-background" 5px 5px 5px 5px;
+    indicator-image: "meegotouch-positionindicator-indicator" 2px 2px 2px 2px;
+    background-image: "meegotouch-positionindicator-background" 2px 2px 2px 2px;
     min-indicator-size: 2mm;
     hide-timeout: 1000;
 
--- base/meegotouch/libmeegotouchviews/style/mspinnerstyle.css
+++ base/meegotouch/libmeegotouchviews/style/mspinnerstyle.css
@@ -47,19 +47,4 @@
     maximum-size: $SIZE_SPINNER_SMALL $SIZE_SPINNER_SMALL;
 }
 
-/* MDialog MSpinnerStyle doesnt work */
-#MDialogProgressIndicator {
-    bg-pixmap: "meegotouch-progressindicator-spinner-background" $SIZE_SPINNER_DIALOG $SIZE_SPINNER_DIALOG;
-    progress-pixmap: "meegotouch-progressindicator-spinner-progress" $SIZE_SPINNER_DIALOG $SIZE_SPINNER_DIALOG;
-
-    minimum-size: $SIZE_SPINNER_DIALOG $SIZE_SPINNER_DIALOG;
-    preferred-size: $SIZE_SPINNER_DIALOG $SIZE_SPINNER_DIALOG;
-    maximum-size: $SIZE_SPINNER_DIALOG $SIZE_SPINNER_DIALOG;
-    
-    margin-left: $MARGIN_MEDIUM;
-    margin-top: $MARGIN_MEDIUM;
-    margin-right: $MARGIN_MEDIUM;
-    margin-bottom: $MARGIN_MEDIUM;
-}
-
 
--- base/meegotouch/libmeegotouchviews/style/mtimestyle.css
+++ base/meegotouch/libmeegotouchviews/style/mtimestyle.css
@@ -1,6 +1,6 @@
 /* MTimeStyle : MWidgetStyle */
 MTimeStyle {
-    font: "Nokia Sans" 48;
+    font: $FONT_FAMILY 48;
     text-color: #FFA000;
     time-format: "HH:mmA";
 
--- base/meegotouch/libmeegotouchviews/style/mtoolbarstyle.css
+++ base/meegotouch/libmeegotouchviews/style/mtoolbarstyle.css
@@ -15,6 +15,7 @@
     has-icons:  true;
     has-labels: false;
     has-spaces: false;
+    label-only-as-common-button: true;
 }
 
 MToolbarStyle.Landscape {
@@ -69,3 +70,15 @@
 MButtonIconStyle[toolbar].Portrait {
     maximum-size: 100% $HEIGHT_NAVIGATIONBAR;
 }
+
+MButtonStyle#ToolBarLabelOnlyCommonButton {
+    margin-left:   $MARGIN_SMALL;
+    margin-top:    $MARGIN_DOUBLE;
+    margin-right:  $MARGIN_SMALL;
+    margin-bottom: $MARGIN_DOUBLE;
+
+    minimum-size:    4.2mm 5.0mm;
+    preferred-size: 18.0mm 5.0mm;
+    maximum-size:   18.0mm 5.0mm;
+}
+
--- base/meegotouch/libmeegotouchviews/style/mtoolbartabstyle.css
+++ base/meegotouch/libmeegotouchviews/style/mtoolbartabstyle.css
@@ -10,6 +10,7 @@
     has-icons: true;
     has-labels: false;
     has-spaces: false;
+    label-only-as-common-button: false;
 }
 
 MButtonStyle[toolbartab] {
@@ -30,8 +31,8 @@
     text-margin-bottom: 0;
 
     minimum-size: -1 $HEIGHT_NAVIGATIONBAR;
-    preferred-size: -1 $HEIGHT_NAVIGATIONBAR;
-    maximum-size: -1 $HEIGHT_NAVIGATIONBAR;
+    preferred-size: 39.0mm $HEIGHT_NAVIGATIONBAR;
+    maximum-size: 39.0mm $HEIGHT_NAVIGATIONBAR;
 
     reactive-margin-top: $MARGIN_MEDIUM;
     reactive-margin-bottom: $MARGIN_MEDIUM;
@@ -47,6 +48,11 @@
     padding-bottom: $PADDING_MEDIUM;  
 }
 
+MButtonStyle[toolbartab].Portrait {
+    preferred-size: 100% $HEIGHT_NAVIGATIONBAR;
+    maximum-size: 100% $HEIGHT_NAVIGATIONBAR;
+}
+
 MButtonStyle[toolbartab]:pressed {
     background-image: meegotouch-button-navigationbar-tab-background-pressed $CORNER_MARGINS;
     background-color: $COLOR_SELECT;
--- base/meegotouch/locale/zh_CN/constants.ini
+++ base/meegotouch/locale/zh_CN/constants.ini
@@ -1,6 +1,6 @@
 [Fonts]
-FONT_XLARGE     = "Nokia Sans" 4.0mm;40px
-FONT_LARGE      = "Nokia Sans" 3.5mm;35px
-FONT_DEFAULT    = "Nokia Sans" 3.0mm;30px
-FONT_SMALL      = "Nokia Sans" 2.5mm;25px
-FONT_XSMALL     = "Nokia Sans" 2.0mm;20px
+FONT_XLARGE     = $FONT_FAMILY 4.0mm;40px
+FONT_LARGE      = $FONT_FAMILY 3.5mm;35px
+FONT_DEFAULT    = $FONT_FAMILY 3.0mm;30px
+FONT_SMALL      = $FONT_FAMILY 2.5mm;25px
+FONT_XSMALL     = $FONT_FAMILY 2.0mm;20px
--- debian/changelog
+++ debian/changelog
@@ -1,3 +1,44 @@
+meegotouchtheme (0.20.52-1) unstable; urgency=low
+
+  * New version
+  * Fixes: NB#200900 - "Delete all Conversations" Query is not displaying
+  * Changes: decreasing delay & duration at mgraphicshighlighteffectstyle.css
+  * Fixes: NB#197516 - R&D theme depends on nokia fonts.
+  * Fixes: NB#201889 - Positionindicator triggers warnings from MScalableImage at startup
+  * Changes: Settings for label only tool bar buttons
+  * Changes: Added CommonSmallIconButton styles
+  * Changes: Some missing sizes to commoncheckboxes added
+  * Changes: Updated common  checkboxes and radiobutton sizes
+  * Changes: Updates common styles for checkbox and radiobutton
+  * Changes: Updated #CommonCheckBox margins in commonuicontrolstyle.css
+  * Fixes: NB#200779 - Portrait mode: collection and Recommendations buttons are not equally sized
+  * Fixes: MB#201467 - Typo in commonbuttonstyle
+  * Fixes: MB#195933 - Missing icons for duicontrolpanel
+  * Changes: Updated commonuicontrolstyle.css
+  * Changes: Updated commoniconstyle.css Toolkit 1.5.5
+  * Changes: Updated commonlayoutstyle.css Toolkit 1.5.5
+  * Changes: Updated commonpanelstyle.css Toolkit 1.5.5
+  * Changes: Updated commonlabelstyle.css Toolki 1.5.5
+  * Changes: Updated commonbuttonstyle.css Toolkit 1.5.5
+  * Changes: Fix typo with -pressed and -selected states
+  * Changes: new style for mpreedit
+
+ -- Adrian Yanes <ext-adrian.yanes at nokia.com>  Thu, 04 Nov 2010 13:06:30 +0200
+
+meegotouchtheme (0.20.51-1) unstable; urgency=low
+
+  * New version
+  * Changes: Updated commonuicontrolstyle.css
+  * Changes: Updated commonbuttonstyle.css
+  * Changes: Updated commonpanelstyle.css
+  * Changes: Updated commonlayoutstyle.css
+  * Changes: Updated commoniconstyle.css
+  * Changes: Adding new buttonstyles from toolki 1.5.4 to commonbuttonstyles.css
+  * Changes: adapting dialogs to the new layouts
+  * Mbanner: new layouts
+
+ -- Adrian Yanes <ext-adrian.yanes at nokia.com>  Thu, 28 Oct 2010 12:30:56 +0300
+
 meegotouchtheme (0.20.50-1) unstable; urgency=low
 
   * New version
--- debian/control
+++ debian/control
@@ -7,7 +7,6 @@
 
 Package: meegotouchtheme
 Architecture: all
-Depends: ui-fonts
 Conflicts: fmbe-pulse-data
 Replaces: fmbe-pulse-data, duitheme
 Description: Themes required by any MeeGo Touch library based application.

++++++ meegotouch-theme.yaml
--- meegotouch-theme.yaml
+++ meegotouch-theme.yaml
@@ -1,6 +1,6 @@
 Name: meegotouch-theme
 Summary: Theme for Meego Touch based applications
-Version: 0.20.50
+Version: 0.20.52
 Release: 1
 Group: System/Desktop
 License: LGPLv2.1




More information about the MeeGo-commits mailing list