diff --git a/libs/taxidermy/Makefile.am b/libs/taxidermy/Makefile.am
index 191e7828e57b4989f363ef2540a5509233279d7d..daab78edce945a33ec36dbb9d74af27f27956b42 100644
--- a/libs/taxidermy/Makefile.am
+++ b/libs/taxidermy/Makefile.am
@@ -44,7 +44,7 @@ CLEANFILES = \
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 AM_CPPFLAGS = -I$(top_srcdir)/libs/ $(QT_INCLUDES) $(X_INCLUDES) 
 AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) 
-AM_LDADD = $(LIB_QT)
+libtaxidermy_la_LIBADD = $(LIB_QT)
 
 
 
diff --git a/skins/gmetal.ini b/skins/gmetal.ini
index a464e6eedfefbcc384a09ab4fef26f2e4453e74c..a38952cb04c48ca116300c998433a35188e2502f 100644
--- a/skins/gmetal.ini
+++ b/skins/gmetal.ini
@@ -2,72 +2,72 @@
 type=QButton
 x=225
 y=68
-pressed=hold_on.png
-released=hold_off.png
+pressed=metal/hold_on.png
+released=metal/hold_off.png
 paint=1
 
 [line0]
 type=QButton
 x=21
 y=181
-pressed=l1_green_on.png
-released=l1_green_off.png
+pressed=gmetal/l1_green_on.png
+released=gmetal/l1_green_off.png
 paint=1
 
 [line1]
 type=QButton
 x=52
 y=181
-pressed=l2_green_on.png
-released=l2_green_off.png
+pressed=gmetal/l2_green_on.png
+released=gmetal/l2_green_off.png
 paint=1
 
 [line2]
 type=QButton
 x=83
 y=181
-pressed=l3_green_on.png
-released=l3_green_off.png
+pressed=gmetal/l3_green_on.png
+released=gmetal/l3_green_off.png
 paint=1
 
 [line3]
 type=QButton
 x=114
 y=181
-pressed=l4_green_on.png
-released=l4_green_off.png
+pressed=gmetal/l4_green_on.png
+released=gmetal/l4_green_off.png
 paint=1
 
 [line4]
 type=QButton
 x=145
 y=181
-pressed=l5_green_on.png
-released=l5_green_off.png
+pressed=gmetal/l5_green_on.png
+released=gmetal/l5_green_off.png
 paint=1
 
 [line5]
 type=QButton
 x=176
 y=181
-pressed=l6_green_on.png
-released=l6_green_off.png
+pressed=gmetal/l6_green_on.png
+released=gmetal/l6_green_off.png
 paint=1
 
 [hangup]
 type=QButton
 x=225
 y=156
-pressed=hangup_on.png
-released=hangup_off.png
+pressed=metal/hangup_on.png
+released=metal/hangup_off.png
 paint=1
 
 [ok]
 type=QButton
 x=225
 y=182
-pressed=ok_on.png
-released=ok_off.png
+pressed=metal/ok_on.png
+released=metal/ok_off.png
 paint=1
 
 
@@ -75,16 +75,16 @@ paint=1
 type=QButton
 x=225
 y=94
-pressed=mute_on.png
-released=mute_off.png
+pressed=metal/mute_on.png
+released=metal/mute_off.png
 paint=1
 
 [conference]
 type=QButton
 x=225
 y=69
-pressed=conference_on.png
-released=conference_off.png
+pressed=metal/conference_on.png
+released=metal/conference_off.png
 paint=1
 
 
@@ -92,80 +92,80 @@ paint=1
 type=QButton
 x=225
 y=42
-pressed=transfer_on.png
-released=transfer_off.png
+pressed=metal/transfer_on.png
+released=metal/transfer_off.png
 paint=1
 
 [voicemail]
 type=QButton
 x=310
 y=43
-pressed=voicemail_on.png
-released=voicemail_off.png
+pressed=metal/voicemail_on.png
+released=metal/voicemail_off.png
 paint=1
 
 [setup]
 type=QButton
 x=310
 y=68
