--- hildon-theme-layout-4-synth-0.14.8.orig/data/layout.txt
+++ hildon-theme-layout-4-synth-0.14.8/data/layout.txt
@@ -2,7 +2,7 @@
 # images out of the big template.
 
 [Main]
-TemplateWidth=8000
+TemplateWidth=8800
 TemplateHeight=800
 ThemeThumbnail=qgn_plat_theme_thumbnail.png
 
@@ -125,7 +125,7 @@
 qgn_plat_application_media_player_image_webradio.png=4321,163,230,230
 qgn_plat_application_menu_1st_level_frame.png=2299,45,42,42,alpha
 qgn_plat_application_menu_lower_level_frame.png=2347,45,42,42,alpha
-qgn_plat_application_status_bar_background.png=3271,163,720,60
+qgn_plat_application_status_bar_background.png=3271,163,720,45
 qgn_plat_arrow_down_disabled.png=2174,282,26,26
 qgn_plat_arrow_down_normal.png=2174,110,26,26
 qgn_plat_arrow_down_pressed.png=2174,196,26,26
@@ -160,14 +160,14 @@
 qgn_plat_breadcrumb_middle_pressed.png=1826,359,10,58
 qgn_plat_breadcrumb_separator_normal.png=1962,363,16,34
 qgn_plat_breadcrumb_separator_pressed.png=1962,403,16,34
-qgn_plat_button_close_normal.png=3951,83,40,50
-qgn_plat_button_close_pressed.png=3861,83,40,50
+qgn_plat_button_close_normal.png=3951,83,40,45
+qgn_plat_button_close_pressed.png=3861,83,40,45
 qgn_plat_button_contact_normal.png=5219,517,50,72
 qgn_plat_button_contact_focused.png=5279,517,50,72
 qgn_plat_button_contact_pressed.png=5339,517,50,72
 qgn_plat_button_contact_disabled.png=5399,517,50,72
-qgn_plat_button_minimize_normal.png=3911,83,40,50
-qgn_plat_button_minimize_pressed.png=3821,83,40,50
+qgn_plat_button_minimize_normal.png=3911,83,40,45
+qgn_plat_button_minimize_pressed.png=3821,83,40,45
 
 # new fixed-size buttons
 qgn_plat_button_mplayer1_normal.png=5219,192,88,75
@@ -211,12 +211,18 @@
 qgn_plat_check_box_empty_disabled.png=95,185,26,26
 qgn_plat_check_box_empty_focused.png=95,125,26,26
 qgn_plat_check_box_empty_normal.png=95,65,26,26
+qgn_plat_check_box_empty_disabled_moz.png=8287,405,26,26
+qgn_plat_check_box_empty_normal_moz.png=8287,370,26,26
 qgn_plat_check_box_indeterminate_disabled.png=145,185,26,26
 qgn_plat_check_box_indeterminate_focused.png=145,125,26,26
 qgn_plat_check_box_indeterminate_normal.png=145,65,26,26
+qgn_plat_check_box_indeterminate_disabled_moz.png=8333,405,26,26
+qgn_plat_check_box_indeterminate_normal_moz.png=8333,370,26,26
 qgn_plat_check_box_selected_disabled.png=47,185,26,26
 qgn_plat_check_box_selected_focused.png=47,125,26,26
 qgn_plat_check_box_selected_normal.png=47,65,26,26
+qgn_plat_check_box_selected_disabled_moz.png=8241,405,26,26
+qgn_plat_check_box_selected_normal_moz.png=8241,370,26,26
 qgn_plat_clock_analog_am.png=6128,474,100,90
 qgn_plat_clock_analog_plain.png=6128,344,100,90
 qgn_plat_clock_analog_pm.png=6128,604,100,90
@@ -319,6 +325,10 @@
 qgn_plat_home_search_bg_alpha.png=3296,521,106,50,alpha
 qgn_plat_home_search_bg.png=3296,521,106,50,noalpha
 qgn_plat_home_status_bar_background.png=5250,83,720,60
