diff -Naur hildon-theme-layout-4ex-1.0mer1/data/theme.xml hildon-theme-layout-4ex-1.0mer2/data/theme.xml
--- hildon-theme-layout-4ex-1.0mer1/data/theme.xml	2009-01-17 20:54:02.000000000 +0000
+++ hildon-theme-layout-4ex-1.0mer2/data/theme.xml	2009-01-26 16:16:24.000000000 +0000
@@ -15,7 +15,7 @@
 
 <!-- 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="Droid Sans-17.85" />
 
 <color id="osso-TitleTextColor" def="@TitleTextColor@" />
 <color id="osso-DialogTitleTextColor" def="@DialogTitleTextColor@" />
diff -Naur hildon-theme-layout-4ex-1.0mer1/debian/changelog hildon-theme-layout-4ex-1.0mer2/debian/changelog
--- hildon-theme-layout-4ex-1.0mer1/debian/changelog	2009-01-17 20:54:02.000000000 +0000
+++ hildon-theme-layout-4ex-1.0mer2/debian/changelog	2009-01-26 16:15:27.000000000 +0000
@@ -1,3 +1,10 @@
+hildon-theme-layout-4ex (1.0mer2) jaunty; urgency=low
+
+  * Replace Bitstream with Droid Sans fonts.
+  * Fix Nokia Sans references.
+
+ -- Faheem Pervez <trippin1@gmail.com>  Mon, 26 Jan 2009 16:10:46 +0000
+
 hildon-theme-layout-4ex (1.0mer1) jaunty; urgency=low
 
   * Added autoconf, automake to build-dep
diff -Naur hildon-theme-layout-4ex-1.0mer1/rc/hildonkeyboard.rc hildon-theme-layout-4ex-1.0mer2/rc/hildonkeyboard.rc
--- hildon-theme-layout-4ex-1.0mer1/rc/hildonkeyboard.rc	2009-01-17 20:54:02.000000000 +0000
+++ hildon-theme-layout-4ex-1.0mer2/rc/hildonkeyboard.rc	2009-01-26 16:17:11.000000000 +0000
@@ -551,14 +551,14 @@
 widget "*.osso-im-fkb-tab" style "osso-input-method-fkb-tab"
 
 style "osso-input-method-fkb-tab-label" = "osso-logical-colors" {
-  font_name = "Nokia Sans 24"
+  font_name = "Droid Sans 24"
   fg[NORMAL] = @DefaultTextColor
   fg[ACTIVE] = @DefaultTextColor
 }
 widget "*.osso-im-fkb-tab.*" style "osso-input-method-fkb-tab-label"
 
 style "osso-input-method-fkb-menu-label" {
-  font_name = "Nokia Sans 24"
+  font_name = "Droid Sans 24"
 }
 widget "*.fkb-menu-item.*" style "osso-input-method-fkb-menu-label"
 
@@ -719,7 +719,7 @@
 widget "*osso-im-fkb-accent-key" style "osso-input-method-fkb-accent-key"
 
 style "osso-input-method-fkb-menu-item" { 
-  font_name = "Nokia Sans 24"
+  font_name = "Droid Sans 24"
 }
 widget "*.osso-im-fkb-menu-item.*" style "osso-input-method-fkb-menu-item"
 
@@ -743,7 +743,7 @@
 
 style "hildon-input-method-wc-indicator" = "osso-logical-colors"
 {
-    font_name = "Nokia Sans 24"
+    font_name = "Droid Sans 24"
     fg[NORMAL] = @WCIndicatorColor
 }
 widget "*.hildon-input-method-wc-indicator" style "hildon-input-method-wc-indicator"
@@ -779,7 +779,7 @@
 
 style "hildon-input-method-wc-finger-candidate-label"
 {
-    font_name = "Nokia Sans 24"
+    font_name = "Droid Sans 24"
 }
 widget "*hildon-input-method-finger-wc.hildon-wc-candidate-button.GtkLabel" style "hildon-input-method-wc-finger-candidate-label"
 
@@ -866,7 +866,7 @@
 
 style "hildon-im-thumb-scv" = "osso-logical-colors"
 {
-    font_name = "Nokia Sans 24"
+    font_name = "Droid Sans 24"
     bg[NORMAL] = @VkbBgColor
 }
 widget "*osso-im-scv-renderer" style "hildon-im-thumb-scv"
diff -Naur hildon-theme-layout-4ex-1.0mer1/rc/themespecificgtk.rc hildon-theme-layout-4ex-1.0mer2/rc/themespecificgtk.rc
--- hildon-theme-layout-4ex-1.0mer1/rc/themespecificgtk.rc	2009-01-17 20:54:03.000000000 +0000
+++ hildon-theme-layout-4ex-1.0mer2/rc/themespecificgtk.rc	2009-01-26 16:17:45.000000000 +0000
@@ -121,37 +121,37 @@
 ##############################
 
 style "osso-SystemFont" {
-	font_name = "Bitstream Vera Sans 13"
+	font_name = "Droid Sans 13"
 }
 
 style "osso-EmpSystemFont" {
-	font_name = "Bitstream Vera Bold 13"
+	font_name = "Droid Sans Bold 13"
 }
 
 style "osso-TitleFont" {
-	font_name = "Bitstream Vera Sans 13"
+	font_name = "Droid Sans 13"
 }
 
 style "osso-ButtonFont" {
-	font_name = "Bitstream Vera Sans 13"
+	font_name = "Droid Sans 13"
 }
 
 style "osso-SmallFont" {
-	font_name = "Bitstream Vera Sans 11"
+	font_name = "Droid Sans 11"
 }
 
 style "osso-LargeFont" {
-	font_name = "Bitstream Vera Sans 28"
+	font_name = "Droid Sans 28"
 }
 
 style "osso-HWRFont1"
 {
-	font_name = "Bitstream Vera Sans 52"
+	font_name = "Droid Sans 52"
 }
 
 style "osso-HWRFont2"
 {
-	font_name = "Bitstream Vera Sans 38"
+	font_name = "Droid Sans 38"
 }
 
 ######################################