-pressed=setup_on.png
-released=setup_off.png
+pressed=metal/setup_on.png
+released=metal/setup_off.png
 paint=1
 
 [dtmf]
 type=QButton
 x=20
 y=151
-pressed=dtmf_on.png
-released=dtmf_off.png
+pressed=metal/dtmf_on.png
+released=metal/dtmf_off.png
 paint=1
 
 [directory]
 type=QButton
 x=140
 y=181
-pressed=ok_on.png
-released=ok_off.png
+pressed=metal/ok_on.png
+released=metal/ok_off.png
 paint=1
 
 [screen]
 type=QButton
 x=22
 y=44
-pressed=ok_on.png
-released=ok_off.png
+pressed=metal/ok_on.png
+released=metal/ok_off.png
 paint=1
 
 [minimize]
 type=QButton
 x=353
 y=5
-pressed=minimize_on.png
-released=minimize_off.png
+pressed=metal/minimize_on.png
+released=metal/minimize_off.png
 paint=1
 
 [clear]
 type=QButton
 x=225
 y=130
-pressed=clear_on.png
-released=clear_off.png
+pressed=metal/clear_on.png
+released=metal/clear_off.png
 paint=1
 
 [close]
 type=QButton
 x=374
 y=5
-pressed=close_on.png
-released=close_off.png
+pressed=metal/close_on.png
+released=metal/close_off.png
 paint=1
 
 [redial]
 type=QButton
 x=130
 y=151
-pressed=redial_on.png
-released=redial_off.png
+pressed=metal/redial_on.png
+released=metal/redial_off.png
 paint=1
 
 # DTMF Keypad
diff --git a/skins/metal.ini b/skins/metal.ini
index 4ef717499f2eb5167482457031312c89b21a5942..9cb3eb59dcd9e04918888461300e5b44c898b772 100644
--- a/skins/metal.ini
+++ b/skins/metal.ini
@@ -2,72 +2,72 @@
 type=QButton
 x=225
 y=68
-pressed=hold_on.png
-released=hold_off.png
+pressed=metal/hold_on.png
+released=metal/hold_off.png
 paint=1
 
 [line0]
 type=QButton
 x=21
 y=151
-pressed=l1_on.png
-released=l1_off.png
+pressed=metal/l1_on.png
+released=metal/l1_off.png
 paint=1
 
 [line1]
 type=QButton
 x=52
 y=151
-pressed=l2_on.png
-released=l2_off.png
+pressed=metal/l2_on.png
+released=metal/l2_off.png
 paint=1
 
 [line2]
 type=QButton
 x=83
 y=151
-pressed=l3_on.png
-released=l3_off.png
+pressed=metal/l3_on.png
+released=metal/l3_off.png
 paint=1
 
 [line3]
 type=QButton
 x=114
 y=151
-pressed=l4_on.png
-released=l4_off.png
+pressed=metal/l4_on.png
+released=metal/l4_off.png
 paint=1
 
 [line4]
 type=QButton
 x=145
 y=151
-pressed=l5_on.png
-released=l5_off.png
+pressed=metal/l5_on.png
+released=metal/l5_off.png
 paint=1
 
 [line5]
 type=QButton
 x=176
 y=151
-pressed=l6_on.png
-released=l6_off.png
+pressed=metal/l6_on.png
+released=metal/l6_off.png
 paint=1
 
 [hangup]
 type=QButton
 x=225
 y=156
-pressed=hangup_on.png
-released=hangup_off.png
+pressed=metal/hangup_on.png
+released=metal/hangup_off.png
 paint=1
 
 [ok]
 type=QButton
 x=225
 y=182
-pressed=ok_on.png
-released=ok_off.png
+pressed=metal/ok_on.png
+released=metal/ok_off.png
 paint=1
 
 
@@ -75,16 +75,16 @@ paint=1
 type=QButton
 x=225
 y=94