+qgn_plat_home_status_bar_background_PADD.png=5250,83,720,60
+qgn_plat_home_status_bar_background_770.png=8077,27,720,60
+qgn_plat_home_status_bar_background_rx34.png=8077,106,720,60
+qgn_plat_home_status_bar_background_rx44.png=8077,185,720,60
 qgn_plat_infoprint_frame_corner_bottom_left.png=2946,461,20,20
 qgn_plat_infoprint_frame_corner_bottom_right.png=3029,461,20,20
 qgn_plat_infoprint_frame_corner_top_left.png=2946,385,20,20
@@ -536,10 +546,12 @@
 qgn_plat_separator_vertical_paned_thumb.png=183,645,10,30
 qgn_plat_single_line_input.png=1078,679,6,6
 qgn_plat_single_line_input_disabled.png=1078,699,6,6
+qgn_plat_single_line_input_moz.png=8077,347,6,6
+qgn_plat_single_line_input_disabled_moz.png=8077,357,6,6
 qgn_plat_speedcontact_applet_bg_alpha.png=3354,441,74,74,alpha
 qgn_plat_speedcontact_applet_bg.png=3354,441,74,74,noalpha
-qgn_plat_status_bar_background.png=3528,83,280,50
-qgn_plat_status_bar_pressed.png=4679,79,40,50
+qgn_plat_status_bar_background.png=3528,83,280,45
+qgn_plat_status_bar_pressed.png=4679,79,40,45
 qgn_plat_status_bar_second_level_background.png=4311,71,280,50
 qgn_plat_task_navigation_background.png=3191,163,80,480
 qgn_plat_task_navigation_button_01_pressed.png=4181,163,80,80
@@ -645,6 +657,10 @@
 qgn_plat_view_button_pressed.png=2186,378,30,30
 qgn_plat_view_button_pressed_focused.png=2266,378,30,30
 
+qgn_plat_view_button_moz.png=8077,448,30,30
+qgn_plat_view_button_disabled_moz.png=8157,448,30,30
+qgn_plat_view_button_pressed_moz.png=8117,448,30,30
+
 qgn_plat_view_button_nesw.png=2106,418,30,30
 qgn_plat_view_button_nesw_disabled.png=2226,418,30,30
 qgn_plat_view_button_nesw_focused.png=2146,418,30,30
--- hildon-theme-layout-4-synth-0.14.8.orig/data/theme.xml
+++ hildon-theme-layout-4-synth-0.14.8/data/theme.xml
@@ -8,14 +8,15 @@
 
 <color id="lowlightcol" def="#000000" />
 
-<!-- frame animations, src and dst rectangle coordinate values -->
+<!-- frame animations, src and dst rectangle coordinate values 
 <frame-animation id="close" src="400 0 400 480" dst="774 30 1 1"/>
 <frame-animation id="minimize" src="80 0 720 480" dst="0 420 80 60"/>
 <frame-animation id="maximize" src="40 450 0 0" dst="80 0 720 480" />
+-->
 
 <!-- Fonts, alternate fonts can be listed seperated by a '|'   
             The first matched will be used.                   -->
-<font id="osso-TitleFont" def="Nokia Sans-17.85" />
+<font id="osso-TitleFont" def="Nokia Sans-12.85" />
 
 <color id="osso-TitleTextColor" def="@TitleTextColor@" />
 <color id="osso-DialogTitleTextColor" def="@DialogTitleTextColor@" />
@@ -70,9 +71,9 @@
 
 
 <!-- Main windows title bar. You need to define its height -->
-<frame id="main" height="60">
+<frame id="main" height="45">
 
-  <layer x="0" y="0" w="720" h="60"
+  <layer x="0" y="0" w="720" h="45"
    type="pixmap" pixmap="applicationtopbararea"/>
 
   <layer x="35" y="9" w="283" h="30" 
@@ -80,20 +81,20 @@
 
   <!-- Define the area that launches application menu -->
 
