diff --git a/debian/changelog b/debian/changelog
index 4a06355..f2982c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ lubuntu-default-settings (0.15) UNRELEASED; urgency=low
      removed from gtk (LP: #673704).
   * etc/xdg/lubuntu/applications/default.list:
    - Set file-roller to open archives instead of xarchiver.
+   - Set audacious to open music files instead of aqualung.
+  * etc/xdg/lxsession/Lubuntu*/desktop.conf
+   - Switch to Ubuntu 11 font.
 
  -- Julien Lavergne <gilir@ubuntu.com>  Tue, 09 Nov 2010 23:11:10 +0100
 
diff --git a/etc/xdg/lubuntu/applications/defaults.list b/etc/xdg/lubuntu/applications/defaults.list
index 0ae8869..ab259ee 100644
--- a/etc/xdg/lubuntu/applications/defaults.list
+++ b/etc/xdg/lubuntu/applications/defaults.list
@@ -3,7 +3,7 @@ application/csv=gnumeric.desktop
 application/excel=gnumeric.desktop
 application/msexcel=gnumeric.desktop
 application/msword=abiword.desktop
-application/ogg=aqualung.desktop
+application/ogg=audacious2.desktop
 application/pdf=evince.desktop
 application/postscript=evince.desktop
 application/rtf=abiword.desktop
@@ -59,7 +59,7 @@ application/x-ear=file-roller.desktop
 application/x-excel=gnumeric.desktop
 application/x-extension-m4a=gnome-mplayer.desktop
 application/x-extension-mp4=gnome-mplayer.desktop
-application/x-flac=aqualung.desktop
+application/x-flac=audacious2.desktop
 application/x-glade=glade-2.desktop
 application/x-gnumeric=gnumeric.desktop
 application/x-gtar=file-roller.desktop
@@ -76,7 +76,7 @@ application/x-matroska=gnome-mplayer.desktop
 application/x-mps=gnumeric.desktop
 application/x-ms-excel=gnumeric.desktop
 application/x-msexcel=gnumeric.desktop
-application/x-ogg=aqualung.desktop
+application/x-ogg=audacious2.desktop
 application/x-oleo=gnumeric.desktop
 application/x-perl=leafpad.desktop
 application/x-planperfect=gnumeric.desktop
@@ -95,26 +95,26 @@ application/x-zip-compressed=file-roller.desktop
 application/x-zip=file-roller.desktop
 application/x-zoo=file-roller.desktop
 application/zip=file-roller.desktop
-audio/mpeg=aqualung.desktop
-audio/mpegurl=aqualung.desktop
-audio/vnd.rn-realaudio=aqualung.desktop
-audio/x-flac=aqualung.desktop
-audio/x-m4a=aqualung.desktop
-audio/x-mp3=aqualung.desktop
-audio/x-mpeg=aqualung.desktop
-audio/x-mpegurl=aqualung.desktop
-audio/x-ms-asf=aqualung.desktop
-audio/x-ms-asx=aqualung.desktop
-audio/x-ms-wax=aqualung.desktop
-audio/x-pn-aiff=aqualung.desktop
-audio/x-pn-au=aqualung.desktop
-audio/x-pn-realaudio-plugin=aqualung.desktop
-audio/x-pn-realaudio=aqualung.desktop
-audio/x-pn-wav=aqualung.desktop
-audio/x-pn-windows-acm=aqualung.desktop
-audio/x-real-audio=aqualung.desktop
-audio/x-scpls=aqualung.desktop
-audio/x-wav=aqualung.desktop
+audio/mpeg=audacious2.desktop
+audio/mpegurl=audacious2.desktop
+audio/vnd.rn-realaudio=audacious2.desktop
+audio/x-flac=audacious2.desktop
+audio/x-m4a=audacious2.desktop
+audio/x-mp3=audacious2.desktop
+audio/x-mpeg=audacious2.desktop
+audio/x-mpegurl=audacious2.desktop
+audio/x-ms-asf=audacious2.desktop
+audio/x-ms-asx=audacious2.desktop
+audio/x-ms-wax=audacious2.desktop
+audio/x-pn-aiff=audacious2.desktop
+audio/x-pn-au=audacious2.desktop
+audio/x-pn-realaudio-plugin=audacious2.desktop
+audio/x-pn-realaudio=audacious2.desktop
+audio/x-pn-wav=audacious2.desktop
+audio/x-pn-windows-acm=audacious2.desktop
+audio/x-real-audio=audacious2.desktop
+audio/x-scpls=audacious2.desktop
+audio/x-wav=audacious2.desktop
 image/bmp=gpicview.desktop
 image/gif=gpicview.desktop
 image/jpeg=gpicview.desktop
diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf b/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
index 5918019..666cdd2 100644
--- a/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
@@ -4,7 +4,7 @@ window_manager=openbox-lubuntu
 [GTK]
 sNet/ThemeName=Lubuntu-default
 sNet/IconThemeName=lubuntu
-sGtk/FontName=Sans 10
+sGtk/FontName=Ubuntu 11
 iGtk/ToolbarStyle=3
 iGtk/ButtonImages=1
 iGtk/MenuImages=1
diff --git a/etc/xdg/lxsession/Lubuntu/desktop.conf b/etc/xdg/lxsession/Lubuntu/desktop.conf
index 5918019..666cdd2 100644
--- a/etc/xdg/lxsession/Lubuntu/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu/desktop.conf
@@ -4,7 +4,7 @@ window_manager=openbox-lubuntu
 [GTK]
 sNet/ThemeName=Lubuntu-default
 sNet/IconThemeName=lubuntu
-sGtk/FontName=Sans 10
+sGtk/FontName=Ubuntu 11
 iGtk/ToolbarStyle=3
 iGtk/ButtonImages=1
 iGtk/MenuImages=1