-pressed=mute_on.png
-released=mute_off.png
+pressed=metal/mute_on.png
+released=metal/mute_off.png
 paint=1
 
 [conference]
 type=QButton
 x=225
 y=69
-pressed=conference_on.png
-released=conference_off.png
+pressed=metal/conference_on.png
+released=metal/conference_off.png
 paint=1
 
 
@@ -92,80 +92,80 @@ paint=1
 type=QButton
 x=225
 y=42
-pressed=transfer_on.png
-released=transfer_off.png
+pressed=metal/transfer_on.png
+released=metal/transfer_off.png
 paint=1
 
 [voicemail]
 type=QButton
 x=310
 y=43
-pressed=voicemail_on.png
-released=voicemail_off.png
+pressed=metal/voicemail_on.png
+released=metal/voicemail_off.png
 paint=1
 
 [setup]
 type=QButton
 x=310
 y=68
-pressed=setup_on.png
-released=setup_off.png
+pressed=metal/setup_on.png
+released=metal/setup_off.png
 paint=1
 
 [dtmf]
 type=QButton
 x=20
 y=181
-pressed=dtmf_on.png
-released=dtmf_off.png
+pressed=metal/dtmf_on.png
+released=metal/dtmf_off.png
 paint=1
 
 [directory]
 type=QButton
 x=140
 y=181
-pressed=ok_on.png
-released=ok_off.png
+pressed=metal/ok_on.png
+released=metal/ok_off.png
 paint=1
 
 [screen]
 type=QButton
 x=22
 y=44
-pressed=ok_on.png
-released=ok_off.png
+pressed=metal/ok_on.png
+released=metal/ok_off.png
 paint=1
 
 [minimize]
 type=QButton
 x=353
 y=5
-pressed=minimize_on.png
-released=minimize_off.png
+pressed=metal/minimize_on.png
+released=metal/minimize_off.png
 paint=1
 
 [clear]
 type=QButton
 x=225
 y=130
-pressed=clear_on.png
-released=clear_off.png
+pressed=metal/clear_on.png
+released=metal/clear_off.png
 paint=1
 
 [close]
 type=QButton
 x=374
 y=5
-pressed=close_on.png
-released=close_off.png
+pressed=metal/close_on.png
+released=metal/close_off.png
 paint=1
 
 [redial]
 type=QButton
 x=130
 y=181
-pressed=redial_on.png
-released=redial_off.png
+pressed=metal/redial_on.png
+released=metal/redial_off.png
 paint=1
 
 # DTMF Keypad
diff --git a/src/gui/qt/Makefile.am b/src/gui/qt/Makefile.am
index 5a58896af90b477ea6ddfd4f2bdb059d77992900..b1b6abbca8625c94b24806d13fdc7051183cabf0 100644
--- a/src/gui/qt/Makefile.am
+++ b/src/gui/qt/Makefile.am
@@ -112,7 +112,7 @@ sflphone_qt_SOURCES = \
 CLEANFILES = \
 	$(BUILT_SOURCES)
 
-sflphone_qt_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DDATADIR=\"$(datadir)\"
+sflphone_qt_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DDATADIR=\"$(sflphone_datadir)\"
 sflphone_qt_LDADD = $(LIB_QT) $(top_srcdir)/libs/taxidermy/libtaxidermy.la
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/src/gui/qt/SFLPhoneApp.cpp b/src/gui/qt/SFLPhoneApp.cpp
index f5ad6e3176549eed4f6a5109edf144eeba31c1d9..4cb9023da6be6706a242ea620ae1dd0cf7af781a 100644
--- a/src/gui/qt/SFLPhoneApp.cpp
+++ b/src/gui/qt/SFLPhoneApp.cpp
@@ -238,7 +238,7 @@ void
 SFLPhoneApp::loadSkin() 
 {
   SkinManager::instance().setApplication(this);
-  SkinManager::instance().load();
+  SkinManager::instance().load("metal");
 }
 
 void