-  <button x="3" y="0" w="315" h="60" action="custom" options="inputonly,pressonly" />
+  <button x="3" y="0" w="315" h="45" action="custom" options="inputonly,pressonly" />
 
   <!-- Define the status bar applet panel -->
 
-  <panel x="-372" y="0" w="280" h="50" />
+  <panel x="-372" y="0" w="280" h="45" />
 
   <!-- Define minimize and close buttons -->
   
-  <button x="-80" y="0" w="40" h="50" action="minimize" >
+  <button x="-80" y="0" w="40" h="45" action="minimize" >
     <active pixmap="titlebarminimizebuttonpressed"/>
     <inactive pixmap="titlebarminimizebutton"/>
   </button>
  
-  <button x="-40" y="0" w="40" h="50" action="close" >
+  <button x="-40" y="0" w="40" h="45" action="close" >
     <active pixmap="titlebarclosebuttonpressed" />
     <inactive pixmap="titlebarclosebutton"/>
   </button>
--- hildon-theme-layout-4-synth-0.14.8.orig/configure.ac
+++ hildon-theme-layout-4-synth-0.14.8/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-theme-layout-4, 0.14.8)
+AM_INIT_AUTOMAKE(hildon-theme-layout-4-synth, 0.14.8)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_INSTALL
@@ -9,7 +9,7 @@
 
 AC_OUTPUT([Makefile                             \
            rc/Makefile                          \
-           pkgconfig/hildon-theme-layout-4.pc   \
+           pkgconfig/hildon-theme-layout-4-synth.pc   \
            pkgconfig/Makefile                   \
            data/Makefile                        \
            data/bundle.ini])
--- hildon-theme-layout-4-synth-0.14.8.orig/pkgconfig/Makefile.am
+++ hildon-theme-layout-4-synth-0.14.8/pkgconfig/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES			= Makefile.in
 
 pkgconfigdir				= $(libdir)/pkgconfig
-pkgconfig_DATA				= hildon-theme-layout-4.pc
+pkgconfig_DATA				= hildon-theme-layout-4-synth.pc
 
-EXTRA_DIST				= hildon-theme-layout-4.pc.in
+EXTRA_DIST				= hildon-theme-layout-4-synth.pc.in
--- hildon-theme-layout-4-synth-0.14.8.orig/pkgconfig/hildon-theme-layout-4-synth.pc.in
+++ hildon-theme-layout-4-synth-0.14.8/pkgconfig/hildon-theme-layout-4-synth.pc.in
@@ -0,0 +1,8 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+pkgdatadir=@datadir@/@PACKAGE@/
+
+Name: @PACKAGE@
+Description: Hildon theme layout version 4
+Version: @VERSION@
--- hildon-theme-layout-4-synth-0.14.8.orig/debian/changelog
+++ hildon-theme-layout-4-synth-0.14.8/debian/changelog
@@ -1,3 +1,19 @@
+hildon-theme-layout-4-synth (0.14.8-1synth2) unstable; urgency=low
+
+  * Suitable theme layout for building hildon-theme-lcars-{padd,bridge,etc}
+  * resized fonts from 16pt to 12pt (themespecificgtk.rc, theme.xml)
+  * set cursor-color to DefaultTextColor (base.rc)
+  * added and changed many colors to PaintedDefaultTextColor (rc/...)
+  * increased template width to 8800 pixels (layout.txt)
+  * added qgn_plat_home_status_bar_background{770,rx34,rx44}.png (layout.txt)
+  * resized matchbox height from 60 to 45 pixels (theme.xml, layout.txt)
+  * enable toolbar animation (gtksettings.rc)
+  * disable window zooming animation (theme.xml)
+  * gtk-icon-theme-name = "@THEME_NAME@" -- requires new sed in theme Makefile
+  * added new controls for microb (gtkrc.rc, microb.rc, layout.txt)
+
+ -- Leif Ryge <leif@synthesize.us>  Fri, 04 Jan 2008 12:16:11 +0000
+
 hildon-theme-layout-4 (0.14.8-1) unstable; urgency=low
 
   * Bumping the release.
