diff -r 474929a40a0f -r 87476091b3f5 screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml
--- a/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml	Wed Jul 14 15:53:30 2010 +0300
+++ b/screensaver/screensaverplugins/snsrbigclockscreensaverplugin/resource/snsrbigclockscreensaveroleddigital.docml	Fri Jul 23 13:47:57 2010 +0300
@@ -2,18 +2,21 @@
 <hbdocument version="0.9">
     <widget name="view" type="HbView">
         <widget name="mainContainer" role="HbView:widget" type="HbWidget">
-        <sizehint height="var(hb-param-screen-height)" type="PREFERRED" width="var(hb-param-screen-width)"/>
+            <sizehint height="var(hb-param-screen-height)" type="PREFERRED" width="var(hb-param-screen-width)"/>
+            <contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="var(hb-param-margin-gene-top)"/>
             <widget name="clockContainer" type="HbWidget">
+                <sizehint height="expr(var(hb-param-text-height-primary)+(0.5un)+(14.7un)+var(hb-param-margin-gene-top)+(2.5un)+var(hb-param-margin-gene-bottom)+var(hb-param-text-height-tiny) + var(hb-param-margin-gene-bottom) + var(hb-param-margin-gene-top) )" type="PREFERRED" width="45un"/>
+                <real name="z" value="1"/>
                 <widget name="amPmLabel" type="SnsrLabel">
-                    <sizehint type="MINIMUM" width="0"/>
+                    <sizehint type="MINIMUM" width="1.0un"/>
                     <sizehint height="var(hb-param-text-height-primary)" type="PREFERRED"/>
                     <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                     <real name="z" value="1"/>
                     <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
                     <string name="alignment" value="AlignVCenter|AlignLeft"/>
                 </widget>
-                <widget name="timeLabel" type="SnsrLabel">
-                    <sizehint type="MINIMUM" width="0un"/>
+                <widget name="oledTimeLabel" type="SnsrOledTimeLabel">
+                    <sizehint type="MINIMUM" width="1.0un"/>
                     <sizehint height="14.7un" type="PREFERRED"/>
                     <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                     <real name="z" value="2"/>
@@ -21,40 +24,47 @@
                     <string name="alignment" value="AlignVCenter|AlignHCenter"/>
                 </widget>
                 <widget name="indicatorWidget" type="SnsrIndicatorWidget">
-                    <sizehint type="MINIMUM" width="0"/>
+                    <sizehint type="MINIMUM" width="2.5un"/>
                     <sizehint height="2.5un" type="PREFERRED"/>
                     <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                     <real name="z" value="3"/>
                 </widget>
                 <widget name="dateLabel" type="SnsrLabel">
-                    <sizehint type="MINIMUM" width="0"/>
+                    <sizehint type="MINIMUM" width="1.0un"/>
                     <sizehint height="var(hb-param-text-height-tiny)" type="PREFERRED"/>
                     <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
                     <real name="z" value="4"/>
                     <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     <string name="alignment" value="AlignVCenter|AlignHCenter"/>
                 </widget>
-                <sizehint height="expr(var(hb-param-text-height-primary)+(1.0un)+(14.7un)+var(hb-param-margin-gene-top)+(2.5un)+var(hb-param-margin-gene-bottom)+var(hb-param-text-height-tiny))" type="PREFERRED" width="45un"/>
-                <real name="z" value="1"/>
                 <layout type="anchor">
                     <anchoritem dst="amPmLabel" dstEdge="TOP" spacing="0" src="" srcEdge="TOP"/>
-                    <anchoritem dst="amPmLabel" dstEdge="LEFT" spacing="0" src="timeLabel" srcEdge="LEFT"/>
-                    <anchoritem dst="timeLabel" dstEdge="TOP" spacing="1.0un" src="amPmLabel" srcEdge="BOTTOM"/>
-                    <anchoritem dst="timeLabel" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>
-                    <anchoritem dst="indicatorWidget" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="timeLabel" srcEdge="BOTTOM"/>
-                    <anchoritem dst="indicatorWidget" dstEdge="CENTERH" spacing="0" src="timeLabel" srcEdge="CENTERH"/>
+                    <anchoritem dst="amPmLabel" dstEdge="LEFT" spacing="0" src="oledTimeLabel" srcEdge="LEFT"/>
+                    <anchoritem dst="oledTimeLabel" dstEdge="TOP" spacing="0.5un" src="amPmLabel" srcEdge="BOTTOM"/>
+                    <anchoritem dst="oledTimeLabel" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>      
+                    <anchoritem dst="indicatorWidget" dstEdge="TOP" spacing="var(hb-param-margin-gene-top)" src="oledTimeLabel" srcEdge="BOTTOM"/>
+                    <anchoritem dst="indicatorWidget" dstEdge="CENTERH" spacing="0" src="oledTimeLabel" srcEdge="CENTERH"/>
                     <anchoritem dst="dateLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-bottom)" src="indicatorWidget" srcEdge="BOTTOM"/>
-                    <anchoritem dst="dateLabel" dstEdge="CENTERH" spacing="0" src="timeLabel" srcEdge="CENTERH"/>
+                    <anchoritem dst="dateLabel" dstEdge="CENTERH" spacing="0" src="oledTimeLabel" srcEdge="CENTERH"/>
                 </layout>
             </widget>
             <layout type="anchor">
-                <anchoritem dst="clockContainer" dstEdge="TOP" spacing="1un" src="" srcEdge="TOP"/>
+                <anchoritem dst="clockContainer" dstEdge="TOP" spacing="expr((26.4un)-var(hb-param-text-height-primary)-(0.5un))" src="" srcEdge="TOP"/>
                 <anchoritem dst="clockContainer" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
             </layout>
         </widget>
-        <string name="title" value=""/>
+        <string name="title" value="View"/>
     </widget>
-    <section name="landscape"/>
+    <section name="landscape">
+        <widget name="mainContainer" role="HbView:widget" type="HbWidget">
+            <sizehint height="var(hb-param-screen-height)" type="PREFERRED" width="var(hb-param-screen-width)"/>
+            <contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="var(hb-param-margin-gene-top)"/>
+            <layout type="anchor">
+                <anchoritem dst="clockContainer" dstEdge="CENTERH" spacing="0" src="" srcEdge="CENTERH"/>
+                <anchoritem dst="clockContainer" dstEdge="TOP" spacing="expr((17.3un)-var(hb-param-text-height-primary)-(0.5un))" src="" srcEdge="TOP"/>
+            </layout>
+        </widget>
+    </section>
     <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
         <uistate name="landscape" sections="#common landscape"/>