--- hildon-theme-layout-4-synth-0.14.8.orig/debian/control
+++ hildon-theme-layout-4-synth-0.14.8/debian/control
@@ -1,17 +1,12 @@
-Source: hildon-theme-layout-4
+Source: hildon-theme-layout-4-synth
 Section: x11
 Priority: optional
-Maintainer: Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com>
+Maintainer: Synthesize.us/LCARS <lcars@synthesize.us>
+Original-Maintainer: Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com>
 Build-Depends: debhelper (>= 4.0.0), pkg-config, hildon-theme-tools (>= 0.2.0)
 Standards-Version: 3.6.0
 
-Package: hildon-theme-layout-4
+Package: hildon-theme-layout-4-synth
 Architecture: all
 Depends: hildon-theme-tools (>= 0.2.0)
-Description: A layout file for making themes for the maemo 4 platform
- This package contains tools that can help you create a theme for
- the maemo platform version 4.
- .
- All you need to do is create a
- big template image and these tools will create a theme package
- from it.
+Description: A layout file for making LCARS themes for the maemo 4 platform
--- hildon-theme-layout-4-synth-0.14.8.orig/debian/rules
+++ hildon-theme-layout-4-synth-0.14.8/debian/rules
@@ -49,7 +49,7 @@
 	# Add here commands to clean up after the build process.
 	-$(MAKE) maintainer-clean
 
-	rm -rf debian/hildon-theme-layout-4
+	rm -rf debian/hildon-theme-layout-4-synth
 
 	dh_clean 
 
@@ -60,7 +60,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/apt-https.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/hildon-theme-layout-4
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/hildon-theme-layout-4-synth
 
 
 # Build architecture-independent files here.
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/gtknotebook.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/gtknotebook.rc
@@ -102,5 +102,5 @@
   }
 }
 class "GtkNotebook" style "osso-notebook"
-
 widget_class "*.GtkNotebook.GtkLabel" style "osso-ButtonFont"
+widget_class "*.GtkNotebook.GtkLabel" style "osso-button-text-color"
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/hildonappsmenu.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/hildonappsmenu.rc
@@ -271,11 +271,13 @@
 style "hildon-apps-menu-pane1-label" = "osso-color-themeing"
 {
   fg[NORMAL] = @PaneMenu1TextColor
+  fg[PRELIGHT] = @PaintedDefaultTextColor
 }
 
 style "hildon-apps-menu-pane2-label" = "osso-color-themeing"
 {
   fg[NORMAL] = @PaneMenu2TextColor
+  fg[PRELIGHT] = @PaintedDefaultTextColor
 }
 
 style "hildon-apps-menu-pane-button"
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/gtkmenu.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/gtkmenu.rc
@@ -148,8 +148,8 @@
 
     fg[NORMAL] = @PluginMenuTextColor
     fg[ACTIVE] = @PluginMenuTextColor
-    fg[PRELIGHT] = @PluginMenuTextColor
-    fg[SELECTED] = @PluginMenuTextColor
+    fg[PRELIGHT] = @PaintedDefaultTextColor
+    fg[SELECTED] = @PaintedDefaultTextColor
     bg[NORMAL] = @PluginMenuBgColor
 
    engine "sapwood" {
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/afterthemespecificgtk.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/afterthemespecificgtk.rc
@@ -2,35 +2,38 @@
 # Licensed under Creative Commons Attribution-ShareAlike 2.5 license
 
 class "GtkWidget" style "osso-logical-colors"
-
 style "osso-color-themeing" = "osso-logical-colors" {
   fg[NORMAL] = @DefaultTextColor
   bg[NORMAL] = @DefaultBackgrdColor
 
-  fg[PRELIGHT] = @DefaultTextColor
-  bg[PRELIGHT] = @DefaultBackgrdColor
+  fg[PRELIGHT] = @PaintedDefaultTextColor
+  bg[PRELIGHT] = @PaintedBackgrdColor
 
   fg[ACTIVE] = @DefaultTextColor
-  bg[ACTIVE] = @PaintedBackgrdColor
-                                                                                                                                    
-  fg[SELECTED] = @DefaultTextColor
+  bg[ACTIVE] = @DefaultBackgrdColor
+
+
+  fg[SELECTED] = @PaintedDefaultTextColor
   bg[SELECTED] = @PaintedBackgrdColor
-                                                                                                                                     
+
+
   fg[INSENSITIVE] = @DisabledTextColor
   bg[INSENSITIVE] = @DefaultBackgrdColor
-                                                                                                                                     
+
+
   text[NORMAL] = @DefaultTextColor
   base[NORMAL] = @DefaultBackgrdColor
-                                                                                                                                     
-  text[PRELIGHT] = @DefaultTextColor
-  base[PRELIGHT] = @DefaultBackgrdColor
-                                                                                                                                     
+ 
+  text[PRELIGHT] = @PaintedDefaultTextColor
+  base[PRELIGHT] = @PaintedBackgrdColor
+
   text[ACTIVE] = @PaintedDefaultTextColor
   base[ACTIVE] = @PaintedBackgrdColor
 
   text[SELECTED] = @PaintedDefaultTextColor
   base[SELECTED] = @PaintedBackgrdColor
-                                                                                                                                    
+
+
   text[INSENSITIVE] = @DisabledTextColor
   base[INSENSITIVE] = @DefaultBackgrdColor
 }
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/microb.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/microb.rc
@@ -0,0 +1,214 @@
+style "synth-moz-entry" {
+
+    GtkEntry::inner-border = { 6, 6, 0, 0 }
+
+        engine "sapwood" {
+                image {
+                        function = SHADOW
+                        state = NORMAL
+                }
+        }
+
+        engine "sapwood" {
+                image {
+                        function = FOCUS
+                }
+        }
+
+        engine "sapwood" {
+                image {
+                        function = FLAT_BOX
+                        shadow = NONE
+                        state = INSENSITIVE
+                        file = "../images/qgn_plat_single_line_input_disabled_moz.png"
+                        border = { 2, 2, 2, 2 }
+                }
+        }
+
+        engine "sapwood" {
+                image {
+                        function = FLAT_BOX
+                        shadow = NONE
+                        file = "../images/qgn_plat_single_line_input_moz.png"
+                        border = { 2, 2, 2, 2 }
+                }
+        }
+}
+widget "*.GtkMozLayout.*GtkEntry" style "synth-moz-entry" 
+
+style "synth-moz-button-text-color" = "osso-logical-colors" {
+
+    fg[NORMAL] = @ButtonTextColor
+    fg[PRELIGHT] = @ButtonTextColor
+    fg[ACTIVE] = @ButtonTextPressedColor
+    fg[SELECTED] = @ButtonTextPressedColor
+    fg[INSENSITIVE] = @ButtonTextDisabledColor
+    text[NORMAL] = @ButtonTextColor
+    text[PRELIGHT] = @ButtonTextColor
+    text[ACTIVE] = @ButtonTextPressedColor
+    text[SELECTED] = @ButtonTextPressedColor
+    text[INSENSITIVE] = @ButtonTextDisabledColor
+
+}
+
+style "synth-moz-button" {
+
+  GtkWidget::focus-line-pattern = "\0\0\0\0\0\0\0\0"
+  GtkWidget::focus-width = 0
+  GtkButton::default_border = { 0, 0, 0, 0 }
+  GtkButton::child-displacement-x = 0
+  GtkButton::child-displacement-y = 0
+  GtkButton::interior_focus = 0
+  GtkButton::child_spacing = 1
+  xthickness = 7
+  ythickness = 0
+
+  engine "sapwood" {
+
+    image {
+	function = BOX
+	shadow   = IN
+	file     = "../images/qgn_plat_view_button_pressed_moz.png"
+  	border   = { 14, 14, 14, 14 }
+    }
+    image {
+	function = BOX
+	state    = SELECTED
+	file     = "../images/qgn_plat_view_button_pressed_moz.png"
+  	border   = { 14, 14, 14, 14 }
+    }
+    image {
+	function = BOX
+	state    = INSENSITIVE
+	file     = "../images/qgn_plat_view_button_disabled_moz.png"
+  	border   = { 14, 14, 14, 14 }
+    }
+    image {
+	function = BOX
+	file     = "../images/qgn_plat_view_button_moz.png"
+  	border   = { 14, 14, 14, 14 }
+    }
+  }
+}
+widget "*.GtkMozLayout.*GtkButton" style "synth-moz-button" 
+widget_class "*.GtkMozLayout.*GtkButton.*GtkLabel" style "synth-moz-button-text-color"
+
+style "synth-moz-checkbutton"
+{
+  GtkCheckButton::indicator-size = 26
+  GtkCheckButton::indicator-spacing = 2
+  
+  ythickness = 0
+
+  engine "sapwood"
+  {
+    image
+    {
+      function        = CHECK
+      shadow          = OUT
+      state           = NORMAL
+      overlay_file    = "../images/qgn_plat_check_box_empty_normal_moz.png"
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      shadow          = IN
+      state           = NORMAL
+      overlay_file    = "../images/qgn_plat_check_box_selected_normal_moz.png"
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      shadow          = OUT
+      state           = PRELIGHT
+      overlay_file    = "../images/qgn_plat_check_box_empty_normal_moz.png"
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      shadow          = IN
+      state           = PRELIGHT
+      overlay_file    = "../images/qgn_plat_check_box_selected_normal_moz.png"
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      shadow          = OUT
+      state           = ACTIVE
+      overlay_file    = "../images/qgn_plat_check_box_empty_focused.png"
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      shadow          = IN
+      state           = ACTIVE
+      overlay_file    = "../images/qgn_plat_check_box_selected_focused.png"
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      shadow          = OUT
+      state           = SELECTED
+      overlay_file    = "../images/qgn_plat_check_box_empty_focused.png"
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      shadow          = IN
+      state           = SELECTED
+      overlay_file    = "../images/qgn_plat_check_box_selected_focused.png"
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      shadow          = OUT
+      state           = INSENSITIVE
+      overlay_file    = "../images/qgn_plat_check_box_empty_disabled_moz.png"
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      shadow          = IN
+      state           = INSENSITIVE
+      overlay_file    = "../images/qgn_plat_check_box_selected_disabled_moz.png"
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      overlay_file    = "../images/qgn_plat_check_box_indeterminate_disabled_moz.png"
+      shadow          = ETCHED_IN
+      state           = INSENSITIVE
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      overlay_file    = "../images/qgn_plat_check_box_indeterminate_normal_moz.png"
+      shadow          = ETCHED_IN
+      overlay_stretch = FALSE
+    }
+    image
+    {
+      function        = CHECK
+      overlay_file    = "../images/qgn_plat_check_box_indeterminate_focused.png"
+      shadow          = ETCHED_IN
+      state= ACTIVE
+      overlay_stretch = FALSE
+    }
+    image
+      {
+        function = FOCUS
+      }
+  }
+}
+widget "*.GtkMozLayout.*GtkCheckButton" style "synth-moz-checkbutton" 
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/themespecificgtk.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/themespecificgtk.rc
@@ -120,23 +120,23 @@
 ##############################
 
 style "osso-SystemFont" {
-	font_name = "Nokia Sans 16.75"
+	font_name = "Nokia Sans 12.75"
 }
 
 style "osso-EmpSystemFont" {
-	font_name = "Nokia Sans Bold 16.75"
+	font_name = "Nokia Sans Bold 12.75"
 }
 
 style "osso-TitleFont" {
-	font_name = "Nokia Sans 16.75"
+	font_name = "Nokia Sans 12.75"
 }
 
 style "osso-ButtonFont" {
-	font_name = "Nokia Sans 16.75"
+	font_name = "Nokia Sans 12.75"
 }
 
 style "osso-SmallFont" {
-	font_name = "Nokia Sans 11.625"
+	font_name = "Nokia Sans 10.625"
 }
 
 style "osso-LargeFont" {
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/gtksettings.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/gtksettings.rc
@@ -9,7 +9,7 @@
 gtk-file-chooser-backend = "gnome-vfs"
 
 # Are we using toolbar animation
-gtk-enable-animations = 0
+gtk-enable-animations = 1
 gtk-toolbar-style = GTK_TOOLBAR_ICONS
 
 # Keyboard navigation
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/hildonkeyboard.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/hildonkeyboard.rc
@@ -479,9 +479,9 @@
 #word completion candidate buttons
 style "osso-input-method-word-completion-candidates" = "osso-logical-colors"
 {
-    fg[NORMAL] = @DefaultTextColor
-    fg[ACTIVE] = @DefaultTextColor
-    fg[PRELIGHT] = @DefaultTextColor
+    fg[NORMAL] = @PaintedDefaultTextColor
+    fg[ACTIVE] = @PaintedDefaultTextColor
+    fg[PRELIGHT] = @PaintedDefaultTextColor
 
     engine "sapwood"
     {
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/gtkrc.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/gtkrc.rc
@@ -66,4 +66,6 @@
 
 include "hildontimepicker.rc"
 
+include "microb.rc"
+
 include "afterincludes.rc"
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/gtkiconview.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/gtkiconview.rc
@@ -4,9 +4,9 @@
 style "hildon-icon-view-style" = "osso-color-themeing"
 {
   text[NORMAL] = @DefaultTextColor
-  text[PRELIGHT] = @DefaultTextColor
-  text[ACTIVE] = @DefaultTextColor
-  text[SELECTED] = @DefaultTextColor
+  text[PRELIGHT] = @PaintedDefaultTextColor
+  text[ACTIVE] = @PaintedDefaultTextColor
+  text[SELECTED] = @PaintedDefaultTextColor
   text[INSENSITIVE] = @DefaultTextColor
 
   engine "sapwood"
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/base.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/base.rc
@@ -12,6 +12,10 @@
   #   SELECTED:    data selection highlight color, e.g. items in list widget
   #   INSENSITIVE: disabled widget
 
+# text insertion cursor
+  GtkWidget::cursor-color = "@DefaultTextColor@"
+  GtkWidget::cursor-aspect-ratio = 0.06
+
 # global picture theming.
   GtkWidget::hildon-focus-handling = 1
   GtkWidget::focus-line-width = 0
@@ -118,6 +122,9 @@
 gtk-toolbar-style = GTK_TOOLBAR_ICONS
 hildon-keyboard-shortcuts = 0
 
+# Enable icon theme
+gtk-icon-theme-name = "@THEME_DIR@"
+
 ## We don't want images on menus, but using this will remove icons also from
 ## TN menus
 #gtk-menu-images = 0
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/hildonnavigator.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/hildonnavigator.rc
@@ -14,6 +14,7 @@
             state = NORMAL
             file = "../images/qgn_plat_tool_tip.png"
 	    border = { 20, 20, 20, 20 }
+            shaped = TRUE
         }
     }
 }
--- hildon-theme-layout-4-synth-0.14.8.orig/rc/gtktreeview.rc
+++ hildon-theme-layout-4-synth-0.14.8/rc/gtktreeview.rc
@@ -6,8 +6,8 @@
 style "osso-listview" = "osso-logical-colors"
 {
 
-  text[ACTIVE] = @DefaultTextColor
-  text[SELECTED] = @DefaultTextColor
+  text[ACTIVE] = @PaintedDefaultTextColor
+  text[SELECTED] = @PaintedDefaultTextColor
 
   GtkTreeView::horizontal-separator = 6
   GtkTreeView::tree-view-separator-area = 15
